[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [orbot/master] Remove unused resources.



commit 08c35bd3a1e904bc8aba183cc29c047d29d87768
Author: sisbell <shane.isbell@xxxxxxxxx>
Date:   Wed May 8 12:26:45 2019 -0700

    Remove unused resources.
---
 app/src/main/res/drawable-hdpi-v11/inverse.png     | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-hdpi-v9/inverse.png      | Bin 1027 -> 0 bytes
 .../drawable-hdpi/ic_filter_none_black_36dp.png    | Bin 232 -> 0 bytes
 .../ic_playlist_add_check_black_36dp.png           | Bin 221 -> 0 bytes
 app/src/main/res/drawable-hdpi/inverse.png         | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-ldpi-v11/inverse.png     | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-ldpi-v9/inverse.png      | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-ldpi/inverse.png         | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-mdpi-v11/inverse.png     | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-mdpi-v9/inverse.png      | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-xhdpi-v11/inverse.png    | Bin 1027 -> 0 bytes
 app/src/main/res/drawable-xhdpi-v9/inverse.png     | Bin 1027 -> 0 bytes
 app/src/main/res/drawable/button.xml               |  37 ---
 app/src/main/res/drawable/button_off.xml           |  37 ---
 app/src/main/res/drawable/button_on.xml            |  35 ---
 app/src/main/res/drawable/error.png                | Bin 2922 -> 0 bytes
 app/src/main/res/drawable/ic_menu_goto.png         | Bin 1636 -> 0 bytes
 app/src/main/res/drawable/ic_play.png              | Bin 3560 -> 0 bytes
 app/src/main/res/drawable/inverse.png              | Bin 1027 -> 0 bytes
 app/src/main/res/drawable/n8fr8.jpg                | Bin 18062 -> 0 bytes
 app/src/main/res/drawable/rounded_button.xml       |  13 -
 app/src/main/res/drawable/toggle.xml               |   8 -
 app/src/main/res/drawable/tor.png                  | Bin 4766 -> 0 bytes
 app/src/main/res/drawable/tor25.png                | Bin 2227 -> 0 bytes
 app/src/main/res/layout/layout_about.xml           |   4 +-
 .../res/layout/layout_add_client_cookie_dialog.xml |   2 -
 .../res/layout/layout_content_client_cookies.xml   |   1 -
 app/src/main/res/layout/layout_help.xml            |  20 --
 .../res/layout/layout_hs_backups_list_item.xml     |   1 -
 app/src/main/res/layout/layout_hs_data_dialog.xml  |   3 -
 .../main/res/layout/layout_hs_list_view_main.xml   |   1 -
 app/src/main/res/layout/layout_log.xml             |  52 ----
 app/src/main/res/layout/layout_main.xml            |  12 +-
 app/src/main/res/layout/layout_orbot_control.xml   |  10 -
 app/src/main/res/layout/layout_settings.xml        |  29 --
 app/src/main/res/layout/layout_vpn_setup.xml       |  34 ---
 .../main/res/layout/scrollingtext_buttons_view.xml |  34 ---
 app/src/main/res/menu/orbot_main.xml               |   4 +-
 app/src/main/res/menu/share_menu.xml               |   7 -
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml |   5 -
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml    |   5 -
 app/src/main/res/mipmap-hdpi/ic_launcher.png       | Bin 2253 -> 0 bytes
 .../res/mipmap-hdpi/ic_launcher_foreground.png     | Bin 2146 -> 0 bytes
 app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4325 -> 0 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.png       | Bin 1580 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_foreground.png     | Bin 1376 -> 0 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2723 -> 0 bytes
 app/src/main/res/mipmap-xhdpi/ic_launcher.png      | Bin 3071 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_foreground.png    | Bin 3075 -> 0 bytes
 .../main/res/mipmap-xhdpi/ic_launcher_round.png    | Bin 6103 -> 0 bytes
 app/src/main/res/mipmap-xxhdpi/ic_launcher.png     | Bin 4682 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_foreground.png   | Bin 5112 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 9447 -> 0 bytes
 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png    | Bin 6541 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_foreground.png  | Bin 7372 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 13447 -> 0 bytes
 app/src/main/res/values-ach/strings.xml            |   1 -
 app/src/main/res/values-ar/poestrings.xml          |  18 --
 app/src/main/res/values-ar/strings.xml             | 152 ----------
 app/src/main/res/values-ay/poestrings.xml          |  24 --
 app/src/main/res/values-ay/strings.xml             | 150 ---------
 app/src/main/res/values-az/strings.xml             | 201 ++-----------
 app/src/main/res/values-be/poestrings.xml          |  21 --
 app/src/main/res/values-be/strings.xml             | 150 ---------
 app/src/main/res/values-bg/poestrings.xml          |  22 --
 app/src/main/res/values-bg/strings.xml             | 199 ++----------
 app/src/main/res/values-bn-rBD/strings.xml         |  54 +---
 app/src/main/res/values-bn-rIN/strings.xml         |  10 +-
 app/src/main/res/values-bn/strings.xml             |  26 +-
 app/src/main/res/values-brx/strings.xml            |   7 +-
 app/src/main/res/values-bs/strings.xml             |  14 +-
 app/src/main/res/values-ca/poestrings.xml          |  22 --
 app/src/main/res/values-ca/strings.xml             | 218 +++-----------
 app/src/main/res/values-cs-rCZ/strings.xml         | 197 ++----------
 app/src/main/res/values-cs/strings.xml             |  75 +----
 app/src/main/res/values-cy/strings.xml             |  69 +----
 app/src/main/res/values-da/strings.xml             | 156 ++--------
 app/src/main/res/values-de-rAT/strings.xml         |   1 -
 app/src/main/res/values-de/poestrings.xml          |  21 --
 app/src/main/res/values-de/strings.xml             | 218 +++-----------
 app/src/main/res/values-el/poestrings.xml          |  22 --
 app/src/main/res/values-el/strings.xml             | 218 +++-----------
 app/src/main/res/values-en-rGB/poestrings.xml      |  22 --
 app/src/main/res/values-en-rGB/strings.xml         |  67 +----
 app/src/main/res/values-eo/strings.xml             | 109 ++-----
 app/src/main/res/values-es-rAR/poestrings.xml      |  21 --
 app/src/main/res/values-es-rAR/strings.xml         | 167 ++---------
 app/src/main/res/values-es/arrays.xml              |   8 +-
 app/src/main/res/values-es/poestrings.xml          |  22 --
 app/src/main/res/values-es/strings.xml             | 218 +++-----------
 app/src/main/res/values-et/strings.xml             | 155 ++--------
 app/src/main/res/values-eu/poestrings.xml          |  21 --
 app/src/main/res/values-eu/strings.xml             | 218 +++-----------
 app/src/main/res/values-fa/poestrings.xml          |  22 --
 app/src/main/res/values-fa/strings.xml             | 219 +++-----------
 app/src/main/res/values-fi/strings.xml             | 143 ---------
 app/src/main/res/values-fr-rFR/strings.xml         | 199 ++----------
 app/src/main/res/values-fr/poestrings.xml          |  21 --
 app/src/main/res/values-fr/strings.xml             | 218 +++-----------
 app/src/main/res/values-gl/poestrings.xml          |  22 --
 app/src/main/res/values-gl/strings.xml             | 219 +++-----------
 app/src/main/res/values-gu-rIN/strings.xml         |   4 +-
 app/src/main/res/values-gu/strings.xml             |  15 +-
 app/src/main/res/values-he/strings.xml             | 228 +++-----------
 app/src/main/res/values-hi/poestrings.xml          |  21 --
 app/src/main/res/values-hi/strings.xml             | 218 +++-----------
 app/src/main/res/values-hr-rHR/strings.xml         |  26 +-
 app/src/main/res/values-hr/strings.xml             | 143 ---------
 app/src/main/res/values-hu/poestrings.xml          |  22 --
 app/src/main/res/values-hu/strings.xml             | 218 +++-----------
 app/src/main/res/values-hy-rAM/strings.xml         |  15 +-
 app/src/main/res/values-ia/strings.xml             |  30 +-
 app/src/main/res/values-id/strings.xml             | 199 ++----------
 app/src/main/res/values-in-rID/poestrings.xml      |  20 --
 app/src/main/res/values-in-rID/strings.xml         | 199 ++----------
 app/src/main/res/values-in/strings.xml             |  42 +--
 app/src/main/res/values-is/poestrings.xml          |  22 --
 app/src/main/res/values-is/strings.xml             | 218 +++-----------
 app/src/main/res/values-it/poestrings.xml          |  22 --
 app/src/main/res/values-it/strings.xml             | 218 +++-----------
 app/src/main/res/values-iw/poestrings.xml          |  22 --
 app/src/main/res/values-iw/strings.xml             | 172 ++---------
 app/src/main/res/values-ja/poestrings.xml          |  22 --
 app/src/main/res/values-ja/strings.xml             | 218 +++-----------
 app/src/main/res/values-kn-rIN/strings.xml         |   1 -
 app/src/main/res/values-kn/strings.xml             |  15 +-
 app/src/main/res/values-ko/strings.xml             | 199 ++----------
 app/src/main/res/values-ky/strings.xml             |  22 +-
 app/src/main/res/values-lt-rLT/strings.xml         |   1 -
 app/src/main/res/values-lt/poestrings.xml          |  21 --
 app/src/main/res/values-lt/strings.xml             |  81 +----
 app/src/main/res/values-lv/strings.xml             | 199 ++----------
 app/src/main/res/values-mk/poestrings.xml          |  22 --
 app/src/main/res/values-mk/strings.xml             | 150 ---------
 app/src/main/res/values-ml/strings.xml             |  20 +-
 app/src/main/res/values-mn/strings.xml             |  13 +-
 app/src/main/res/values-mr-rIN/strings.xml         |   4 +-
 app/src/main/res/values-ms-rMY/strings.xml         | 146 ++-------
 app/src/main/res/values-ms/strings.xml             | 153 ++--------
 app/src/main/res/values-my/strings.xml             |  32 +-
 app/src/main/res/values-nb/poestrings.xml          |  17 --
 app/src/main/res/values-nb/strings.xml             | 207 ++-----------
 app/src/main/res/values-nl/poestrings.xml          |  22 --
 app/src/main/res/values-nl/strings.xml             | 218 +++-----------
 app/src/main/res/values-pa/strings.xml             |  22 +-
 app/src/main/res/values-pl/strings.xml             | 203 ++-----------
 app/src/main/res/values-ps/strings.xml             |  10 +-
 app/src/main/res/values-pt-rBR/poestrings.xml      |  22 --
 app/src/main/res/values-pt-rBR/strings.xml         | 215 ++-----------
 app/src/main/res/values-pt-rPT/strings.xml         | 102 ++-----
 app/src/main/res/values-pt/strings.xml             | 135 ++-------
 app/src/main/res/values-ro-rRO/strings.xml         |  26 +-
 app/src/main/res/values-ro/strings.xml             | 199 ++----------
 app/src/main/res/values-rs-rAR/strings.xml         |  40 +--
 app/src/main/res/values-ru/poestrings.xml          |  21 --
 app/src/main/res/values-ru/strings.xml             | 218 +++-----------
 app/src/main/res/values-si-rLK/strings.xml         | 146 ++-------
 app/src/main/res/values-sk-rSK/strings.xml         |   8 +-
 app/src/main/res/values-sk/strings.xml             | 199 ++----------
 app/src/main/res/values-sl/strings.xml             |  74 +----
 app/src/main/res/values-sn/strings.xml             |  21 +-
 app/src/main/res/values-sq/strings.xml             |  42 +--
 app/src/main/res/values-sr/strings.xml             | 212 ++-----------
 app/src/main/res/values-sv/poestrings.xml          |  22 --
 app/src/main/res/values-sv/strings.xml             | 218 +++-----------
 app/src/main/res/values-ta/poestrings.xml          |  22 --
 app/src/main/res/values-ta/strings.xml             |  75 +----
 app/src/main/res/values-th/poestrings.xml          |  22 --
 app/src/main/res/values-th/strings.xml             | 218 +++-----------
 app/src/main/res/values-tl/strings.xml             | 177 ++---------
 app/src/main/res/values-tr/poestrings.xml          |  22 --
 app/src/main/res/values-tr/strings.xml             | 150 ---------
 app/src/main/res/values-uk/poestrings.xml          |  22 --
 app/src/main/res/values-uk/strings.xml             | 218 +++-----------
 app/src/main/res/values-ur/strings.xml             |  23 +-
 app/src/main/res/values-uz/strings.xml             |  47 +--
 app/src/main/res/values-vi/strings.xml             | 199 ++----------
 app/src/main/res/values-zh-rCN/strings.xml         | 204 ++-----------
 app/src/main/res/values-zh-rTW/poestrings.xml      |  22 --
 app/src/main/res/values-zh-rTW/strings.xml         | 220 +++-----------
 app/src/main/res/values/arrays.xml                 |   8 +-
 app/src/main/res/values/colors.xml                 |   2 -
 app/src/main/res/values/dimens.xml                 | 128 +-------
 app/src/main/res/values/ic_launcher_background.xml |   4 +-
 app/src/main/res/values/poestrings.xml             |  22 --
 app/src/main/res/values/strings.xml                | 165 +---------
 app/src/main/res/values/styles.xml                 |   4 -
 .../src/main/res/drawable-hdpi-v11/inverse.png     | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-hdpi-v9/inverse.png      | Bin 1027 -> 0 bytes
 .../main/res/drawable-hdpi/ic_action_settings.png  | Bin 553 -> 0 bytes
 .../res/drawable-hdpi/ic_autorenew_black_36dp.png  | Bin 546 -> 0 bytes
 .../src/main/res/drawable-hdpi/ic_launcher.png     | Bin 4194 -> 0 bytes
 .../src/main/res/drawable-hdpi/inverse.png         | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-ldpi-v11/inverse.png     | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-ldpi-v9/inverse.png      | Bin 1027 -> 0 bytes
 .../main/res/drawable-ldpi/ic_action_settings.png  | Bin 319 -> 0 bytes
 .../src/main/res/drawable-ldpi/ic_launcher.png     | Bin 2852 -> 0 bytes
 .../src/main/res/drawable-ldpi/inverse.png         | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-mdpi-v11/inverse.png     | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-mdpi-v9/inverse.png      | Bin 1027 -> 0 bytes
 .../main/res/drawable-mdpi/ic_action_settings.png  | Bin 364 -> 0 bytes
 .../src/main/res/drawable-mdpi/ic_launcher.png     | Bin 2677 -> 0 bytes
 .../src/main/res/drawable-mdpi/inverse.png         | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-xhdpi-v11/inverse.png    | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-xhdpi-v9/inverse.png     | Bin 1027 -> 0 bytes
 .../main/res/drawable-xhdpi/ic_action_settings.png | Bin 716 -> 0 bytes
 .../src/main/res/drawable-xhdpi/ic_launcher.png    | Bin 5964 -> 0 bytes
 .../src/main/res/drawable-xhdpi/inverse.png        | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/ic_launcher.png   | Bin 9556 -> 0 bytes
 .../src/main/res/drawable-xxhdpi/inverse.png       | Bin 1027 -> 0 bytes
 .../src/main/res/drawable-xxxhdpi/ic_launcher.png  | Bin 13297 -> 0 bytes
 .../src/main/res/drawable-xxxhdpi/inverse.png      | Bin 1027 -> 0 bytes
 .../res/layout/layout_notification_expanded.xml    | 108 -------
 orbotservice/src/main/res/raw/pluto.properties     |   3 -
 orbotservice/src/main/res/values-ach/strings.xml   |   1 -
 orbotservice/src/main/res/values-ar/strings.xml    | 261 +---------------
 orbotservice/src/main/res/values-az/strings.xml    | 296 +-----------------
 orbotservice/src/main/res/values-bg/strings.xml    | 292 +-----------------
 .../src/main/res/values-bn-rBD/strings.xml         |  32 +-
 .../src/main/res/values-bn-rIN/strings.xml         |   1 -
 orbotservice/src/main/res/values-bn/strings.xml    |   1 -
 orbotservice/src/main/res/values-brx/strings.xml   |   1 -
 orbotservice/src/main/res/values-bs/strings.xml    |  11 +-
 orbotservice/src/main/res/values-ca/strings.xml    | 225 +-------------
 .../src/main/res/values-cs-rCZ/strings.xml         | 222 +-------------
 orbotservice/src/main/res/values-cs/colors.xml     |   9 -
 orbotservice/src/main/res/values-cs/strings.xml    |  66 +---
 orbotservice/src/main/res/values-cy/strings.xml    |  75 +----
 orbotservice/src/main/res/values-da/strings.xml    | 201 +------------
 .../src/main/res/values-de-rAT/strings.xml         |   1 -
 orbotservice/src/main/res/values-de/strings.xml    | 292 +-----------------
 orbotservice/src/main/res/values-el/strings.xml    | 207 +------------
 .../src/main/res/values-en-rGB/strings.xml         |   4 +-
 orbotservice/src/main/res/values-eo/strings.xml    | 146 +--------
 .../src/main/res/values-es-rAR/strings.xml         |  61 +---
 orbotservice/src/main/res/values-es/strings.xml    | 293 +-----------------
 orbotservice/src/main/res/values-et/strings.xml    | 209 +------------
 orbotservice/src/main/res/values-eu/strings.xml    | 218 +-------------
 orbotservice/src/main/res/values-fa/strings.xml    | 291 +-----------------
 orbotservice/src/main/res/values-fi/strings.xml    | 278 +----------------
 .../src/main/res/values-fr-rFR/strings.xml         | 292 +-----------------
 orbotservice/src/main/res/values-fr/strings.xml    |  39 +--
 orbotservice/src/main/res/values-gl/strings.xml    | 207 +------------
 .../src/main/res/values-gu-rIN/strings.xml         |   7 +-
 orbotservice/src/main/res/values-gu/strings.xml    |  10 +-
 orbotservice/src/main/res/values-he/strings.xml    | 231 +-------------
 orbotservice/src/main/res/values-hi/strings.xml    |  19 +-
 .../src/main/res/values-hr-rHR/strings.xml         |  27 +-
 orbotservice/src/main/res/values-hr/strings.xml    | 292 +-----------------
 orbotservice/src/main/res/values-hu/strings.xml    | 292 +-----------------
 .../src/main/res/values-hy-rAM/strings.xml         |   1 -
 orbotservice/src/main/res/values-ia/strings.xml    |  27 +-
 orbotservice/src/main/res/values-id/strings.xml    | 283 +----------------
 .../src/main/res/values-in-rID/strings.xml         | 283 +----------------
 orbotservice/src/main/res/values-in/strings.xml    |  42 +--
 orbotservice/src/main/res/values-is/strings.xml    | 278 +----------------
 orbotservice/src/main/res/values-it/strings.xml    | 292 +-----------------
 orbotservice/src/main/res/values-iw/strings.xml    | 231 +-------------
 orbotservice/src/main/res/values-ja/strings.xml    | 292 +-----------------
 .../src/main/res/values-kn-rIN/strings.xml         |   1 -
 orbotservice/src/main/res/values-kn/strings.xml    |   1 -
 orbotservice/src/main/res/values-ko/strings.xml    | 213 +------------
 orbotservice/src/main/res/values-ky/strings.xml    |  12 +-
 .../src/main/res/values-lt-rLT/strings.xml         |   1 -
 orbotservice/src/main/res/values-lt/strings.xml    |  23 +-
 orbotservice/src/main/res/values-lv/strings.xml    | 278 +----------------
 orbotservice/src/main/res/values-mk/strings.xml    | 278 +----------------
 orbotservice/src/main/res/values-ml/strings.xml    |   1 -
 orbotservice/src/main/res/values-mn/strings.xml    |   1 -
 .../src/main/res/values-mr-rIN/strings.xml         |   1 -
 .../src/main/res/values-ms-rMY/strings.xml         | 194 +-----------
 orbotservice/src/main/res/values-ms/strings.xml    | 199 +-----------
 orbotservice/src/main/res/values-my/strings.xml    |  27 +-
 orbotservice/src/main/res/values-nb/strings.xml    | 258 +---------------
 orbotservice/src/main/res/values-nl/strings.xml    | 291 +-----------------
 orbotservice/src/main/res/values-pa/strings.xml    |  12 +-
 orbotservice/src/main/res/values-pl/strings.xml    | 292 +-----------------
 orbotservice/src/main/res/values-ps/strings.xml    |   1 -
 .../src/main/res/values-pt-rBR/strings.xml         | 284 +-----------------
 .../src/main/res/values-pt-rPT/strings.xml         |   4 +-
 orbotservice/src/main/res/values-pt/strings.xml    | 179 +----------
 .../src/main/res/values-ro-rRO/strings.xml         |  27 +-
 orbotservice/src/main/res/values-ro/strings.xml    | 230 +-------------
 .../src/main/res/values-rs-rAR/strings.xml         |  43 +--
 orbotservice/src/main/res/values-ru/strings.xml    | 292 +-----------------
 .../src/main/res/values-si-rLK/strings.xml         | 188 +-----------
 .../src/main/res/values-sk-rSK/strings.xml         |   8 +-
 orbotservice/src/main/res/values-sk/strings.xml    |  38 +--
 orbotservice/src/main/res/values-sl/strings.xml    |  74 +----
 orbotservice/src/main/res/values-sn/strings.xml    |  14 +-
 orbotservice/src/main/res/values-sq/strings.xml    |  27 +-
 orbotservice/src/main/res/values-sr/strings.xml    | 197 +-----------
 orbotservice/src/main/res/values-sv/strings.xml    | 292 +-----------------
 orbotservice/src/main/res/values-ta/strings.xml    |  62 +---
 orbotservice/src/main/res/values-th/strings.xml    | 171 +----------
 orbotservice/src/main/res/values-tl/strings.xml    | 251 +---------------
 orbotservice/src/main/res/values-tr/strings.xml    | 279 +----------------
 orbotservice/src/main/res/values-uk/strings.xml    | 278 +----------------
 orbotservice/src/main/res/values-ur/strings.xml    |   9 +-
 orbotservice/src/main/res/values-uz/strings.xml    |  42 +--
 orbotservice/src/main/res/values-vi/strings.xml    | 292 +-----------------
 .../src/main/res/values-zh-rCN/strings.xml         | 297 +-----------------
 .../src/main/res/values-zh-rTW/strings.xml         | 110 +------
 orbotservice/src/main/res/values/dimens.xml        | 334 ---------------------
 orbotservice/src/main/res/values/strings.xml       | 327 +-------------------
 orbotservice/src/main/res/values/styles.xml        |   5 -
 306 files changed, 2375 insertions(+), 23710 deletions(-)

diff --git a/app/src/main/res/drawable-hdpi-v11/inverse.png b/app/src/main/res/drawable-hdpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-hdpi-v11/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi-v9/inverse.png b/app/src/main/res/drawable-hdpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-hdpi-v9/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png
deleted file mode 100644
index 7543f322..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_filter_none_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png b/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png
deleted file mode 100644
index 7835899e..00000000
Binary files a/app/src/main/res/drawable-hdpi/ic_playlist_add_check_black_36dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/inverse.png b/app/src/main/res/drawable-hdpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-hdpi/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi-v11/inverse.png b/app/src/main/res/drawable-ldpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-ldpi-v11/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi-v9/inverse.png b/app/src/main/res/drawable-ldpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-ldpi-v9/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-ldpi/inverse.png b/app/src/main/res/drawable-ldpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-ldpi/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi-v11/inverse.png b/app/src/main/res/drawable-mdpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-mdpi-v11/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi-v9/inverse.png b/app/src/main/res/drawable-mdpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-mdpi-v9/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi-v11/inverse.png b/app/src/main/res/drawable-xhdpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-xhdpi-v11/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi-v9/inverse.png b/app/src/main/res/drawable-xhdpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable-xhdpi-v9/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable/button.xml b/app/src/main/res/drawable/button.xml
deleted file mode 100644
index 9f44d248..00000000
--- a/app/src/main/res/drawable/button.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android";>
-  <item android:state_pressed="true" >
-    <shape>
-      <solid
-          android:color="@color/panel_background" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-  <item>
-    <shape>
-      <gradient
-          android:startColor="@color/panel_background_dark"
-          android:endColor="@color/panel_background_main"
-          android:angle="270" />
-      <stroke
-          android:width="2dp"
-          android:color="#aaaaaa" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_off.xml b/app/src/main/res/drawable/button_off.xml
deleted file mode 100644
index 1304d1b6..00000000
--- a/app/src/main/res/drawable/button_off.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android";>
-  <item android:state_pressed="true" >
-    <shape>
-      <solid
-          android:color="@color/panel_background" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-  <item>
-    <shape>
-      <gradient
-          android:startColor="@color/panel_background_dark"
-          android:endColor="@color/panel_background_main"
-          android:angle="270" />
-      <stroke
-          android:width="2dp"
-          android:color="#555555" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_on.xml b/app/src/main/res/drawable/button_on.xml
deleted file mode 100644
index 27dc0922..00000000
--- a/app/src/main/res/drawable/button_on.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android";>
-  <item android:state_pressed="true" >
-    <shape>
-      <solid
-          android:color="@color/bright_green" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-  <item>
-  <shape>
-      <solid
-          android:color="@color/dark_green" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/error.png b/app/src/main/res/drawable/error.png
deleted file mode 100644
index 42dc6d66..00000000
Binary files a/app/src/main/res/drawable/error.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_menu_goto.png b/app/src/main/res/drawable/ic_menu_goto.png
deleted file mode 100644
index 40183ebc..00000000
Binary files a/app/src/main/res/drawable/ic_menu_goto.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_play.png b/app/src/main/res/drawable/ic_play.png
deleted file mode 100644
index a9197949..00000000
Binary files a/app/src/main/res/drawable/ic_play.png and /dev/null differ
diff --git a/app/src/main/res/drawable/inverse.png b/app/src/main/res/drawable/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/app/src/main/res/drawable/inverse.png and /dev/null differ
diff --git a/app/src/main/res/drawable/n8fr8.jpg b/app/src/main/res/drawable/n8fr8.jpg
deleted file mode 100644
index 4939d5c7..00000000
Binary files a/app/src/main/res/drawable/n8fr8.jpg and /dev/null differ
diff --git a/app/src/main/res/drawable/rounded_button.xml b/app/src/main/res/drawable/rounded_button.xml
deleted file mode 100644
index 528cc411..00000000
--- a/app/src/main/res/drawable/rounded_button.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android";
-    android:shape="rectangle">
-
-    <corners android:radius="15dp"/> // if you want clear round shape then make radius size is half of your  button`s height.
-    <solid android:color="#78af52"/> // Button Colour
-    <padding
-        android:bottom="3dp"
-        android:left="3dp"
-        android:right="3dp"
-        android:top="3dp"/>
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle.xml b/app/src/main/res/drawable/toggle.xml
deleted file mode 100644
index 0f9a36e5..00000000
--- a/app/src/main/res/drawable/toggle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android";>
-    <item
-        android:state_checked="false"
-        android:drawable="@drawable/button_off" />
-    <item
-        android:state_checked="true"
-        android:drawable="@drawable/button_on" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tor.png b/app/src/main/res/drawable/tor.png
deleted file mode 100644
index 0d63dd97..00000000
Binary files a/app/src/main/res/drawable/tor.png and /dev/null differ
diff --git a/app/src/main/res/drawable/tor25.png b/app/src/main/res/drawable/tor25.png
deleted file mode 100644
index 20b7666c..00000000
Binary files a/app/src/main/res/drawable/tor25.png and /dev/null differ
diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml
index 45482053..9d01498b 100644
--- a/app/src/main/res/layout/layout_about.xml
+++ b/app/src/main/res/layout/layout_about.xml
@@ -3,8 +3,8 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
-	<ScrollView android:id="@+id/aboutscrollview" 
-		android:orientation="vertical"
+	<ScrollView
+        android:orientation="vertical"
 		android:layout_width="fill_parent" 
 		android:layout_height="fill_parent">    
 		<LinearLayout
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 4669a921..c56bdcd8 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
@@ -11,7 +11,6 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/label_onion_name"
         android:text="@string/onion"
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
@@ -27,7 +26,6 @@
         android:text="@string/auth_cookie"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/label_cookie_value"
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
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 3ee9a897..2517d8e1 100644
--- a/app/src/main/res/layout/layout_content_client_cookies.xml
+++ b/app/src/main/res/layout/layout_content_client_cookies.xml
@@ -2,7 +2,6 @@
 <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:id="@+id/content_client_cookies"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/layout_help.xml b/app/src/main/res/layout/layout_help.xml
deleted file mode 100644
index da29a524..00000000
--- a/app/src/main/res/layout/layout_help.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content">
-	<ScrollView android:id="@+id/helpscrollview" 
-		android:orientation="vertical"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent">    
-		<LinearLayout
-		    android:orientation="vertical"
-		    android:layout_width="fill_parent"
-		    android:layout_height="fill_parent">
-			<TextView android:text=""
-				android:layout_width="fill_parent" 
-				android:layout_height="wrap_content"
-				android:textColor="#ffffff" />				
-			</LinearLayout>
-		</ScrollView>			
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_hs_backups_list_item.xml b/app/src/main/res/layout/layout_hs_backups_list_item.xml
index 6d9bfd44..bc0b840e 100644
--- a/app/src/main/res/layout/layout_hs_backups_list_item.xml
+++ b/app/src/main/res/layout/layout_hs_backups_list_item.xml
@@ -1,7 +1,6 @@
 <?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:id="@+id/backup_list_item"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
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 524d69a8..35391615 100644
--- a/app/src/main/res/layout/layout_hs_data_dialog.xml
+++ b/app/src/main/res/layout/layout_hs_data_dialog.xml
@@ -11,7 +11,6 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/HSNameLabel"
         android:text="@string/name"
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
@@ -27,7 +26,6 @@
         android:text="@string/local_port"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/HSLocalPortLabel"
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
@@ -42,7 +40,6 @@
         android:text="@string/onion_port"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/HSOnionPortLabel"
         android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Small"
         android:paddingLeft="5dp" />
 
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 284a01c7..183ea28a 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
@@ -2,7 +2,6 @@
 <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:id="@+id/content_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
diff --git a/app/src/main/res/layout/layout_log.xml b/app/src/main/res/layout/layout_log.xml
deleted file mode 100644
index b9c7623d..00000000
--- a/app/src/main/res/layout/layout_log.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    
-    	<RelativeLayout android:id="@+id/layoutHeaderMain"
-		android:layout_width="fill_parent"
-		android:layout_height="30dp"
-		android:layout_gravity="center_horizontal"
-		android:background="#A0909090">
-        <ImageView android:id="@+id/radioModeImage"
- 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-			android:layout_marginTop="0px"
-			android:layout_marginRight="3px"
-			android:gravity="right"
-			android:layout_toRightOf="@+id/radioModeLabel"
-			android:layout_alignParentRight="true"
-			android:layout_alignParentTop="true"
-			android:src="@drawable/tor25"
-			/>
-		<TextView android:id="@+id/radioModeText"
- 		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"           
-            android:text="@string/powered_by"
-			android:layout_marginTop="9px"
-			android:layout_marginRight="0px"
-			android:gravity="right"
-			android:layout_toLeftOf="@+id/radioModeImage"
-            android:textColor="#333333" />
-	</RelativeLayout>
-	
-     <ScrollView  android:orientation="vertical"
-      android:layout_height="wrap_content"
-         android:layout_width="fill_parent"  android:id="@+id/logScrollView"
-        >
-         
-         <TextView android:id="@+id/messageLog"
-         android:layout_height="wrap_content"
-         android:layout_width="fill_parent"
-         android:layout_x="2px"
-		 android:layout_y="2px"
-         android:textSize="14px"
-         android:background="#A0222222"
-         />	
-        
-	</ScrollView>
-     	
-     </LinearLayout>
-            
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index 84d3156c..8c8ca79d 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -24,9 +24,7 @@
             android:layout_height="wrap_content">
 <RelativeLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/content_frame"
-    >
+    android:layout_height="match_parent">
 
 	<FrameLayout
 	    	android:layout_width="match_parent"
@@ -96,7 +94,6 @@
     >
 
     <LinearLayout
-        android:id="@+id/spinnerBox"
         android:layout_gravity="center"
         android:orientation="vertical"
         android:layout_width="170dp"
@@ -125,7 +122,6 @@
 
 
     <LinearLayout
-        android:id="@+id/row_vpn"
         android:layout_gravity="center"
         android:orientation="vertical"
         android:layout_width="170dp"
@@ -169,7 +165,6 @@
             android:layout_weight="1"
             >
             <TextView
-                android:id="@+id/trafficLabelDown"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/main_layout_download"
@@ -205,7 +200,6 @@
 
             >
             <TextView
-                android:id="@+id/trafficLabelUp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/main_layout_upload"
@@ -264,7 +258,6 @@
             />
     </LinearLayout>
     <LinearLayout
-        android:id="@+id/row_apps"
         android:gravity="center_horizontal"
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -304,8 +297,7 @@
     android:layout_width="320dp"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:id="@+id/right_drawer"
-    android:layout_gravity="end"
+         android:layout_gravity="end"
     android:background="#333333"
          android:padding="6dp"
      >
diff --git a/app/src/main/res/layout/layout_orbot_control.xml b/app/src/main/res/layout/layout_orbot_control.xml
deleted file mode 100644
index 6e434590..00000000
--- a/app/src/main/res/layout/layout_orbot_control.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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";
-
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_settings.xml b/app/src/main/res/layout/layout_settings.xml
deleted file mode 100644
index f9b69711..00000000
--- a/app/src/main/res/layout/layout_settings.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-    
-     
-        <ScrollView  android:layout_height="380px"
-            android:layout_width="fill_parent">
-            
-            <EditText android:id="@+id/textSettings"
-            android:layout_height="fill_parent"
-            android:layout_width="fill_parent"
-            android:layout_weight="1.0"
-            android:singleLine="false"
-            android:textSize="11px"
-            />	
-            
-        </ScrollView>
-            
-          <Button android:id="@+id/btnSettingsSave" 
-            android:layout_width="fill_parent" 
-            android:layout_height="40px" 
-             android:text="@string/btn_save_settings"        
-             android:layout_margin="0sp"
-      
-             
-            />
-</LinearLayout>
diff --git a/app/src/main/res/layout/layout_vpn_setup.xml b/app/src/main/res/layout/layout_vpn_setup.xml
deleted file mode 100644
index 5d2c6dc3..00000000
--- a/app/src/main/res/layout/layout_vpn_setup.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<ScrollView android:id="@+id/aboutscrollview" 
-    xmlns:android="http://schemas.android.com/apk/res/android";
-	android:orientation="vertical"
-	android:layout_width="match_parent" 
-	android:layout_height="fill_parent">    
-	<LinearLayout
-	    android:orientation="vertical"
-	    android:layout_width="fill_parent"
-	    android:layout_height="fill_parent">
-	    <TextView android:text="Apps Mode"
-			android:layout_width="fill_parent" 
-			android:layout_height="wrap_content"		
-			android:paddingTop="15px"
-			android:paddingLeft="15px"
-			android:textStyle="bold"
-			android:textColor="#00ff00" />	
-			<TextView android:text=""
-			android:layout_width="fill_parent" 
-			android:layout_height="wrap_content"
-			android:autoLink="web"
-			android:textColorLink="#ffffff"
-			android:paddingLeft="15px"		
-			android:textColor="#ffffff" />
-			
-			 <Button android:id="@+id/btnActivateVPN" 
-           android:layout_width="wrap_content" 
-           android:layout_height="wrap_content" 
-            android:text="Activate"        
-            android:layout_margin="0sp"/>
-			
-		</LinearLayout>
-	</ScrollView>
diff --git a/app/src/main/res/layout/scrollingtext_buttons_view.xml b/app/src/main/res/layout/scrollingtext_buttons_view.xml
deleted file mode 100644
index beea00a4..00000000
--- a/app/src/main/res/layout/scrollingtext_buttons_view.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-   >
-            
-
-       
-<TableLayout  android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content" >
-
-<TableRow android:id="@+id/TableRow01"  android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="10dip">
-
-
-	<ScrollView android:id="@+id/helpscrollview" 
-		android:orientation="vertical"
-		android:layout_width="fill_parent" 
-		android:layout_height="fill_parent"
-		 android:layout_span="3">    
-
-			<TextView  android:background="#575757" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text"  android:textColor="#ffffff"  android:id="@+id/WizardTextBody" android:textSize="8pt" android:layout_width="wrap_content" android:layout_height="wrap_content" android:padding="20dip"></TextView>
-
-		</ScrollView>
-		
-</TableRow>
-<TableRow  android:background="#000000" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px" android:layout_marginTop="10dip" android:paddingTop="10dip">
-	   	<Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>
-    	<Button android:text="@string/btn_next" android:id="@+id/btnWizard2"  android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button>	    
-</TableRow>			
-</TableLayout>
-</LinearLayout>
-
-
diff --git a/app/src/main/res/menu/orbot_main.xml b/app/src/main/res/menu/orbot_main.xml
index cb25b9e0..6359ebdc 100644
--- a/app/src/main/res/menu/orbot_main.xml
+++ b/app/src/main/res/menu/orbot_main.xml
@@ -54,9 +54,7 @@
 
     <item
         android:title="@string/menu_hidden_services"
-        yourapp:showAsAction="never"
-        android:id="@+id/menu_hidden_services_main"
-        >
+        yourapp:showAsAction="never">
       <menu>
         <item android:id="@+id/menu_hidden_services"
               android:title="@string/hosted_services"
diff --git a/app/src/main/res/menu/share_menu.xml b/app/src/main/res/menu/share_menu.xml
deleted file mode 100644
index 2352da03..00000000
--- a/app/src/main/res/menu/share_menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android";>
-    <item
-            android:id="@+id/menu_item_share"
-            android:showAsAction="always"
-            android:title="Share Log" />
-   
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index 036d09bc..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index 036d09bc..00000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index bfa1a8aa..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 97a6f3b1..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 747bf3a7..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index fd6ee423..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 69131a09..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 9462c6c9..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index ac7dc49e..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 505a60aa..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 95a1e66d..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 84b7fa9b..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 99a2d160..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index da1ddc7a..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index ab49f658..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index cc79a13c..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index e43f5c14..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/values-ach/strings.xml b/app/src/main/res/values-ach/strings.xml
index 844f834c..49c8dbc4 100644
--- a/app/src/main/res/values-ach/strings.xml
+++ b/app/src/main/res/values-ach/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-ar/poestrings.xml b/app/src/main/res/values-ar/poestrings.xml
index 436f2008..ebde94bc 100644
--- a/app/src/main/res/values-ar/poestrings.xml
+++ b/app/src/main/res/values-ar/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">اÙ?جسÙ?ر Ù?Ù? Ù?Ù?رÙ?Ø­Ù?Ù?Ù?ات Tor تساعد عÙ?Ù? اÙ?تحاÙ?Ù? عÙ?Ù? اÙ?رÙ?ابة, Ù?Ù?Ù?Ù?Ù? استعÙ?اÙ? اÙ?جسÙ?ر إذا Ù?اÙ? Tor Ù?حجÙ?ب Ù?Ù? Ù?بÙ? شرÙ?Ø© تÙ?Ù?Ù?ر اÙ?اÙ?ترÙ?ت: Ø£Ù?Ù?اع Ù?ختÙ?Ù?Ø© Ù?Ù? اÙ?جسÙ?ر تستخدÙ? اساÙ?Ù?ب Ù?ختÙ?Ù?Ø© Ù?تÙ?ادÙ? اÙ?رÙ?ابة, Ù?Ù? حاÙ?Ø© عدÙ? Ù?جاح أحد اÙ?جسÙ?ر, حاÙ?Ù? استعÙ?اÙ? Ù?Ù?ع أخر. </string>
-
-    <string name="bridges_no">بدÙ?Ù? جسÙ?ر : إتصÙ? Ù?باشرة بتÙ?ر</string>
-    <string name="bridges_provided">اÙ?جسÙ?ر اÙ?Ù?تÙ?Ù?رة :</string>
-    <string name="bridges_custom">اÙ?جسÙ?ر اÙ?خاصة</string>
-
-    <string name="bridges_config">إعدادات اÙ?جسر</string>
-    <string name="action_done">تÙ?</string>
 
     <string name="bridges_sometimes">أحÙ?اÙ?ا تحتاج Ø¥Ù?Ù? جسر Ù?Ù?عبÙ?ر عبر تÙ?ر.</string>
     <string name="action_more">Ø¥Ù?تشÙ? اÙ?Ù?زÙ?د</string>
@@ -16,16 +8,6 @@
     <string name="vpn_setup_sub">Ù?ذا Ù?Ù? Ù?جعÙ?Ù? Ù?جÙ?Ù?Ù? اÙ?Ù?Ù?Ù?Ø© Ù?Ù?Ù?Ù? سÙ?ساعدÙ? Ù?Ù? تخطÙ? جدراÙ? اÙ?Ø­Ù?اÙ?Ø©.</string>
     <string name="action_vpn_choose">إختÙ?ار اÙ?تطبÙ?Ù?ات</string>
 
-    <string name="status_connected">Ù?تصÙ? !</string>
-
-    <string name="loading_claim_1">تÙ?Ù?ع Ù?جتÙ?عÙ?ا Ù?Ù? Ù?ا Ù?جعÙ? تÙ?ر رائعا !</string>
-    <string name="loading_claim_2">Ù?ستخدÙ?Ù? اÙ?Ù?اس تÙ?ر Ù?Ù? Ù?Ù?Ù? تÙ?ادÙ?ا Ù?Ù?تعÙ?Ù?ب اÙ?Ø°Ù? Ù?تعرضÙ?Ù? Ø¥Ù?Ù?Ù? عÙ? طرÙ?Ù? اÙ?إعÙ?اÙ?ات اÙ?تجارÙ?Ø©.</string>
-    <string name="loading_claim_3">Ù?Ù?بÙ?اء عÙ?Ù? اتصاÙ? بعائÙ?اتÙ?Ù? Ù? أصدÙ?ائÙ?Ù? Ù?ستخدÙ? اÙ?Ù?اس تÙ?ر Ù?Ù? حاÙ?Ø© حجب اÙ?Ù?اÙ?سبÙ?Ù?.</string>
-    <string name="loading_claim_4">Ù?ستخدÙ? اÙ?Ù?شطاء تÙ?ر Ù?تغرÙ?د آرائÙ?Ù? Ù? Ù?عتÙ?داتÙ?Ù? بÙ?Ù? حرÙ?Ø©.</string>
-    <string name="loading_claim_5">Ù?ستخدÙ?Ù? اÙ?Ù?Ù?دÙ?Ù?Ù?Ù?Ù?Ù?Ù? تÙ?ر Ù?تحسÙ?س اÙ?Ù?اس Ø­Ù?Ù? Ù?ضاÙ?ا إصÙ?اح اÙ?Ù?جتÙ?ع.</string>
-    <string name="loading_claim_6">Ù?Ù?Ù?Ù? اÙ?صحاÙ?Ù?Ù?Ù? باستخداÙ? تÙ?ر Ù?Ù?تحرÙ? اÙ?Ø¢Ù?Ù? Ù?Ù? اÙ?Ù?ضاÙ?ا اÙ?تÙ? Ù?راسÙ?Ù?Ù? عÙ? شأÙ?Ù?ا.</string>
-    <string name="loading_claim_8">Ù?Ù?Ù?Ù? اÙ?عÙ?اÙ? باستخداÙ? تÙ?ر دÙ?اعا عÙ? Ø­Ù?Ù?Ù?Ù?Ù? Ù? بدÙ?Ù? Ø®Ù?Ù? Ù?Ù? Ø£Ù? Ù?Ù?Ù?دÙ?ا Ù?Ù?اصب عÙ?Ù?Ù?Ù?.</string>
-
     <string name="hello">Ù?رحبا</string>
     <string name="welcome">Ø£Ù?Ù?ا بÙ? Ø¥Ù?Ù? تÙ?ر عÙ?Ù? جÙ?ازÙ? اÙ?Ù?Ø­Ù?Ù?Ù?.</string>
 
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e4209a20..813ee949 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2,128 +2,37 @@
 <resources>
   <string name="app_name">اÙ?ربÙ?ت</string>
   <string name="app_description">اÙ?ربÙ?ت Ù?Ù? تطبÙ?Ù? اÙ?Ù?Ù?Ù?Ù?-اÙ?برÙ?Ù?سÙ? اÙ?حر اÙ?Ø°Ù? Ù?Ù?Ù?Ù?Ù? تطبÙ?Ù?ات أخرÙ? Ù?استخداÙ? اÙ?Ø¥Ù?ترÙ?ت بأÙ?اÙ? Ø£Ù?ثر . Ù?Ù?ستخدÙ? اÙ?ربÙ?ت تÙ?ر Ù?تشÙ?Ù?ر تحرÙ?ات Ù?رÙ?رÙ? عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت Ø? Ø«Ù? Ù?Ø®Ù?Ù?Ù? Ù?Ù?جعÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù? Ø®Ù?اÙ? سÙ?سÙ?Ø© Ù?Ù? أجÙ?زة اÙ?Ù?Ù?بÙ?Ù?تر Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? . تÙ?ر Ù?Ù? تطبÙ?Ù? حر Ù?شبÙ?Ø© Ù?Ù?تÙ?حة Ù?اÙ?تÙ? تساعدÙ? عÙ?Ù? Ø­Ù?اÙ?Ø© Ù?Ù?سÙ? Ù?Ù? Ù?راÙ?بة اÙ?شبÙ?ات اÙ?تÙ? تÙ?دد اÙ?حرÙ?Ø© اÙ?شخصÙ?Ø© Ù?اÙ?خصÙ?صÙ?Ø© Ø? Ù?اÙ?Ø£Ù?شطة اÙ?تجارÙ?Ø© اÙ?سرÙ?Ø© Ù?اÙ?عÙ?اÙ?ات Ø? Ù?Ø£Ù?Ù? اÙ?دÙ?Ù?Ø© Ù?اÙ?Ø­Ù?Ù?Ù?ات اÙ?Ù?Ù?عÙ?Ù?Ø© Ù?اÙ?تÙ? تستخدÙ? Ù?اÙ?عرÙ? باسÙ? تحÙ?Ù?Ù? حرÙ?Ø© Ù?رÙ?ر اÙ?بÙ?اÙ?ات .</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ù?عÙ? Ù? اÙ?Ù?Ù? تÙ?ر</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">جارÙ? تشغÙ?Ù? اÙ?ربÙ?ت...</string>
   <string name="status_activated">Ù?تصÙ? بشبÙ?Ø© تÙ?ر</string>
   <string name="status_disabled">تÙ? Ø¥Ù?Ù?اÙ? اÙ?ربÙ?ت</string>
   <string name="status_shutting_down">جارÙ? اÙ?Ù?اÙ? خدÙ?Ø© تÙ?ر</string>
   <string name="tor_process_starting">جارÙ? تشغÙ?Ù? تÙ?ر...</string>
   <string name="tor_process_complete">Ù?اÙ?Ù?.</string>
-  <string name="tor_process_waiting">اÙ?تظار.</string>
-  <string name="not_anonymous_yet">تحذÙ?ر: حرÙ?Ø© Ù?رÙ?رÙ? Ù?Ù?ست Ø®Ù?Ù?Ø© حتÙ? اÙ?Ø¢Ù?! Ù?Ù? Ù?ضÙ?Ù? Ù?Ù? بإعداد اÙ?تطبÙ?Ù?ات اÙ?خاصة بÙ? Ù?إستخداÙ? برÙ?Ù?سÙ? HTTP 127.0.0.1:8118 Ø£Ù? SOCK4A Ø£Ù? SOKS5 127.0.0.1:9050</string>
-  <string name="menu_home">اÙ?Ù?ائÙ?Ø© اÙ?رئÙ?سÙ?Ø©</string>
-  <string name="menu_browse">تصÙ?Ù?Ø­</string>
   <string name="menu_settings">إعدادات</string>
   <string name="menu_log">اÙ?سجÙ?</string>
-  <string name="menu_info">Ù?ساعدة</string>
-  <string name="menu_apps">اÙ?تطبÙ?Ù?ات ...</string>
   <string name="menu_start">بدء</string>
   <string name="menu_stop">تÙ?Ù?Ù?</string>
   <string name="menu_about">Ø­Ù?Ù?</string>
-  <string name="menu_promo_apps">Ø­Ù?Ù? اÙ?تطبÙ?Ù? ...</string>
   <string name="main_layout_download">تحÙ?Ù?Ù?</string>
   <string name="main_layout_upload">رÙ?ع</string>
-  <string name="button_help">Ù?ساعدة</string>
-  <string name="button_close">إغÙ?اÙ?</string>
   <string name="button_about">Ø­Ù?Ù?</string>
-  <string name="button_clear_log">Ù?سح اÙ?سجÙ?</string>
-  <string name="menu_verify">تحÙ?Ù?</string>
   <string name="menu_exit">خرÙ?ج</string>
   <string name="menu_scan">Ù?حص QR اÙ?جسر</string>
   <string name="menu_share_bridge">Ù?شارÙ?Ø© QR اÙ?جسر</string>
-  <string name="press_to_start">- اضغط Ù?Ù?ترة Ø·Ù?Ù?Ù?Ø© Ù?Ù?بدء -</string>
-  <string name="pref_trans_proxy_group">برÙ?Ù?سÙ? ضÙ?Ù?Ù? (Ù?تطÙ?ب اذÙ? حساب رÙ?Ù?ت)</string>
-  <string name="pref_trans_proxy_title">برÙ?Ù?سÙ? ضÙ?Ù?Ù?</string>
-  <string name="pref_trans_proxy_summary">عÙ?Ù?Ù?Ø© تÙ?رÙ?Ù?اÙ? Ø£Ù?تÙ?Ù?اتÙ?Ù?Ù?Ø© Ù?Ù?تطبÙ?Ù?ات</string>
-  <string name="pref_transparent_all_title">استخدÙ? تÙ?ر Ù?ع جÙ?Ù?ع اÙ?تطبÙ?Ù?ات</string>
-  <string name="pref_transparent_all_summary">Ù?رر Ù?Ù? بÙ?اÙ?ات اÙ?Ù?رÙ?ر اÙ?خاصة باÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
-  <string name="pref_transparent_port_fallback_title">تراجع Ù?Ù?Ù?Ø° اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_transparent_port_fallback_summary">تحذÙ?ر: تتحاÙ?Ù? عÙ?Ù? اÙ?Ù?Ù?اÙ?Ø° اÙ?شائعة  (80, 443, Ø¥Ù?Ù? آخرÙ?) *استخدÙ? Ù?Ù?Ø·* إذا Ù?اÙ? Ù?ضع \'Ù?Ù?\' Ø£Ù? \'اÙ?تطبÙ?Ù?\' Ù?ا Ù?عÙ?Ù?.</string>
-  <string name="pref_transparent_port_title">Ù?ائÙ?Ø© اÙ?Ù?Ù?اÙ?Ø°</string>
-  <string name="pref_transparent_port_summary">Ù?ائÙ?Ø© بجÙ?Ù?ع اÙ?Ù?Ù?اÙ?Ø° Ø¥Ù?Ù? اÙ?برÙ?Ù?سÙ?. *استخدÙ? Ù?Ù?Ø·* إذا Ù?اÙ? Ù?ضع \'Ù?Ù?\' Ø£Ù? \'اÙ?تطبÙ?Ù?\' Ù?ا Ù?عÙ?Ù?.</string>
-  <string name="pref_transparent_port_dialog">ادخÙ? اÙ?Ù?Ù?اÙ?Ø° Ù?Ù?برÙ?Ù?سÙ?</string>
-  <string name="pref_has_root">اطÙ?ب إذÙ? رÙ?Ù?ت</string>
-  <string name="pref_has_root_summary">اطÙ?ب إذÙ? رÙ?Ù?ت Ù?تÙ?عÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?</string>
-  <string name="status_install_success">تÙ? تثبÙ?ت تÙ?ر بÙ?جاح!</string>
-  <string name="status_install_fail">غÙ?ر Ù?ادر عÙ?Ù? تثبÙ?ت Ù?Ù?Ù?ات تÙ?ر. Ù?رجÙ? Ù?راجعة اÙ?سجÙ? Ù?إعÙ?اÙ?Ù?ا عÙ?Ù? اÙ?برÙ?د اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù? tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">خطأ Ù?Ù? اÙ?تطبÙ?Ù?</string>
-  <string name="wizard_title">اÙ?ربÙ?ت</string>
-  <string name="wizard_btn_tell_me_more">عÙ? اÙ?ربÙ?ت</string>
-  <string name="btn_next">اÙ?تاÙ?Ù?</string>
-  <string name="btn_back">رجÙ?ع</string>
-  <string name="btn_finish">Ø¥Ù?Ù?اء</string>
   <string name="btn_okay">Ù?Ù?اÙ?Ù?</string>
   <string name="btn_cancel">Ø¥Ù?غاء</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? اÙ?ربÙ?ت</string>
-  <string name="wizard_permissions_root">تÙ? Ù?Ù?Ø­ اÙ?إذÙ?</string>
-  <string name="wizard_permissions_stock">أذÙ?Ù?ات اÙ?ربÙ?ت</string>
-  <string name="wizard_premissions_msg_root">Ù?Ù?تاز! Ù?Ù?د Ù?جدÙ?ا بأÙ?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ù?تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت. سÙ?Ù? Ù?ستخدÙ? Ù?Ø°Ù? اÙ?سÙ?طة بحÙ?Ù?Ø©.</string>
-  <string name="wizard_permissions_msg_stock">رغÙ? Ø£Ù?Ù? Ù?Ù?س ضرÙ?رÙ?اØ? Ù?Ù?Ù?Ù? اÙ? Ù?صبح Ø£Ù?ربÙ?ت أداة Ù?Ù?Ù?Ø© إذا Ù?اÙ? Ù?دÙ? جÙ?ازÙ? صÙ?احÙ?Ø© حساب رÙ?Ù?ت. استخدÙ? اÙ?زر باÙ?أسÙ?Ù? Ù?Ù?Ù?Ø­ اÙ?ربÙ?ت Ù?Ù?Ø© Ø£Ù?بر!</string>
-  <string name="wizard_permissions_no_root">إذا Ù?Ù? Ù?Ù?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ø£Ù? Ù?Ù?ست Ù?دÙ?Ù? أدÙ?Ù? Ù?Ù?رة عÙ?ا Ù?تحدث عÙ?Ù?Ø? تأÙ?د Ù?Ù?Ø· Ù?Ù? استخداÙ? تطبÙ?Ù?ات تعÙ?Ù? Ù?ع اÙ?ربÙ?ت.</string>
-  <string name="wizard_permissions_consent">Ø£Ù?Ù?Ù? Ø°Ù?Ù? Ù?Ø£Ù?د Ø£Ù? أستÙ?ر بدÙ?Ù? صÙ?احÙ?ات حساب رÙ?Ù?ت</string>
-  <string name="wizard_permission_enable_root">اÙ?Ù?Ø­ اÙ?ربÙ?ت صÙ?احÙ?Ø© حساب رÙ?Ù?ت</string>
-  <string name="wizard_configure">تÙ?Ù?Ù?Ù? تÙ?رÙ?Ù?اÙ?</string>
-  <string name="wizard_configure_msg">اÙ?ربÙ?ت Ù?عطÙ?Ù? اÙ?Ø®Ù?ار Ù?تÙ?جÙ?Ù? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?تطبÙ?Ù?ات عبر تÙ?ر اÙ? Ù?إختÙ?ار اÙ?تطبÙ?Ù?ات بشÙ?Ù? Ù?ردÙ?.</string>
-  <string name="wizard_configure_all">Ù?رر جÙ?Ù?ع اÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
-  <string name="wizard_configure_select_apps">اختر اÙ?تطبÙ?Ù?ات اÙ?Ù?ردÙ?Ø© Ù?تÙ?ر</string>
-  <string name="wizard_tips_tricks">تطبÙ?Ù?ات Ù?Ù?Ù?ئة Ù?اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_msg">اÙ?تطبÙ?Ù?ات اÙ?تاÙ?Ù?Ø© تÙ? تطÙ?Ù?رÙ?ا حتÙ? تعÙ?Ù? Ù?ع اÙ?ربÙ?ت. اضغط عÙ?Ù? Ù?ا ترÙ?د تثبÙ?تة عÙ?Ù? جÙ?ازÙ? اÙ?Ø£Ù?, Ø£Ù? Ù?Ù?Ù?Ù?Ù? اÙ? تجدÙ?Ù? Ù?احÙ?اÙ? عÙ?Ù? جÙ?جÙ? بÙ?اÙ?, Ø£Ù? عÙ?Ù? Ù?Ù?Ù?عÙ?ا GuardianProject.info Ø£Ù? Ù?Ù? Ø®Ù?اÙ? F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">اÙ?دردشة اÙ?Ø¢Ù?Ù?Ø© - تأÙ?Ù?Ù? اÙ?رسائÙ? اÙ?Ù?Ù?رÙ?Ø© Ù?Ù?ستخدÙ?Ù? اÙ?اÙ?درÙ?Ù?د</string>
-  <string name="wizard_tips_proxy">إعدادات اÙ?برÙ?Ù?سÙ? - تعÙ?Ù? Ù?Ù?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات Ù?تعÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_duckgo">تطبÙ?Ù? Ù?حرÙ? اÙ?بحث DuckDuckGo</string>
-  <string name="wizard_tips_twitter">اضبط اÙ?برÙ?Ù?سÙ? اÙ?خاص بتÙ?Ù?تر Ø¥Ù?Ù? Ù?ستضÙ?Ù? \"localhost\" Ù? اÙ?Ù?Ù?Ù?Ø° Ø¥Ù?Ù? 8118</string>
-  <string name="wizard_tips_story_maker">صاÙ?ع اÙ?Ù?صة - اصÙ?ع Ù?صة Ù?اترÙ?Ù?ا Ù?Ø£Ù?اÙ? تÙ?ر !</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">إعدادات اÙ?برÙ?Ù?سÙ?</string>
-  <string name="wizard_proxy_help_msg">إذا Ù?اÙ? تطبÙ?Ù? اÙ?اÙ?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?دعÙ? استخداÙ? Ù?Ù?Ù?Ù? - برÙ?Ù?سÙ?HTTP Ø£Ù? SOCKS  إذاÙ? Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?اتصاÙ? باÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.  إعدادات اÙ?Ù?ضÙ?Ù? 127.0.0.1 Ø£Ù? \"Ù?ضÙ?Ù?\". Ù? HTTPØ? إعداد اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 8118. Ù?SOCKSØ? اÙ?Ù?Ù?Ù?Ù? Ù?Ù? 9050. Ù?جب عÙ?Ù?Ù? استخداÙ? SOCKS4A Ø£Ù? SOCKS5 إذا Ø£Ù?Ù?Ù? \ N \ N \ N \ N Ù?Ù?Ù?Ù?Ù? Ù?عرÙ?Ø© اÙ?Ù?زÙ?د Ø­Ù?Ù? Ø¥Ù?شاء اÙ?Ù?Ù?Ù?اء عÙ?Ù? اÙ?رÙ?بÙ?ت Ù?Ù? Ø®Ù?اÙ? اÙ?تعÙ?Ù?Ù?ات عÙ?Ù?: 
-HTTP: / /tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">اÙ?ربÙ?ت جاÙ?ز Ù?Ù?استخداÙ?!</string>
-  <string name="wizard_final_msg">اÙ?Ù?Ù?اÙ?Ù?Ù? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? تستخدÙ? تÙ?ر Ù?Ù?جÙ?Ù?عة Ù?اسعة Ù?Ù? اÙ?أسباب . اÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù? , اÙ?Ù?داÙ?عÙ?Ù? عÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ? Ø? Ù?ضباط تÙ?Ù?Ù?Ø° اÙ?Ù?اÙ?Ù?Ù? Ø? Ù?اÙ?جÙ?Ù?د Ø? Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? Ù?Ù? اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø© Ø? Ù?اÙ?ضاÙ? اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ù?Ù? Ø£Ù?ت جاÙ?ز Ø? Ù?Ù?ا بÙ?ا !</string>
-  <string name="wizard_exit_at_first_screen_toast">Ù?رجÙ? تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?اعدادÙ? Ù?تستطÙ?ع اÙ?بدء بإستخداÙ?Ù? !</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ù?دÙ?Ù? اتصاÙ? Ù?اجح بشبÙ?Ø© تÙ?ر - Ù?Ù?Ù?Ù? Ù?ذا Ù?ا Ù?عÙ?Ù? Ø£Ù? جÙ?ازÙ? Ø¢Ù?Ù? . Ù?Ù?Ù?Ù?Ù? استخداÙ? زر \"Ù?تصÙ?Ø­\" Ù?اختبار اتصاÙ?Ù? .
-  زرÙ?ا عÙ?Ù? https://guardianproject.info/apps/orbot Ø£Ù? ارسÙ? برÙ?د اÙ?Ù?ترÙ?Ù?Ù? اÙ?Ù? help@xxxxxxxxxxxxxxxxxxxx  Ù?Ù?عرÙ?Ø© اÙ?Ù?زÙ?د.</string>
-  <string name="tor_check">سÙ?ؤدÙ? Ù?ذا Ø¥Ù?Ù? Ù?تح اÙ?Ù?تصÙ?Ø­ اÙ?خاص بÙ? Ù?زÙ?ارة عÙ?Ù?اÙ? https://check.torproject.org Ù?Ù? اجÙ? اÙ?تحÙ?Ù? إذا Ù?اÙ? تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?عÙ?Ù? بشÙ?Ù? صحÙ?Ø­ اÙ? Ù?ا Ù?بأÙ?Ù? Ù?تصÙ? بتÙ?ر.</string>
-  <string name="pref_hs_group">استضاÙ?Ø© اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="pref_general_group">عاÙ?</string>
   <string name="pref_start_boot_title">شغÙ? اÙ?ربÙ?ت عÙ?د Ù?تح اÙ?جÙ?از</string>
   <string name="pref_start_boot_summary">Ù?عÙ? اÙ?ربÙ?ت Ù? اتصÙ? بتÙ?ر تÙ?Ù?ائÙ?اÙ? عÙ?دÙ?ا Ù?بدء جÙ?از اÙ?Ø£Ù?درÙ?Ù?د اÙ?خاص بÙ? باÙ?عÙ?Ù?</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">اÙ?ربت Ù?جعÙ? تÙ?ر Ù?Ù?Ù?Ù?اÙ? عÙ?Ù? Ù?ظاÙ? اÙ?Ø£Ù?درÙ?Ù?د. Ù?ساعدÙ? تÙ?ر Ù?Ù? اÙ?دÙ?اع ضد عÙ?Ù?Ù?Ø© ترشÙ?Ø­ اÙ?Ù?حتÙ?Ù?ات, تحÙ?Ù?Ù? Ù?سارات اÙ?Ù?رÙ?ر, Ù?Ù?راÙ?بة اÙ?شبÙ?Ø© Ù?اÙ?تÙ? تÙ?دد خصÙ?صÙ?تÙ?, اÙ?Ù?عÙ?Ù?Ù?ات اÙ?سرÙ?Ø© Ù?اÙ?عÙ?اÙ?ات اÙ?شخصÙ?Ø©. Ù?Ø°Ù? اÙ?أداة ستساعدÙ? Ù?Ù? تÙ?Ù?ئة اÙ?ربت Ù?ع تÙ?ر عÙ?Ù? جÙ?ازÙ?</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">تحذÙ?ر</string>
-  <string name="wizard_warning_msg">Ù?Ù? Ù?Ù?Ù?Ù? اÙ?ربت بأخÙ?اء Ù?Ù?Ù?Ø© Ù?سارÙ? بشÙ?Ù? اÙ?تÙ?Ù?اتÙ?Ù?Ù? اÙ? Ø¢Ù?Ù? بÙ?جرد تÙ?صÙ?بÙ?. بÙ? Ù?جب عÙ?Ù?Ù? اÙ? تÙ?Ù?Ù? بتÙ?Ù?ئتÙ? Ù?ع جÙ?ازÙ? باÙ?أضاÙ?Ø© اÙ?Ù? تÙ?Ù?ئة تطبÙ?Ù?ات اخرÙ? Ù?تستطÙ?ع استخداÙ? تÙ?ر بÙ?جاح.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">اÙ?صÙ?احÙ?ات</string>
-  <string name="wizard_permissions_root_msg1">Ù?Ù?Ù?Ù?Ù? اعطاء اÙ?ربÙ?ت صÙ?احÙ?ات حساب رÙ?Ù?ت Ù?تشغÙ?Ù? اÙ?Ù?Ù?Ù?زات اÙ?Ù?تÙ?دÙ?Ø© Ù?Ø«Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?.</string>
-  <string name="wizard_permissions_root_msg2">إذا Ù?Ù?ت Ù?ا ترÙ?د Ø£Ù? تÙ?عÙ? Ù?ذا, اÙ?رجاء إستخداÙ? براÙ?ج Ù?عدة Ù?Ù?عÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
-  <string name="wizard_permissions_no_root_msg">Ù?بدÙ? Ø£Ù?Ù? جÙ?ازÙ? Ù?ا غÙ?ر Ù?رÙ?Ù?ت Ø£Ù? Ù?ا Ù?عطÙ? صÙ?احÙ?Ù?ات اÙ?رÙ?تØ? Ø£Ù? Ù?ا Ù?عطÙ? خاصÙ?Ù?Ø© \"سÙ?برÙ?Ù?زر\".
-
-Ù?ضÙ?ا جرÙ?ب Ù?ظاÙ? \"تطبÙ?Ù?ات\" Ù?Ù? اÙ?شاشة اÙ?رئÙ?سÙ?Ù?Ø©.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title"> براÙ?ج Ù?عدة Ù?Ù?عÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_gibberbot">جات سÙ?Ù?Ù?ر: Ù?Ù? تطبÙ?Ù? Ù?Ù?دردشة بشÙ?Ù? Ø¢Ù?Ù? Ù?ع تشÙ?Ù?ر عاÙ?Ù? جداÙ?</string>
-  <string name="wizard_tips_orweb">اÙ?رÙ?Ù?Ù?س: Ù?تصÙ?Ø­ Ø°Ù? خصÙ?صÙ?Ø© Ù?تÙ?دÙ?Ø© Ù?عÙ?Ù? ظÙ?Ù? اÙ? Ù?Ù? Ø®Ù?اÙ? تÙ?ر</string>
-  <string name="wizard_tips_play">Ù?Ù?Ù?Ù?Ù? اÙ?حصÙ?Ù? عÙ?Ù? جÙ?Ù?ع تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?Ù? عÙ?Ù? جÙ?جÙ? بÙ?اÙ?</string>
-  <string name="wizard_tips_fdroid">اÙ?تشÙ? Ù?Ù? تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?اÙ? عÙ?Ù? اÙ?-درÙ?Ù?د</string>
-  <string name="wizard_tips_fdroid_org">اÙ?تشÙ? Ù?Ù? تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?اÙ? عÙ?Ù? https://f-droid.org </string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">برÙ?Ù?سÙ? ضÙ?Ù?Ù?</string>
-  <string name="wizard_transproxy_msg">Ù?Ø°Ù? ستسÙ?Ø­ Ù?Ù?براÙ?ج باÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر تÙ?Ù?ائÙ?اÙ? دÙ?Ù? اعداد Ù?سبÙ?.</string>
-  <string name="wizard_transproxy_hint">(اختر Ù?ذا اÙ?Ù?ربع إذا Ù?Ù?ت Ù?ا تعÙ?Ù? عÙ?ا Ù?تحدث)</string>
-  <string name="wizard_transproxy_none">Ù?ا Ø´Ù?Ø¡</string>
-  <string name="pref_transparent_tethering_title">اÙ?ربط بتÙ?ر</string>
-  <string name="pref_transparent_tethering_summary">اسÙ?Ø­ باÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? Ù?Ù?Ù?اÙ? Ù?اÙ? Ù? اجÙ?زة اÙ?Ù?Ù? اس بÙ?  (تحتاج Ù?إعادة تشغÙ?Ù? اÙ?جÙ?از)</string>
-  <string name="button_grant_superuser">اطÙ?ب صÙ?احÙ?ات حساب رÙ?Ù?ت</string>
-  <string name="pref_select_apps">حدد اÙ?براÙ?ج</string>
-  <string name="pref_select_apps_summary">اختر اÙ?براÙ?Ø­ اÙ?تÙ? ترÙ?د تÙ?رÙ?رÙ?ا Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر</string>
   <string name="pref_node_configuration">تÙ?Ù?Ù?Ù? Ù?Ù?طة اÙ?اتصاÙ?</string>
   <string name="pref_node_configuration_summary">Ù?Ø°Ù? اÙ?إعدادات Ù?تÙ?دÙ?Ø© Ù? Ù?د تÙ?Ù?Ù? Ù?Ù? Ø­Ù?اÙ?Ø© Ù?Ù?Ù?تÙ?</string>
   <string name="pref_entrance_node">Ù?Ù?اط اÙ?دخÙ?Ù?</string>
@@ -131,9 +40,6 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="pref_entrance_node_dialog">أدخÙ? Ù?Ù?اط اÙ?دخÙ?Ù?</string>
   <string name="pref_allow_background_starts_title">إسÙ?Ø­ Ù?Ù?Ø®Ù?Ù?Ù?Ø© بأÙ?بدأ</string>
   <string name="pref_allow_background_starts_summary">إسÙ?Ø­ Ù?Ø£Ù? تطبÙ?Ù? بأÙ? Ù?Ù?خبÙ?ر اÙ?ربت بأÙ? Ù?Ù?عÙ? تÙ?ر Ù?ع اÙ?خدÙ?ات اÙ?Ù?رتبطة بÙ?</string>
-  <string name="button_proxy_all">اÙ?Ø®Ù?Ù?Ù?Ù? اÙ?Ù?Ù?</string>
-  <string name="button_proxy_none">بدÙ?Ù? تخÙ?Ù?Ù?</string>
-  <string name="button_invert_selection">اعÙ?س اÙ?Ù?Ù?حدد</string>
   <string name="pref_proxy_title">برÙ?Ù?سÙ? اÙ?شبÙ?Ø© اÙ?صادرة (اختÙ?ارÙ?)</string>
   <string name="pref_proxy_type_title">Ù?Ù?ع اÙ?برÙ?Ù?سÙ? اÙ?صادر</string>
   <string name="pref_proxy_type_summary">اÙ?برÙ?تÙ?Ù?Ù?Ù? اÙ?Ù?ستخدÙ? Ù?خادÙ? اÙ?برÙ?Ù?سÙ?: HTTP, HTTPS, Socks4, Socks5</string>
@@ -150,19 +56,7 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="pref_proxy_password_title">Ù?Ù?Ù?Ø© Ù?رÙ?ر برÙ?Ù?سÙ? اÙ?شبÙ?Ø© اÙ?صادرة</string>
   <string name="pref_proxy_password_summary">Ù?Ù?Ù?Ø© Ù?رÙ?ر اÙ?برÙ?Ù?سÙ? (اختÙ?ارÙ?)</string>
   <string name="pref_proxy_password_dialog">ادخÙ? Ù?Ù?Ù?Ø© Ù?رÙ?ر اÙ?برÙ?Ù?سÙ?</string>
-  <string name="status">اÙ?حاÙ?Ø©</string>
-  <string name="setting_up_full_transparent_proxying_">Ù?تÙ? إعداد برÙ?Ù?سÙ? ضÙ?Ù?Ù? Ù?اÙ?Ù?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ù?تÙ? إعداد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? حسب اÙ?براÙ?ج...</string>
-  <string name="transparent_proxying_enabled">اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? Ù?Ù?Ù?عÙ?</string>
-  <string name="transproxy_enabled_for_tethering_">اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? جاÙ?ز Ù?Ù?ربط!</string>
-  <string name="warning_error_starting_transparent_proxying_">تحذÙ?ر: حصÙ? خطأ بتشغÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?!</string>
-  <string name="transproxy_rules_cleared">تÙ? Ù?سح Ù?Ù?اعد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?</string>
   <string name="couldn_t_start_tor_process_">Ù?Ù?د تعذر بدء تشغÙ?Ù? تÙ?ر:</string>
-  <string name="privoxy_is_running_on_port_">Ù?شتغÙ? بÙ?Ù?Ù?بÙ? عÙ?Ù? اÙ?Ù?Ù?Ù?Ø° : </string>
-  <string name="setting_up_port_based_transparent_proxying_">Ù?تÙ? إعداد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? حسب اÙ?Ù?Ù?Ù?Ø°...</string>
-  <string name="bridge_error">خطأ باÙ?جسر</string>
-  <string name="bridge_requires_ip">حتÙ? تستطÙ?ع إستخدÙ? Ù?Ù?زة اÙ?جسÙ?رØ? Ù?جب عÙ?Ù?Ù? ادخاÙ? عÙ?Ù?اÙ? اÙ?ترÙ?ت Ù?جسر Ù?احد عÙ?Ù? اÙ?Ø£Ù?Ù?.</string>
-  <string name="send_email_for_bridges">أرسÙ? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ع عبارة \"get bridges\" بداخÙ? اÙ?رساÙ?Ø© Ù?Ù? حساب برÙ?د gmail.</string>
   <string name="error">خطأ</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات اÙ?عÙ?Ù?اÙ? اÙ?Ù?ابÙ? Ù?Ù?اتصاÙ? Ù?دÙ?Ù? تسببت بخطأ!</string>
   <string name="your_relay_settings_caused_an_exception_">إعدادات اÙ?Ù?رحÙ?ات Ù?دÙ?Ù? تسببت بخطأ!</string>
@@ -176,8 +70,6 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="use_only_these_specified_nodes">استخدÙ? Ù?Ù?Ø· تÙ?Ù? اÙ?Ù?Ù?اط اÙ?Ù?حددة</string>
   <string name="bridges">اÙ?جسÙ?ر</string>
   <string name="use_bridges">استخدÙ? اÙ?جسÙ?ر</string>
-  <string name="bridges_obfuscated">اÙ?جسÙ?ر اÙ?غاÙ?ضة</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ù?عÙ? Ù?ذا اÙ?Ø®Ù?ار إذا Ù?اÙ?ت اÙ?جسÙ?ر اÙ?Ù?حددة جسÙ?ر غاÙ?ضة</string>
   <string name="ip_address_and_port_of_bridges">عÙ?Ù?اÙ? اÙ?اÙ?ترÙ?ت Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ù?جسÙ?ر</string>
   <string name="enter_bridge_addresses">أدخÙ? عÙ?اÙ?Ù?Ù? اÙ?جسÙ?ر</string>
   <string name="relays">اÙ?Ù?رحÙ?ات</string>
@@ -194,16 +86,9 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="reachable_ports">اÙ?Ù?Ù?اÙ?Ø° اÙ?تÙ? Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ù?Ù?اÙ?Ø° Ù?Ù?تÙ?حة عبر جدار Ù?ارÙ? تÙ?Ù?دÙ?</string>
   <string name="enter_ports">أدخÙ? اÙ?Ù?Ù?اÙ?Ø°</string>
-  <string name="enable_hidden_services">استضاÙ?Ø© اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="run_servers_accessible_via_the_tor_network">اÙ?سÙ?اح Ù?Ù?خادÙ? اÙ?Ø°Ù? عÙ?Ù? جÙ?ازÙ? بأÙ?Ù?اÙ?Ù?Ø© اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù? Ù?Ù? Ø®Ù?اÙ? شبÙ?Ø© تÙ?ر</string>
-  <string name="enter_localhost_ports_for_hidden_services">أدخÙ? اÙ?Ù?Ù?اÙ?Ø° اÙ?Ù?Ø­Ù?Ù?Ø© Ù?Ù?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="hidden_service_ports">Ù?Ù?اÙ?Ø° اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسÙ? اÙ?عÙ?Ù?اÙ? Ù?خدÙ?تÙ? اÙ?Ù?Ø®Ù?Ù?Ø© (Ù?تÙ? اÙ?شائÙ? تÙ?Ù?ائÙ?اÙ?)</string>
   <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغÙ? سجÙ? اÙ?Ù?debug ( Ù?Ù?Ù?راجعة Ù?جب استخداÙ? adb Ø£Ù? LogCat)</string>
   <string name="project_home">اÙ?Ù?Ù?Ù?ع اÙ?رسÙ?Ù? Ù?Ù?Ù?شرÙ?ع (اÙ?Ù?شارÙ?ع):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">رخصة استخداÙ? تÙ?ر</string>
-  <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">براÙ?ج Ù?Ù? اÙ?طرÙ? اÙ?ثاÙ?Ø«:</string>
   <string name="tor_version">تÙ?ر: https://www.torproject.org</string>
   <string name="libevent_version">Ù?ب Ø¥Ù?Ù?Ù?Ù?ت اÙ?Ù?سخة http://www.monkey.org/~provos/libevent/ :v2.0.21</string>
@@ -212,36 +97,17 @@ HTTP: / /tinyurl.com/proxyandroid\n</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="hidden_service_on">اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø© اÙ?تÙ? تعÙ?Ù? حاÙ?Ù?اÙ?:</string>
   <string name="unable_to_read_hidden_service_name">غÙ?ر Ù?ادر عÙ?Ù? Ù?راءة اسÙ? اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="unable_to_start_tor">غÙ?ر Ù?ادر عÙ?Ù? بدء تÙ?ر:</string>
-  <string name="unable_to_reset_tor">أعÙ?د تشغÙ?Ù? جÙ?ازÙ?, غÙ?ر Ù?ادر عÙ?Ù? اعادة تشغÙ?Ù? تÙ?ر</string>
-  <string name="pref_use_sys_iptables_title">استخدÙ? اÙ?Ù?iptables اÙ?تÙ?Ù?ائÙ?Ø©</string>
-  <string name="pref_use_sys_iptables_summary">استخدÙ? Ù?Ù?Ù?Ù?ات اÙ?Ù?iptables اÙ?Ù?Ù?جÙ?دة ضÙ?Ù?اÙ? باÙ?جÙ?از بدÙ? اÙ?Ù?سخة اÙ?Ù?رÙ?Ù?Ø© Ù?ع اÙ?ربÙ?ت</string>
-  <string name="error_installing_binares">غÙ?ر Ù?ادرة عÙ?Ù? تثبÙ?ت Ø£Ù? تحدÙ?Ø« تÙ?ر</string>
   <string name="pref_use_persistent_notifications">دائÙ?ا ضع اÙ?Ø£Ù?Ù?Ù?Ù?Ø© Ù?Ù? شرÙ?Ø· اÙ?أدÙ?ات عÙ?دÙ?ا Ù?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?تصÙ?اÙ?</string>
   <string name="pref_use_persistent_notifications_title">تÙ?بÙ?Ù?ات دائÙ?Ø©</string>
   <string name="pref_use_expanded_notifications">Ù?Ù? بأظÙ?ار اÙ?تÙ?بÙ?Ù? بشÙ?Ù? Ù?Ù?سع بأستخداÙ? تÙ?ر. أخرج Ù?Ù? اÙ?بÙ?د Ù?رÙ?Ù? اÙ?Ø¢Ù? بÙ? رÙ?Ù? اÙ?عÙ?Ù?اÙ? عÙ?Ù? اÙ?شبÙ?Ø©</string>
   <string name="pref_use_expanded_notifications_title">تÙ?بÙ?Ù? Ù?Ù?سÙ?ع</string>
-  <string name="notification_using_bridges">تÙ? تÙ?عÙ?Ù? اÙ?جسÙ?ر!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">اÙ?Ù?غة</string>
-  <string name="set_locale_summary">اختار  اÙ?إعدادات اÙ?Ù?Ø­Ù?Ù?Ø© Ù? اÙ?Ù?غة Ù?اÙ?ربÙ?ت</string>
-  <string name="wizard_locale_title">اختار اÙ?Ù?غة</string>
-  <string name="wizard_locale_msg">Ø¥Ù?ا اÙ? تترÙ? اÙ?Ù?غة اÙ?اÙ?تراضÙ?Ø© اÙ? Ø¥Ù?ا اÙ? تغÙ?ر اÙ?Ù?غة</string>
-  <string name="powered_by">Ù?دعÙ?Ù?Ø© Ù?Ù? Ù?بÙ? تÙ?ر</string>
-  <string name="btn_save_settings">Ø­Ù?ظ اÙ?إعدادات</string>
   <string name="no_internet_connection_tor">Ù?ا Ù?Ù?جد ارتباط بأÙ?اÙ?ترÙ?Ù?ت: تÙ?ر Ù?Ù? Ù?ضع اÙ?Ù?Ù?Ù? اÙ?Ù?ؤÙ?ت</string>
-  <string name="bandwidth_">عرض اÙ?Ù?طاÙ?</string>
-  <string name="down">أسÙ?Ù?</string>
-  <string name="up">أعÙ?Ù?</string>
   <string name="pref_disable_network_title">Ù?اتÙ?جد شبÙ?Ø© Ù?Ù?Ù?-Ø¢Ù?Ù?</string>
   <string name="pref_disable_network_summary">ضع تÙ?ر Ù?Ù? Ù?ضعÙ?Ø© اÙ?Ù?Ù?Ù? عÙ?د عدÙ? Ù?جÙ?د اÙ?Ø£Ù?ترÙ?ت</string>
   <string name="newnym">Ù?Ù?د تحÙ?Ù?ت اÙ?Ù? Ù?Ù?Ù?Ø© تÙ?ر جدÙ?دة</string>
-  <string name="menu_verify_browser">Ù?تصÙ?Ø­</string>
-  <string name="menu_use_chatsecure">استخدÙ? شات سÙ?Ù?Ù?ر </string>
-  <string name="permission_manage_tor_label">إدارة تÙ?ر</string>
-  <string name="permission_manage_tor_description">Ù?Ù? بتÙ?Ù?Ù?Ù? Ù?ذا اÙ?تطبÙ?Ù? Ù?Ù? اÙ?تحÙ?Ù? بخدÙ?ات تÙ?ر</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ù?شتغÙ? Ø£Ù?ربÙ?ت أحسÙ? Ù?ع Ù?تصÙ?Ø­ Ø£Ù?رÙ?Ù?Ù?س. Ù?Ù? تÙ?د تثبÙ?تÙ? اÙ?Ø¢Ù? Ø?</string>
   <string name="install_apps_">Ù?Ù? تÙ?د تÙ?صÙ?ب Ù?تصÙ?Ø­ Ø?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ù?ا Ù?Ù?جد اتصاÙ? بأÙ?شبÙ?Ø©. سÙ?Ù?تÙ?Ù? تÙ?ر اÙ?Ù? Ù?ضعÙ?Ø© اÙ?Ù?Ù?Ù?</string>
@@ -259,18 +125,6 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="pref_torrc_title">ترتÙ?بات خاصة بÙ? torrc</string>
   <string name="pref_torrc_summary">Ù?Ù?خبراء Ù?Ù?Ø· : أدخÙ? أسطر Ù?Ù?Ù? torrc Ù?باشرةÙ?</string>
   <string name="pref_torrc_dialog">torrc خاص</string>
-  <string name="wizard_tips_martus">جÙ?Ù?اÙ? Ù?ارتÙ?س - Ù?ابعد Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ? تÙ?Ø«Ù?Ù? اÙ?تطبÙ?Ù?ات</string>
-  <string name="your_tor_public_ips_">أرÙ?اÙ? إبÙ? اÙ?عÙ?Ù?Ù?Ù?Ø© Ù?تÙ?ر اÙ?خاصة بÙ? :</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ù?ضÙ?ا Ø£Ù?Ù?Ù? Ù?ذا اÙ?تطبÙ?Ù? Ù?Ù? إعدادات تطبÙ?Ù?ات اÙ?Ø£Ù?درÙ?Ù?د إذا Ù?Ù?ت تÙ?اجÙ? Ù?شاÙ?Ù?ا Ù?ع Ø£Ù?ربت:</string>
-  <string name="app_conflict">تعارض Ù?Ù? اÙ?تطبÙ?Ù?</string>
-  <string name="pref_transproxy_refresh_title">تحÙ?Ù?Ù? Ø£Ù?تÙ?Ù?اتÙ?Ù?Ù? Ù?Ù?برÙ?Ù?سÙ? اÙ?Ø´Ù?Ù?اÙ?</string>
-  <string name="pref_transproxy_refresh_summary">أعد تطبÙ?Ù? Ù?Ù?اÙ?Ù?Ù? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?Ù?اÙ? إذا Ù?ا تغÙ?Ù?رت حاÙ?Ø© اÙ?شبÙ?Ø©</string>
-  <string name="pref_transproxy_flush_title">اÙ?حذÙ? اÙ?إجبارÙ? Ù?Ù?برÙ?Ù?سÙ? اÙ?Ø´Ù?Ù?اÙ?</string>
-  <string name="pref_transproxy_flush_summary">إضغط Ù?Ù?ا Ù?تغÙ?Ù?ر Ù?Ù? Ù?Ù?اÙ?Ù?Ù? إتصاÙ? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?Ù?اÙ? اÙ?Ø¢Ù?</string>
-  <string name="transparent_proxy_rules_flushed_">إتصاÙ? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?Ù?اÙ? تغÙ?Ù?ر!</string>
-  <string name="you_do_not_have_root_access_enabled">Ù?Ù?ست Ù?دÙ?Ù? صÙ?احÙ?ات اÙ?رÙ?ت</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ù?د تحتاج Ù?غÙ?Ù? Ù?إعادة تشغÙ?Ù? Ø£Ù?ربÙ?ت حتÙ? تÙ?عÙ?Ù? اÙ?تغÙ?Ù?رات اÙ?تÙ? Ù?Ù?ت بÙ?ا Ù?Ù? اÙ?إعدادات.</string>
-  <string name="menu_vpn">تطبÙ?Ù?ات</string>
   <string name="kbps">Ù?Ù?Ù?Ù?بÙ?ت Ù?Ù? اÙ?ثاÙ?Ù?Ø©</string>
   <string name="mbps">Ù?Ù?غابÙ?ت Ù?Ù? اÙ?ثاÙ?Ù?Ø©</string>
   <string name="kb">Ù?Ù?Ù?Ù?باÙ?ت</string>
@@ -289,14 +143,11 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
 
 Ù?ا Ø£Ù? تحصÙ? عÙ?Ù? جسرØ? Ø£Ù?سخÙ? Ù?Ø£Ù?صÙ?Ù? Ù?Ù? خاÙ?Ø© \"اÙ?جسÙ?ر\" Ù?Ù? إعدادات Ø£Ù?ربÙ?ت Ù?أعد اÙ?تشغÙ?Ù?.</string>
   <string name="install_orweb">تثبÙ?ت Ø£Ù?رÙ?Ù?Ù?س</string>
-  <string name="standard_browser">Ù?تصÙ?Ø­ عادÙ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ù?Ù?احظة: Ù?Ù?Ø· جسÙ?ر اÙ?تÙ?ر اÙ?عادÙ?Ù?Ø© تعÙ?Ù? عÙ?Ù? اÙ?أجÙ?زة بÙ?Ù?اة Ø¥Ù?تÙ? Ø¥Ù?س86/أتÙ?Ù?.</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="ports">اÙ?Ù?Ù?اÙ?Ø°</string>
   <string name="local_port">اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?Ø­Ù?Ù?</string>
   <string name="onion_port">Ù?Ù?Ù?Ø° اÙ?Ù? Onion</string>
   <string name="name">اÙ?اسÙ?</string>
@@ -309,8 +160,6 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="backup_saved_at_external_storage">تÙ?ت عÙ?Ù?Ù?Ø© Ø­Ù?ظ اÙ?Ù?سخة اÙ?إحتÙ?اطÙ?Ø© Ù?Ù? ذاÙ?رة اÙ?تخزÙ?Ù? اÙ?خارجÙ?Ø©</string>
   <string name="backup_restored">تÙ?ت استعادة اÙ?Ù?سخة اÙ?إحتÙ?اطÙ?Ø©</string>
   <string name="filemanager_not_available">تعذر اÙ?عثÙ?ر عÙ?Ù? Ù?دÙ?ر اÙ?Ù?Ù?Ù?ات</string>
-  <string name="permission_granted">تÙ? Ù?بÙ?Ù? اÙ?تسرÙ?Ø­</string>
-  <string name="permission_denied">رÙ?Ù?Ù?ض اÙ?تسرÙ?Ø­</string>
   <string name="restore_backup">إسترجاع Ù?سخة احتÙ?اطÙ?Ø©</string>
   <string name="create_a_backup_first">Ù?Ù? Ø£Ù?Ù?اÙ? بإÙ?شاء Ù?سخة إحتÙ?اطÙ?Ø©</string>
   <string name="name_can_t_be_empty">Ù?ا Ù?Ù?Ù?Ù? ترÙ? اÙ?إسÙ? Ù?ارغا</string>
@@ -336,7 +185,6 @@ HTTP: / /tinyurl.com/proxyandroid\n</string>
   <string name="enable">تÙ?Ù?Ù?Ù?</string>
   <string name="consider_disable_battery_optimizations">Ù?رجÙ? تعطÙ?Ù? تحسÙ?Ù?ات اÙ?بطارÙ?Ø©</string>
   <string name="consider_enable_battery_optimizations">Ù?رجÙ? تشغÙ?Ù? تحسÙ?Ù?ات طاÙ?Ø© اÙ?بطارÙ?Ø©</string>
-  <string name="please_enable_vpn">Ù?رجÙ? تÙ?عÙ?Ù? Ù?ضع اÙ?شبÙ?Ø© اÙ?Ø¥Ù?تراضÙ?Ø© اÙ?خاصة Ù?Ù? بÙ? Ø¢Ù? Ù?Ù?سÙ?اح Ù?Ù?تطبÙ?Ù?ات استخداÙ? تÙ?ر</string>
   <string name="app_shortcuts">اÙ?تطبÙ?Ù?ات اÙ?Ù?Ù?Ù?ئة Ù?Ù?عبÙ?ر عبر تÙ?ر</string>
   <string name="testing_bridges">جارÙ? Ù?حص اتصاÙ? اÙ?جسر بشبÙ?Ø© تÙ?ر ...</string>
   <string name="testing_bridges_success">Ù?جحت اÙ?عÙ?Ù?Ù?Ø©. Ø¥Ù?Ù? إعدادات اÙ?جسر جÙ?دة !</string>
diff --git a/app/src/main/res/values-ay/poestrings.xml b/app/src/main/res/values-ay/poestrings.xml
index ac3e49d5..417f7597 100644
--- a/app/src/main/res/values-ay/poestrings.xml
+++ b/app/src/main/res/values-ay/poestrings.xml
@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Jalakipañanakax Tor waljkut pachp luririnakawa, jan jist\'antayasiñan yanapt\'i. Toratix ISP ukan jark\'antatachixa, kunayman jalakipañanak yant\'asma
-Jan jist\'antayasiñatakixa: ajllitatix jan kust\'kchixa, yaqhrak yant\'am.</string>
-
-    <string name="bridges_no">Janiw jalakipañanakax utjkiti: Chiqak Torar waykatam
-</string>
-    <string name="bridges_provided">Jalakipañanak uñtayata:</string>
-    <string name="bridges_custom">Maynipachpatakjam jalakipañanaka</string>
-
-    <string name="bridges_config">Jalakipañanak mayjt\'ayäwi </string>
-    <string name="action_done">Tukuyata</string>
 
     <string name="bridges_sometimes">Yaqhippachax Tor apnaqañatakix mä jalakipañaw wakisi</string>
     <string name="action_more">JUK\'AMP YATIYASKAKITA</string>
@@ -18,20 +8,6 @@ Jan jist\'antayasiñatakixa: ajllitatix jan kust\'kchixa, yaqhrak yant\'am.</str
     <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="status_connected">¡Waykatata!
-</string>
-
-    <string name="loading_claim_1">¡Torarux kunayman mayacht\'atanakaw ch\'amañchi!</string>
-    <string name="loading_claim_2">Jan khitins uñjayasiñatakix jaqix sapüruw Tor apnaqi.</string>
-    <string name="loading_claim_3">Kunapachatï Facebookarux jan mantañjamäxi, jaqix masinakamp aruskipañatakix Tor apnaqi.</string>
-    <string name="loading_claim_4">Arsusirinakax amuyunakap maynit maynikam twitertuq aruskipañatakix Tor apnaqapxi. </string>
-    <string name="loading_claim_5">Jaqinak p\'arxtayañatakis mayachthapiñatakis blogueronakax Tor apnaqapxi.</string>
-    <string name="loading_claim_6">Yatiyäwinak sumpach yatxatañatakix yatiyirinakax Tor apnaqapxi.</string>
-    <string name="loading_claim_7">Jan katjayasiñatakix alakip jaqinakax Tor apnaqapxi.</string>
-    <string name="loading_claim_8">Irnaqirinakax chiqapar uñjatapxañapatakis jan jaqsuyasipxañapatakis Tor apnaqapxi.</string>
-
-    <string name="status_connecting">Waykatasipksmawa.\" = \"Waykatasipksmawa.</string>
-
     <string name="hello">Kamisaki</string>
     <string name="welcome">Jawsañatak wakt\'ayat Tor ukarux walik mantantaxa.</string>
 
diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml
index 12256d87..d6b2d2b4 100644
--- a/app/src/main/res/values-ay/strings.xml
+++ b/app/src/main/res/values-ay/strings.xml
@@ -2,125 +2,38 @@
 <resources>
   <string name="app_name">Orbot </string>
   <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor qalltaña, sayt\'ayaña</string>
-  <string name="tor_proxy_service_process">torproxyservice</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="tor_process_waiting">phuqhachaskiwa.</string>
-  <string name="not_anonymous_yet">UKATARAKI: ¡Yatiyäw apnaqatamax uñt\'atakiskiwa! HTTP 127.0.0.1:8118 proxy jan ukax SOCKS4A proxy jan ukax SOCKS5 127.0.0.1:9050 apnaqañatak wakichawinak mayjt\'ayam</string>
-  <string name="menu_home">Qallta</string>
-  <string name="menu_browse">Thaqhtaña</string>
   <string name="menu_settings">Mayjt\'ayaña</string>
   <string name="menu_log">Imata</string>
-  <string name="menu_info">Yanapa</string>
-  <string name="menu_apps">Wakichäwinaka...</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="menu_promo_apps">Wakichäwinak jikiña...</string>
   <string name="main_layout_download">Apaqaña</string>
   <string name="main_layout_upload">Apkataña</string>
-  <string name="button_help">Yanapa</string>
-  <string name="button_close">Jist\'antaña</string>
   <string name="button_about">Juk\'ampi</string>
-  <string name="button_clear_log">Imat pichsuña</string>
-  <string name="menu_verify">Uñakipaña</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="press_to_start">- qalltañatak limxasim -</string>
-  <string name="pref_trans_proxy_group">Proxyptayatax qhan apnaqatawa (Root ukaw munasi)</string>
-  <string name="pref_trans_proxy_title">Proxyptayatax qhan apnaqatawa</string>
-  <string name="pref_trans_proxy_summary">Taqpach wakichäwinakax justupakiw Tor ukamp apnaqatäxani</string>
-  <string name="pref_transparent_all_title">Taqpachaw Tor ukamp apnaqatäxani</string>
-  <string name="pref_transparent_all_summary">Jan mayjt\'ayas taqpach apnaqat wakichäwinak Tor ukamp proxyptayam</string>
-  <string name="pref_transparent_port_fallback_title">Jan walt\'äwinak utjipanx yaqha proxy ukar saram</string>
-  <string name="pref_transparent_port_fallback_summary">UKATRAKI: jan mantañ apayañ thakhinakarux jan mantamti (80, 443, juk\'ampinaka). Ukhamatix \'taqpacha\' jan ukax \'Wakichâwinaka\' jan aqtayatakchixa \"UKHAK APNAQAM\".</string>
-  <string name="pref_transparent_port_title">Apayañ thakhi utjirinaka</string>
-  <string name="pref_transparent_port_summary">Proxyfikañ apayañ thakh utjirinaka. Kunapachati \'Taqpacha\' \'Wakichawinaka\'  jan aqtayatäki *UKHAK APNAQAM*</string>
-  <string name="pref_transparent_port_dialog">Proxifikañ apayañ thakhinak qillqantam</string>
-  <string name="pref_has_root">Root ukar mantañatak mayim</string>
-  <string name="pref_has_root_summary">Qhan apnaqat proxyptayat apnaqañatakix rootamp iyawsayasim</string>
-  <string name="status_install_success">¡Toran binarionakapax khusa uchatawa! </string>
-  <string name="status_install_fail">Toran binarionakapax janiw uchatäkiti. Qillqantayasit uñakipam ukhamarak tor-assistants@xxxxxxxxxxxxxx ukar qillqt\'am</string>
-  <string name="title_error">Pantjat wakichäwi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbotxata</string>
-  <string name="btn_next">Yaqha</string>
-  <string name="btn_back">Kutt\'aña</string>
-  <string name="btn_finish">Tukuyañ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>
-  <string name="wizard_permissions_root">Iyaw sata</string>
-  <string name="wizard_permissions_stock">Orbotar iyaw satanaka</string>
-  <string name="wizard_premissions_msg_root">¡Wali kusawa! Rootar iyaw satanak Orbotar churatam katjapxta. Amuyumpiw aka iyaw satanak apnaqapxä.</string>
-  <string name="wizard_permissions_msg_stock">Inas jan munaskchiti, ukampirusa Root iyawsatamp dispositivomar mantät ukjaxa, Orbotax juk\'amp ch\'amaniw tukuspa. ¡Orbot juk\'amp ch\'amaniñapatakix aynachtuqir limt\'am!</string>
-  <string name="wizard_permissions_no_root">Root ukarutix jan mantañjamakchixa, jan ukax janich amuykta ukapachax kawkïr wakichäwinakati Orbotatak utjki uk apnaqam.  </string>
-  <string name="wizard_permissions_consent">Amuyxtwa, jan iyawsas luraskakiwa</string>
-  <string name="wizard_permission_enable_root">Orbotar iyaw sañ Rootar churam</string>
-  <string name="wizard_configure">Tor tuqin mayxt\'ayaña</string>
-  <string name="wizard_configure_msg">Orbotax Tor tuqiw taqi wakichäwinak apnaqañ yanapt\'tam JAN UKASTI sapa wakichäwinakaman ajlliñ yanapt\'tam.</string>
-  <string name="wizard_configure_all">Tor tuqix taqpach wakichäwinak proxiptayam</string>
-  <string name="wizard_configure_select_apps">Toratak sapa wakichäwinak ajllt\'am</string>
-  <string name="wizard_tips_tricks">Orbotatak aqtayat wakichäwinaka</string>
-  <string name="wizard_tips_msg">Aknïr wakichäwinakax Orbotamp irnaqañatak luratawa. Jichhax apaqañatakix sapa limt\'añar limt\'am, jan ukasti Google Play, GuardianProject.info ukhamarak F-Droid.org tuqins jikxatarakismawa.</string>
-  <string name="wizard_tips_otrchat">ChatSecure -  Android ukatak yatiyawinak apnaqiri</string>
-  <string name="wizard_tips_proxy">Proxinak mayjt\'ayaña - Orbotamp irnaqañ kunjam mayxt\'ayañas wakchäiwinakax uk yatiqam</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo thaqhañ wakichäwi </string>
-  <string name="wizard_tips_twitter">8118 apayañ thakhimp ukhamarak \"localhost\" ukamp proxytuq Twiter mayjt\'ayam</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ¡tuwaqasiñatakix Tor ukar churam jan ukasti luratanak wakicht\'am!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy mayjt\'ayirinaka</string>
-  <string name="wizard_proxy_help_msg">HTTP jan ukax SOCKS proxy uka apnaqawtix android wakichäw iyawschixa, Orbot ukar waykattañatakix mayjt\'ayasmawa jan ukax Tor uks apnaqarakismawa.\n\n\n Yanapirin mayjt\'ayañax 127.0.0.1 jan ukasti \"localhost\" ukawa. HTTP mayjt\'ayañatakix 8118 ukawa. SOCKS ukan proxypax 9050 ukankiwa.  Wakisisp ukjax SOCKS4A, SOCKS5 ukas apnaqatarakispawa.\n \n\n\n  Androidan proxyfikañ tuqitx FAQ http://tinyurl.com/proxyandroid\n uksanx juk\'amp yatxatarakismawa. </string>
-  <string name="wizard_final">¡Orbotax wakt\'ayatawa!</string>
-  <string name="wizard_final_msg">Uraqpachanx waranq waranq jaqiw Tor apnaqasipki. \n\n yatiyirinaka, blog apnaqarinaka, jaqir arxatirinaka, taripäw apnaqirinaka, tamanaka, t\'aqhisiyat markachirinaka, aliq jaqinaka... ¡Jichhax jumas apnaqxarakismawa!</string>
-  <string name="wizard_exit_at_first_screen_toast">¡Janïr Orbot apnaqkasax mayjt\'ayam, amp suma!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Tor wakichäwinkxtawa - ukampirus dispositivomx jan walt\'ayañatak uñsusipkakispawa. Yatiñatakix \'Thaqhiriru\' limt\'am. \n\nJuk\'amp yatiñatakix akawjar mantam: https://guardianproject.info/apps/orbot jan ukax help@xxxxxxxxxxxxxxxxxxxx ukar qillqt\'am.</string>
-  <string name="tor_check">Tor tuqir waykatat uñjañatakix ukhamarak orbot uk mayxt\'ayat amuyañatakix https://check.torproject.org uk thaqhañ llika taypin jist\'aram.</string>
-  <string name="pref_hs_group">Imantat yanapirinaka</string>
   <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-->
-  <string name="wizard_title_msg">¡Orbotax Android ukaruw Tor puriyani!\n\n Tor ukax llikan luratanakama, yatiyäwinakama, thaqhatanakam jan yaqhanakan yatipxañapatakiw jark\'aqtam.\n\n Aka qhanañchäwix Orbot Toramp dispositivoman yanapt\'ätam.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Ukataraki</string>
-  <string name="wizard_warning_msg">Orbot apaqasakix janiraw jawsañamax jark\'aqatakiti. Tor sum apnaqañapatakix Orbot, dispositivoma, yaqha wakichäwinakamp yäpar  mayjt\'ayam. </string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Iyawsatanaka</string>
-  <string name="wizard_permissions_root_msg1">Qhan apnaqat proxyptayatjam kikpaki, Orbotan juk\'amp lurañapatakix \'Taqpach apnaqiri\' tukuñapatak iyaw sarakismawa. </string>
-  <string name="wizard_permissions_root_msg2">Janitix ak lurañ munkst ukhaxa Orbotamp irnaqir wakichäwinak lurat apnaqam </string>
-  <string name="wizard_permissions_no_root_msg">Dispositivomax janiw rooteyatjamakiti, janiw rootas yäparjamakiti \"Wali apnaqiri\" ukas askjamäkiti.\n\nUkalantix \"Wakichäwinaka\" nayrïn uñstankix ukan amp sum yant\'am.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotatak aqtayat wakichäwinaka</string>
-  <string name="wizard_tips_gibberbot">ChatSecure:  Off-The-Record (OTR) ukamp qillqattuq aruskipäwinkaña</string>
-  <string name="wizard_tips_orweb">Orfox: Tortuq thaqtañapatak wakichatawa</string>
-  <string name="wizard_tips_play">Google Playtuqin Guardian Project ukan wakichäwinakap jikxatam</string>
-  <string name="wizard_tips_fdroid">F-Drold tuqin Guardian Project ukan taqpach wakichäwinakap katjam</string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org ukan Guardian Project ukan taqpach wakichäwinakap jikxatäta</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxyptayatax qhan apnaqatawa</string>
-  <string name="wizard_transproxy_msg">Tortuqin jan mayjt\'ayas justupach wakichäwinakax aqtañapan yanapt\'i</string>
-  <string name="wizard_transproxy_hint">(Janitix kunas amuyaskchixa, ukawjar limt\'am)</string>
-  <string name="wizard_transproxy_none">Ni kuna</string>
-  <string name="pref_transparent_tethering_title">Tor yaqhanakamp waythapiña</string>
-  <string name="pref_transparent_tethering_summary">Wifi, USB waythapit yänakatak Toran qhan aqnaqat proxyptayat qhantayam (mayamp aqtayañawa)</string>
-  <string name="button_grant_superuser">WAli apnaqir ukar mantañatak mayim</string>
-  <string name="pref_select_apps">Wakichäwinak ajlliña</string>
-  <string name="pref_select_apps_summary">Tor tuqix uñacht\'ayañatak wakichäwinak ajllt\'am</string>
   <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>
@@ -128,9 +41,6 @@
   <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="button_proxy_all">Taqpach proxyptayaña</string>
-  <string name="button_proxy_none">Jan kuns proxyptayaña</string>
-  <string name="button_invert_selection">Ajlliñanak jaqukipaña</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>
@@ -147,19 +57,7 @@
   <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="status">Kunjmäskisa</string>
-  <string name="setting_up_full_transparent_proxying_">Taqpachatak qhan apnaqat proxyptayatax phuqhachaskiwa...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Sapa wakichäwitak qhan apnaqat proxyptayatax phuqhachaskiwa...</string>
-  <string name="transparent_proxying_enabled">Qhan apnaqat proxyptayatax QHANTAYATAWA</string>
-  <string name="transproxy_enabled_for_tethering_">TransProzyx Tethering ukatak aqtatawa</string>
-  <string name="warning_error_starting_transparent_proxying_">UKATARAKI: ¡Qhan apnaqat proxyptayatax qalltkas pantjatawa!</string>
-  <string name="transproxy_rules_cleared">TransProxyn thakhiñchanakapax pichsutawa</string>
   <string name="couldn_t_start_tor_process_">Torax janiw qalltkiti:</string>
-  <string name="privoxy_is_running_on_port_">Polipox apayañ thakhin qallantaski:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Apayañ thakhirjam qhan apnaqat proxyptayatax phuchaskiwa...</string>
-  <string name="bridge_error">Pantat jalakipañanaka</string>
-  <string name="bridge_requires_ip">Jalakipir apnaqañatakixa, mä jalakipir IP ukaks uskuñamapuniwa.</string>
-  <string name="send_email_for_bridges">Gmail.com, yahoo.com jan ukasti yahoo.cn ukan bridges@xxxxxxxxxxxxxx ukatuqir mä imayl apayam, \"get bridges\" ukax qillqatankañapawa.</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>
@@ -173,9 +71,7 @@
   <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="bridges_obfuscated">Chakt\'at jalakipañanaka</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor llika manqhan yaqha mantañanak qhantayaña</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Kunawsatix jalakipañanakax chakt\'atak ukhax mayjt\'ayañ jalakipañanak aqtayam</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>
@@ -192,16 +88,9 @@
   <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_hidden_services">Yanapir imantatanaka</string>
-  <string name="run_servers_accessible_via_the_tor_network">Tor llikatuqix imantat yanapirinakaruw mantañ yanapt\'i</string>
-  <string name="enter_localhost_ports_for_hidden_services">Imantat yanapirin apayañ thakhinak qillqantam</string>
-  <string name="hidden_service_ports">Imantat yanapir apayañ thakhinaka</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">imantat yanapirinapirinakan, uñtayaw suti</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="the_tor_license">Toran Licenciapa</string>
-  <string name="https_torproject_org">https://torproject.org</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>
@@ -211,36 +100,17 @@
   <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="hidden_service_on">Imantat yanapirina:</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="unable_to_reset_tor">¡Dispositivom mayamp aqtayam, janiw Torax qalltkiti!</string>
-  <string name="pref_use_sys_iptables_title">Iptables ukx justupach aqtirir ucham</string>
-  <string name="pref_use_sys_iptables_summary">Iptables utjirinakax jawsañamankkis ukäñapawa, janiw Orbotankkis ukäñapakiti</string>
-  <string name="error_installing_binares">Toran binariop jichhakiptayañax janiw uchañjamakänti.</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="notification_using_bridges">¡Jalakipañanakax aqtayatawa!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">Aru</string>
-  <string name="set_locale_summary">Orbotatak markamamp arumamp ajllt\'am</string>
-  <string name="wizard_locale_title">Aru ajllim</string>
-  <string name="wizard_locale_msg">Pachpa aru jan ukax yaqha aru thaqtam</string>
-  <string name="powered_by">Tor ukam ch\'amata</string>
-  <string name="btn_save_settings">Mayjt\'ayatanak imaña</string>
   <string name="no_internet_connection_tor">Llikax janiw utjkiti; Tor ukax suyt\'atawa...</string>
-  <string name="bandwidth_">Llika ch\'ama:</string>
-  <string name="down">apaqata</string>
-  <string name="up">apkatata</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="menu_verify_browser">Thaqhiri</string>
-  <string name="menu_use_chatsecure"> ChatSecure apnaqam</string>
-  <string name="permission_manage_tor_label">Tor apnaqaña</string>
-  <string name="permission_manage_tor_description">Tor wakichäw apnaqañatak aqtayam</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbotax Orfox thaqhirimpix jasak irnaqi. ¿Jichhpachat apaqäta?</string>
   <string name="install_apps_">¿Thaqhirt apaqäta?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Janiw llikax utjkiti. Torax suyt\'ayatawa...</string>
@@ -258,18 +128,6 @@
   <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="wizard_tips_martus">Jawsañ Martus - Benetech Human Rights Documentation wakichäwi</string>
-  <string name="your_tor_public_ips_"> Toraman taqin uñjkay  IPs:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotatix jan walt\'kchixa, aka  Android-&gt;Settings-&gt;Apps jiwt\'ayam, amps suma:</string>
-  <string name="app_conflict">Wakichäwin jan walt\'atapa</string>
-  <string name="pref_transproxy_refresh_title">Transproxy justupach-jichhaptayaña</string>
-  <string name="pref_transproxy_refresh_summary">Kunawsatix llikax turkakipatakixa transproxyn thakhichanakap mayamp yant\'am</string>
-  <string name="pref_transproxy_flush_title">Transproxy MUNAY JAN MUN PICHSUM</string>
-  <string name="pref_transproxy_flush_summary">Taqpach transproxyn llikan thakhichanakap pichsuñatakix akhar JICHHAX limt\'am</string>
-  <string name="transparent_proxy_rules_flushed_">¡Qhan apnaqat proxy kamachinakax pichsutawa!</string>
-  <string name="you_do_not_have_root_access_enabled">Janiw ROOT ukax mantañatak aqtatakiti</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Mayjt\'ayañ mayjt\'añapatakix inas Orbot jiwt\'ayasin mayamp aqtayañamachini.</string>
-  <string name="menu_vpn">Wakichäwinaka</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
@@ -283,18 +141,14 @@
   <string name="get_bridges_web">Llika janja</string>
   <string name="activate">Qhantayaña</string>
   <string name="apps_mode">VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Orbot VPN apnaqasaxa, wakichäwinakax Tor tuqiw qhantayatäspa.\n\n Ukampix yatiyäwimax uñstaskakiniwa, ukampirus akax jark\'antatanak mäkiptañ yanapt\'ätam</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="install_orweb">Orfox apaqaña</string>
-  <string name="standard_browser">Utt\'ayat thaqhiri</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">AMUYASI�ATAKI: Tor utt\'ayat jalakipañanakax dispositivo Intel X86/ATOM ukanak irnaqi</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="ports">Apayañ thakhinaka</string>
   <string name="local_port">Akankïr apayañ thakhi</string>
   <string name="onion_port">Onion apayañ thakhi</string>
   <string name="name">Suti</string>
@@ -308,8 +162,6 @@
   <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="permission_granted">Iyaw sata</string>
-  <string name="permission_denied">Jan iyaw sata</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>
@@ -343,9 +195,7 @@
   <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="please_enable_vpn">Wakichäwinakar Tor apnaqañatak VPN qhantayam, amp suma</string>
   <string name="app_shortcuts">Toramp apnaqañataki wakichäwinaka</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</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>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index de881840..9c5bb792 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -2,136 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Pulsuz proksi tÉ?tbiqetmÉ?si olan Orbot baÅ?qa tÉ?tbiqetmÉ?lÉ?rÉ? internetdÉ?n daha tÉ?hlükÉ?siz istifadÉ? etmÉ?k imkanı verir. Orbot sizin internet trafikinizi Å?ifrÉ?lÉ?mÉ?k üçün Tordan istifadÉ? edir vÉ? dünyanın hÉ?r yerindÉ? kompüterlÉ?rin birindÉ?n o birinÉ? sıçramaqla bunu gizlÉ?dir. Tor pulsuz proqram tÉ?minatıdır, eyni zamanda sizin Å?É?xsi azadlıÄ?ınız vÉ? tÉ?hlükÉ?sizliyinizÉ?, gizli biznes fÉ?aliyyÉ?ti vÉ? É?laqÉ?lÉ?rÉ?, o cümlÉ?dÉ?n trafik analiz adlanan dövlÉ?t tÉ?hlükÉ?sizliyinÉ? xÉ?lÉ?l gÉ?tirÉ? bilÉ?cÉ?k Å?É?bÉ?kÉ? nÉ?zarÉ?ti formalarından müdafiÉ? olunmaÄ?a yardım edÉ?n açıq Å?É?bÉ?kÉ?dir.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Toru baÅ?lat vÉ? dayandır
-</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot baÅ?layır...</string>
+    <string name="status_starting_up">Orbot baÅ?layır...</string>
   <string name="status_activated">Tor Å?É?bÉ?kÉ?sinÉ? baÄ?landı</string>
   <string name="status_disabled">Orbot deaktivasiya edildi</string>
   <string name="status_shutting_down">Tor xidmÉ?ti iÅ?ini baÅ?a vurur</string>
   <string name="tor_process_starting">Tor xidmÉ?ti baÅ?layır...</string>
   <string name="tor_process_complete">tamamla.</string>
-  <string name="tor_process_waiting">gözlÉ?yirik.</string>
-  <string name="not_anonymous_yet">TÆ?HLÃ?KÆ?: SÉ?nin trafikin hÉ?lÉ? anonim deyil! LütfÉ?n, aplikasiyanı ya HTTP proksi 127.0.0.1:8118, ya SOCKS4A, ya da SOCKS5 proksi 127.0.0.1:9050 istifadÉ? etmÉ?k üçün quraÅ?dır.</string>
-  <string name="menu_home">Ev</string>
-  <string name="menu_browse">Bax</string>
-  <string name="menu_settings">QuraÅ?dırmalar</string>
+    <string name="menu_settings">QuraÅ?dırmalar</string>
   <string name="menu_log">Jurnal</string>
-  <string name="menu_info">KömÉ?k</string>
-  <string name="menu_start">BaÅ?la</string>
+    <string name="menu_start">BaÅ?la</string>
   <string name="menu_stop">Dur</string>
   <string name="menu_about">Haqqında</string>
-  <string name="menu_promo_apps">TÉ?tbiqetmÉ?lÉ?ri É?ldÉ? edin...</string>
-  <string name="main_layout_download">Endir</string>
+    <string name="main_layout_download">Endir</string>
   <string name="main_layout_upload">YüklÉ?</string>
-  <string name="button_help">KömÉ?k</string>
-  <string name="button_close">BaÄ?la</string>
-  <string name="button_about">Haqqında</string>
-  <string name="button_clear_log">Jurnalı TÉ?mizlÉ?</string>
-  <string name="menu_verify">Yoxla</string>
-  <string name="menu_exit">�ıx</string>
+    <string name="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="press_to_start">- baÅ?lamaq üçün uzun klik -</string>
-  <string name="pref_trans_proxy_group">Å?É?ffaf ProksilÉ?mÉ? (Root TÉ?lÉ?b Edir)</string>
-  <string name="pref_trans_proxy_title">Å?É?ffaf ProksilÉ?mÉ?</string>
-  <string name="pref_trans_proxy_summary">Aplikasiyaların Avtomatik Torlanması</string>
-  <string name="pref_transparent_all_title">HÉ?r Å?eyi Torla</string>
-  <string name="pref_transparent_all_summary">Tor vasitÉ?silÉ? bütün aplikasiyaların proksi trafiki</string>
-  <string name="pref_transparent_port_fallback_title">Port Proksi Ehtiyatı</string>
-  <string name="pref_transparent_port_fallback_summary">TÆ?HLÃ?KÆ?: Ã?mumi alt portlar (80, 443 vÉ? s.). \'Hamısı\' vÉ? ya \'TÉ?tbiqetmÉ?\' iÅ?lÉ?mirsÉ?, *YALNIZ Ä°STÄ°FADÆ? ET*.</string>
-  <string name="pref_transparent_port_title">Port Siyahısı</string>
-  <string name="pref_transparent_port_summary">ProksiyÉ? port siyahısı. \'Hamısı\' vÉ? ya \'TÉ?tbiqetmÉ?\' iÅ?lÉ?mirsÉ?, *YALNIZ Ä°STÄ°FADÆ? ET*.</string>
-  <string name="pref_transparent_port_dialog">ProksiyÉ? port daxil et</string>
-  <string name="pref_has_root">Root GiriÅ? TÉ?lÉ?b Et</string>
-  <string name="pref_has_root_summary">Å?É?ffaf proksilÉ?mÉ? üçün mÉ?nbÉ? tÉ?lÉ?b et</string>
-  <string name="status_install_success">Tor ikilisi müvÉ?ffÉ?qiyyÉ?tlÉ? yüklÉ?ndi!</string>
-  <string name="status_install_fail">Tor ikili fayllarının quraÅ?dırılması mümkün olmadı. LütfÉ?n giriÅ?i yoxla vÉ? assistants@xxxxxxxxxxxxxx-a xÉ?bÉ?r ver.</string>
-  <string name="title_error">TÉ?tbiq SÉ?hvi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot Haqqında</string>
-  <string name="btn_next">Sonrakı</string>
-  <string name="btn_back">Geri</string>
-  <string name="btn_finish">Bitir</string>
-  <string name="btn_okay">Okey</string>
+    <string name="btn_okay">Okey</string>
   <string name="btn_cancel">LÉ?Ä?v et</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">BÉ?zi Orbot Detalları</string>
-  <string name="wizard_permissions_root">Ä°cazÉ? Verilir</string>
-  <string name="wizard_permissions_stock">Orbot Ä°cazÉ?lÉ?ri</string>
-  <string name="wizard_premissions_msg_root">Æ?la! SÉ?nin Orbot üçün mÉ?nbÉ? icazÉ?lÉ?rinÉ? malik olmanı müÉ?yyÉ?n etmiÅ?ik. Biz bu gücü aÄ?ılla istifadÉ? edÉ?cÉ?yik.</string>
-  <string name="wizard_permissions_msg_stock">Bu tÉ?lÉ?b edilmÉ?diyi halda sÉ?nin qurÄ?unun mÉ?nbÉ? giriÅ?i varsa, Orbot daha güclü iÅ?lÉ?yÉ?cÉ?k. Orbota super gücü vermÉ?k üçün aÅ?aÄ?ıdakı düymÉ?ni istifadÉ? et!</string>
-  <string name="wizard_permissions_no_root">Æ?gÉ?r sÉ?nin mÉ?nbÉ? giriÅ?inÉ? icazÉ?n yoxdursa, ya da nÉ? haqqında danıÅ?dıÄ?ımızı anlamırsansa, É?min ol ki, istifadÉ? etdiyin aplikasiyalar Orbotla iÅ?lÉ?yÉ? bilÉ?ndirlÉ?r.</string>
-  <string name="wizard_permissions_consent">SuperistifadÉ?çisiz davam etmÉ?yi anlayır vÉ? istÉ?yirÉ?m</string>
-  <string name="wizard_permission_enable_root">Orbot üçün MÉ?nbÉ? Ver</string>
-  <string name="wizard_configure">Torifikasiyanı QuraÅ?dır</string>
-  <string name="wizard_configure_msg">Orbot sÉ?nÉ? bütün vÉ? ya seçilmiÅ? aplikasiyalarını Tor vasitÉ?silÉ? istifadÉ? etmÉ?yÉ? imkan yaradır.</string>
-  <string name="wizard_configure_all">Bütün Aplikasiyaları Tor VasitÉ?silÉ? Proksi Et</string>
-  <string name="wizard_configure_select_apps">Tor üçün MüÉ?yyÉ?n Aplikasiyaları Seç</string>
-  <string name="wizard_tips_tricks">Orbota-açıq Aplikasiyalar</string>
-  <string name="wizard_tips_msg">AÅ?aÄ?ıdakı aplikasiyalar Orbotla iÅ?lÉ?mÉ?k üçün quraÅ?dırılmıÅ?dır. Ä°ndi quraÅ?dırmaq üçün hÉ?r düymÉ?ni kliklÉ?, ya da baÅ?qa vaxt onları Google Play, GuardianProject.info saytı vÉ? ya F-Doid.org-da tap.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android üçün tÉ?hlükÉ?siz mesajlaÅ?ma müÅ?tÉ?risi</string>
-  <string name="wizard_tips_proxy">Proksi SeçimlÉ?ri - Aplikasiyaların Orbotla necÉ? iÅ?lÉ?yÉ?cÉ?yini öyrÉ?n</string>
-  <string name="wizard_tips_duckgo">DuckDuckGO AxtarıÅ? QurÄ?u aplikasiyası</string>
-  <string name="wizard_tips_twitter">\"Yerlihost\" vÉ? 8118 portuna sahiblik üçün Twitter proksini quraÅ?dır</string>
-  <string name="wizard_tips_story_maker">StoryMaker--Yazı yaz, tÉ?hlükÉ?sizlik mÉ?sÉ?lÉ?sini torun öhdÉ?sinÉ? burax!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proksi qurÄ?uları</string>
-  <string name="wizard_proxy_help_msg">Ä°stifadÉ? etdiyiniz Android tÉ?tbiqetmÉ?si HTTP vÉ? SOCKS proksinin istifadÉ?sini dÉ?stÉ?klÉ?yÉ? bilirsÉ?, siz onu Orbotla birlÉ?Å?dirmÉ?k üçün tÉ?nzimlÉ?yÉ? vÉ? Tor.\n\n\n-dÉ?n istifadÉ? edÉ? bilÉ?rsiniz.   Host quraÅ?dırmaları 127.0.0.1-dir, yaxud \"yerlihost\"dur. HTTP üçün port quraÅ?dırması 8118-dir. SOCKS üçün proksi  9050-dir. Siz SOCKS4A, yaxud mümkünsÉ?, SOCKS5-dÉ?n istifadÉ? etmÉ?lisiniz.\n \n\n\n FAQ vasitÉ?siylÉ? siz AndroiddÉ? proksilÉ?mÉ? haqda daha çox mÉ?lumat ala bilÉ?rsiniz: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot hazırdır!</string>
-  <string name="wizard_final_msg">Dünyanın müxtÉ?lif yerlÉ?rindÉ? milyonlarla insan Tordan müxtÉ?lif mÉ?qsÉ?dlÉ?rlÉ? istifadÉ? edir. \n\n JurnalistlÉ?r, blogerlÉ?r, insan haqları müdafiÉ?çilÉ?ri, hüquq-mühafizÉ? orqanlarının iÅ?çilÉ?ri, É?sgÉ?rlÉ?r, korporasiyalar, repressiv rejimlÉ?rin vÉ?tÉ?ndaÅ?ları, ya da adi vÉ?tÉ?ndaÅ?lar...Ä°ndi buna siz dÉ? hazırsınız!</string>
-  <string name="wizard_exit_at_first_screen_toast">ZÉ?hmÉ?t olmasa, istifadÉ?yÉ? baÅ?lamazdan É?vvÉ?l Orbotu tÉ?nzimlÉ?yin!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Siz Tor Å?É?bÉ?kÉ?sinÉ? uÄ?urla qoÅ?uldunuz. Ancaq bu o demÉ?k deyil ki, sizin cihazınız tÉ?hlükÉ?sizdir. Æ?lqÉ?ni yoxlamaq üçün  \'Browser\' düymÉ?sindÉ?n istifadÉ? edÉ? bilÉ?rsiniz. \n\n BizÉ? https://guardianproject.info/apps/orbot sÉ?hifÉ?sindÉ? qonaq ola bilÉ?rsiniz. Daha çox mÉ?lumat É?ldÉ? etmÉ?k üçün help@xxxxxxxxxxxxxxxxxxxx ünvanına mÉ?ktub yazmaq olar. </string>
-  <string name="tor_check">Orbotun konfiqurasiya edilmÉ?sini vÉ? sÉ?nin Tor-a qoÅ?ulduÄ?unu dÉ?qiqlÉ?Å?dirmÉ?k üçün bu sÉ?nin brauzerini https://check.torproject.org saytı ilÉ? açacaq.</string>
-  <string name="pref_hs_group">Gizli XidmÉ?t Hostinqi</string>
-  <string name="pref_general_group">Æ?sas</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot Toru AndroidÉ? gÉ?tirir!\n\nTor mÉ?xfiliyÉ?, gizli informasiya vÉ? Å?É?xsi münasibÉ?tlÉ?rÉ? xÉ?lÉ?l gÉ?tirÉ? bilÉ?cÉ?k Å?É?bÉ?kÉ? nÉ?zarÉ?ti, mÉ?zmunun süzgÉ?cdÉ?n keçirilmÉ?si vÉ? trafik analizindÉ?n müdafiÉ? olunmaqda sizÉ? yardım edir.\n\nBu sehrbaz Orbot vÉ? Toru sizin cihazınıza quraÅ?dırmaÄ?a kömÉ?k edÉ?cÉ?k.  </string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">XÉ?bÉ?rdarlıq</string>
-  <string name="wizard_warning_msg">SadÉ?cÉ? Orbotun quraÅ?dırılması mobil trafikinizi avtomatik olaraq anonimlÉ?Å?dirÉ? bilmÉ?z.\n\nTordan uÄ?urla istifadÉ? etmÉ?k üçün siz Orbotu, cihazınızı vÉ? baÅ?qa tÉ?tbiqetmÉ?lÉ?ri bir-birinÉ? uyÄ?unlaÅ?dırmalısınız.  </string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ä°cazÉ?</string>
-  <string name="wizard_permissions_root_msg1">SÉ?n istÉ?sÉ?n Orbot-un \'SuperistifadÉ?çi\' giriÅ?ini É?ldÉ? edib Å?É?ffaf ProksilÉ?mÉ? kimi É?lavÉ? seçimlÉ?r qazana bilÉ?rsÉ?n.</string>
-  <string name="wizard_permissions_root_msg2">Bunu etmÉ?k istÉ?mirsÉ?nsÉ?, yalnız Orbot-la iÅ?lÉ?mÉ?si mümkün aplikasiyalara sahib olduÄ?una É?min ol</string>
-  <string name="wizard_permissions_no_root_msg">Sizin cihazınız yÉ?qin ki, rout olunmayıb, ya da rout vÉ? ya \"SuperistifadÉ?çi\" keçidi ilÉ? tÉ?min etmir.\n\nXahiÅ? edirik, bunun É?vÉ?zinÉ? É?sas ekranda \'TÉ?tbiqetmÉ?lÉ?r\' rejimindÉ?n istifadÉ? etmÉ?yÉ? çalıÅ?ın. </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-a Açıq Aplikasiyalar</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ã?at aplikasiyasını Qeydsiz Å?ifrlÉ?mÉ? ilÉ? tÉ?hlükÉ?sizlÉ?Å?dir</string>
-  <string name="wizard_tips_orweb">Orfox: Tor vasitÉ?siylÉ? iÅ?lÉ?yÉ?n vÉ? mÉ?xfiliyi artıran brauzer</string>
-  <string name="wizard_tips_play">Google Play-dÉ? bütün Guardian LayihÉ? aplikasiyaları tap</string>
-  <string name="wizard_tips_fdroid">F-DroiddÉ?ki bütün Guardian Project tÉ?tbiqetmÉ?lÉ?rini tapın </string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org-dÉ;? bütün Guardian Project tÉ?tbiqetmÉ?lÉ?rini tapın</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Å?É?ffaf ProksilÉ?mÉ?</string>
-  <string name="wizard_transproxy_msg">Bu heç bir konfiqurasiyaya ehtiyac olmadan aplikasiyalarının avtomatik olaraq Tor Å?É?bÉ?kÉ?si vasitÉ?silÉ? iÅ?lÉ?mÉ?sini tÉ?min edir.</string>
-  <string name="wizard_transproxy_hint">(DediklÉ?rimizdÉ?n heç biri haqqında xÉ?bÉ?rin yoxdursa, qutunu iÅ?arÉ?lÉ?)</string>
-  <string name="wizard_transproxy_none">Heç biri</string>
-  <string name="pref_transparent_tethering_title">Tor-un Son HÉ?ddi</string>
-  <string name="pref_transparent_tethering_summary">Wifi vÉ? USB ilÉ? BaÄ?lanan Cihazlar üçün Tor Å?É?ffaf ProksilÉ?mÉ?ni AktivlÉ?Å?dir (cihazın yenidÉ?n yüklÉ?nmÉ?sini tÉ?lÉ?b edir)</string>
-  <string name="button_grant_superuser">SuperistifadÉ?çi GiriÅ? TÉ?lÉ?bi</string>
-  <string name="pref_select_apps">Aplikasiya Seç</string>
-  <string name="pref_select_apps_summary">Tor vasitÉ?silÉ? açılması üçün Aplikasiya seç</string>
-  <string name="pref_node_configuration">KÉ?siÅ?mÉ? Konfiqurasiyası</string>
+    <!--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="button_proxy_all">HÉ?r Å?eyi proksilÉ?
-</string>
-  <string name="button_proxy_none">Heç nÉ?yi proksilÉ?mÉ?</string>
-  <string name="button_invert_selection">Seçiminin yerini dÉ?yiÅ?</string>
-  <string name="pref_proxy_title">Ä°xrac EdilÉ?n Å?É?bÉ?kÉ? Proksisi (istÉ?yÉ? baÄ?lı)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +56,8 @@
   <string name="pref_proxy_password_title">Ä°xrac EdilÉ?n Proksi Å?ifrÉ?</string>
   <string name="pref_proxy_password_summary">Proksi Å?ifrÉ? (istÉ?yÉ? baÄ?lı)</string>
   <string name="pref_proxy_password_dialog">Proksi Å?ifrÉ? Daxil et</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tam Å?É?ffaf proksilÉ?mÉ?nin quraÅ?dırılması...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Aplikasiya É?saslı Å?É?ffaf proksilÉ?mÉ?nin quraÅ?dırılması...</string>
-  <string name="transparent_proxying_enabled">Å?É?ffaf proksilÉ?mÉ? AKTÄ°VLÆ?Å?DÄ°RÄ°LDÄ°</string>
-  <string name="transproxy_enabled_for_tethering_">BaÄ?lanma üçün TransProksi aktivlÉ?Å?dirildi!</string>
-  <string name="warning_error_starting_transparent_proxying_">TÆ?HLÃ?KÆ?: Å?É?ffaf proksilÉ?mÉ?nin baÅ?lanmasında xÉ?ta!</string>
-  <string name="transproxy_rules_cleared">TransProksi qaydalar tÉ?mizlÉ?ndi</string>
-  <string name="couldn_t_start_tor_process_">Tor prosesi baÅ?lana bilmÉ?di:</string>
-  <string name="privoxy_is_running_on_port_">Polipo portda iÅ?lÉ?yir</string>
-  <string name="setting_up_port_based_transparent_proxying_">Porta É?saslanmıÅ? proksilÉ?mÉ?nin quraÅ?dırılması...</string>
-  <string name="bridge_error">Körpü XÉ?tası</string>
-  <string name="bridge_requires_ip">Körpü funksiyasını istifadÉ? etmÉ?k üçün É?n azı bir körpü IP ünvanı É?lavÉ? etmÉ?lisÉ?n.</string>
-  <string name="send_email_for_bridges">Gmail hesabından bridges@xxxxxxxxxxxxxx ünvanına mÉ?tn hissÉ?sindÉ? \"körpü É?ldÉ? et\" sözlÉ?ri yazılmaqla mÉ?ktub göndÉ?r.</string>
-  <string name="error">XÉ?ta</string>
+    <string name="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>
@@ -173,9 +70,7 @@
   <string name="use_only_these_specified_nodes">*Yalnız* bu xüsusi kÉ?siÅ?mÉ?lÉ?ri istifadÉ? et</string>
   <string name="bridges">KörpülÉ?r</string>
   <string name="use_bridges">Körpü Ä°stifadÉ? Et</string>
-  <string name="bridges_obfuscated">Ã?aÅ?dırıcı KörpülÉ?r</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">QuraÅ?dırılmıÅ? körpülÉ?r çaÅ?dırıcı körpülÉ?r olsa, aktivlÉ?Å?dir</string>
-  <string name="ip_address_and_port_of_bridges">KörpülÉ?rin IP ünvanı vÉ? portu</string>
+    <string name="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>
@@ -191,17 +86,10 @@
   <string name="reachable_ports">Æ?lçatan portlar</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">MÉ?hdudlaÅ?dırılmıÅ? qoruyucu divar arxasında É?lçatan portlar</string>
   <string name="enter_ports">Port daxil et</string>
-  <string name="enable_hidden_services">Gizli XidmÉ?t Hostinqi</string>
-  <string name="run_servers_accessible_via_the_tor_network">cihaz serverinin Tor Å?É?bÉ?kÉ?si tÉ?rÉ?findÉ?nÉ?ldÉ? edilÉ?n olmasına icazÉ? ver</string>
-  <string name="enter_localhost_ports_for_hidden_services">gizli xidmÉ?tlÉ?r üçün yerlihost portlarını daxil et</string>
-  <string name="hidden_service_ports">Gizli XidmÉ?t Portları</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">gizli xidmÉ?tin üçün ünvanlanan ad (avtomatik hazırlanmıÅ?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">mÉ?hsul üçün sazlama giriÅ?i daxil et (baxmaq üçün adb vÉ? ya aLogCat istifadÉ? etmÉ?lisÉ?n)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">mÉ?hsul üçün sazlama giriÅ?i daxil et (baxmaq üçün adb vÉ? ya aLogCat istifadÉ? etmÉ?lisÉ?n)</string>
   <string name="project_home">LayihÉ? Evi(lÉ?ri):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor Lisenziyası</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">XidmÉ?ti QuraÅ?dırma:</string>
+    <string name="third_party_software">XidmÉ?ti QuraÅ?dırma:</string>
   <string name="tor_version">
 Tor: https://www.torproject.org</string>
   <string name="libevent_version">
@@ -209,37 +97,18 @@ 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="hidden_service_on">burada gizli xidmÉ?ti:</string>
-  <string name="unable_to_read_hidden_service_name">gizli xidmÉ?t adını oxumaÄ?ı deaktivlÉ?Å?dir</string>
+    <string name="unable_to_read_hidden_service_name">gizli xidmÉ?t adını oxumaÄ?ı deaktivlÉ?Å?dir</string>
   <string name="unable_to_start_tor">Tor-un baÅ?lanmasını dayandır:</string>
-  <string name="unable_to_reset_tor">Cihazınızı yenidÉ?n yüklÉ?yin, Toru bÉ?rpa etmÉ?k olmur!</string>
-  <string name="pref_use_sys_iptables_title">Mövcud Ipstol Ä°stifadÉ? Et</string>
-  <string name="pref_use_sys_iptables_summary">Orbotla baÄ?lanmıÅ? ipstol É?vÉ?zinÉ? daxili cüt ipstol istifadÉ? et</string>
-  <string name="error_installing_binares">Tor cütlüklÉ?ri quraÅ?dırıla vÉ? ya tÉ?kmillÉ?Å?dirilÉ? bilmÉ?di.</string>
-  <string name="pref_use_persistent_notifications">HÉ?miÅ?É? Orbot qoÅ?ulduÄ?u hallarda niÅ?anı alÉ?tlÉ?t panelindÉ? saxla</string>
+    <string name="pref_use_persistent_notifications">HÉ?miÅ?É? Orbot qoÅ?ulduÄ?u hallarda niÅ?anı alÉ?tlÉ?t panelindÉ? saxla</string>
   <string name="pref_use_persistent_notifications_title">HÉ?miÅ?É? Açıq XÉ?bÉ?rdarlıqlar</string>
   <string name="pref_use_expanded_notifications">Torla birlikdÉ? É?traflı bildiriÅ?i göstÉ?rib ölkÉ? vÉ? IP-dÉ?n çıxın. </string>
   <string name="pref_use_expanded_notifications_title">Æ?traflı bildiriÅ?lÉ?r</string>
-  <string name="notification_using_bridges">KörpülÉ?r aktivlÉ?Å?dirildi!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Dil</string>
-  <string name="set_locale_summary">Orbot üçün dil standartlarını vÉ? dili seç</string>
-  <string name="wizard_locale_title">Dil Seç</string>
-  <string name="wizard_locale_msg">OlduÄ?u kimi saxla, ya da mövcud dilÉ? keç</string>
-  <string name="powered_by">Tor tÉ?rÉ?findÉ?n yaradılmıÅ?</string>
-  <string name="btn_save_settings">SeçimlÉ?ri Saxla</string>
-  <string name="no_internet_connection_tor">Ä°nternet yoxdur; Tor gözlÉ?yir</string>
-  <string name="bandwidth_">Ã?türmÉ? qabiliyyÉ?ti:</string>
-  <string name="down">aÅ?aÄ?ı</string>
-  <string name="up">yuxarı</string>
-  <string name="pref_disable_network_title">Avto-Yuxu Å?É?bÉ?kÉ?si Yoxdur</string>
+    <string name="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="menu_verify_browser">Bax</string>
-  <string name="menu_use_chatsecure">ChatSecure istifadÉ? et</string>
-  <string name="permission_manage_tor_label">Toru Ä°darÉ? Et</string>
-  <string name="permission_manage_tor_description">Tor xidmÉ?tini idarÉ? etmÉ?si üçün aplikasiyanı aktivlÉ?Å?dir</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ä°nternetlÉ? É?laqÉ? yoxdur. Tor gözlÉ?mÉ? rejiminÉ? keçir...</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>
@@ -254,19 +123,7 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="pref_torrc_title">Torrc Custom Config</string>
   <string name="pref_torrc_summary">YALNIZ EKSPERTLÆ?R: birbaÅ?a torrc config xÉ?tlÉ?rini daxil edin</string>
   <string name="pref_torrc_dialog">Custom Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Ä°nsan haqları SÉ?nÉ?dlÉ?ri tÉ?tbiqetmÉ?si</string>
-  <string name="your_tor_public_ips_">Sizin ictimai Tor Ä°P-lÉ?riniz</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotla baÄ?lı probleminiz varsa, lütfÉ?n, Android-&gt;Settings-&gt;Apps-dÉ? bu tÉ?tbiqetmÉ?ni söndürün;</string>
-  <string name="app_conflict">TÉ?tbiqetmÉ? konflikti</string>
-  <string name="pref_transproxy_refresh_title">Transproxy avtomatik yenilÉ?mÉ?</string>
-  <string name="pref_transproxy_refresh_summary">Å?É?bÉ?kÉ? vÉ?ziyyÉ?ti dÉ?yiÅ?É?ndÉ? Transproxy qaydalarını yenidÉ?n tÉ?tbiq edin</string>
-  <string name="pref_transproxy_flush_title">Transproxy MÆ?CBURÄ° POZMA</string>
-  <string name="pref_transproxy_flush_summary">Bütün transproxy Å?É?bÉ?kÉ? qaydalarını elÉ? Ä°NDÄ° lÉ?Ä?v etmÉ?k üçün bura kliklÉ?yin</string>
-  <string name="transparent_proxy_rules_flushed_">Transparent proksi qaydaları lÉ?Ä?v edildi</string>
-  <string name="you_do_not_have_root_access_enabled">Root giriÅ?iniz yoxdur</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">QuraÅ?dırma dÉ?yiÅ?ikliklÉ?rinin tÉ?tbiq edilmÉ?si üçün Orbota baÅ?lamaÄ?a vÉ? ya onu dayandırmaÄ?a ehtiyacınız ola bilÉ?r. </string>
-  <string name="menu_vpn">TÉ?tbiqetmÉ?lÉ?r</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -280,9 +137,7 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</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;amp-i nüsxÉ?lÉ?yin vÉ? onu Orbot quraÅ?dırmasındakı \"Bridges\" parametrinÉ? qoyun vÉ? cihazı yenidÉ?n yüklÉ?yin.</string>
   <string name="install_orweb">Orfoxu quraÅ?dırın</string>
-  <string name="standard_browser">Standart Brauzer</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">QEYD: Intel X86/ATOM cihazlarında yalnız standart Tor körpülÉ?r iÅ?lÉ?yir.</string>
-  <string name="save">Saxla</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>
diff --git a/app/src/main/res/values-be/poestrings.xml b/app/src/main/res/values-be/poestrings.xml
index 08002289..8a247208 100644
--- a/app/src/main/res/values-be/poestrings.xml
+++ b/app/src/main/res/values-be/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\\"Ð?аÑ?Ñ?Ñ? â?? гÑ?Ñ?а Ñ?Ñ?Ñ?Ñ?анÑ?лÑ?Ñ?аÑ?Ñ? Tor, Ñ?кÑ?Ñ? дапамагаÑ?Ñ?Ñ? абÑ?Ñ?Ñ?Ñ? Ñ?Ñ?нзÑ?Ñ?Ñ?. Ð?Ñ? можаÑ?е паÑ?пÑ?абаваÑ?Ñ? вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? маÑ?Ñ?Ñ?, калÑ? Tor блакÑ?еÑ?Ñ?а ваÑ?Ñ?м пÑ?авайдаÑ?ам. Ð?ожнÑ? Ñ?Ñ?п моÑ?Ñ?а Ñ?жÑ?вае адменнÑ? ад Ñ?нÑ?ага меÑ?ад, каб пазбегнÑ?Ñ?Ñ? блакаваннÑ?: калÑ? адзÑ?н Ñ?Ñ?п не пÑ?аÑ?Ñ?е, паÑ?пÑ?абÑ?йÑ?е вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Ñ?нÑ?Ñ?.</string>
-
-    <string name="bridges_no">Ð?ез маÑ?Ñ?оÑ?: пÑ?амое падклÑ?Ñ?Ñ?нне да Tor</string>
-    <string name="bridges_provided">Ð?ададзенÑ?Ñ? маÑ?Ñ?Ñ?:</string>
-    <string name="bridges_custom">Ð?аÑ?Ñ?Ñ?Ñ?алÑ?нÑ?Ñ?кÑ?Ñ? маÑ?Ñ?Ñ?</string>
-
-    <string name="bridges_config">Ð?алада моÑ?Ñ?а</string>
-    <string name="action_done">Ð?аÑ?ова</string>
 
     <string name="bridges_sometimes">ЧаÑ?ам вам бÑ?дзе паÑ?Ñ?Ñ?бен моÑ?Ñ?, каб далезÑ?Ñ? да Tor.</string>
     <string name="action_more">РÐ?СÐ?Ð?Ð?ЫЦÐ? Ð?ЭТÐ?Ð?Ð?Ð?Ð?Ð?</string>
@@ -16,19 +8,6 @@
     <string name="vpn_setup_sub">Ð?Ñ?Ñ?а не зÑ?обÑ?Ñ?Ñ? ваÑ? ананÑ?мнÑ?м, але гÑ?Ñ?а дапаможа пÑ?айÑ?Ñ?Ñ? пÑ?аз бÑ?андмаÑ?Ñ?Ñ?Ñ?.</string>
     <string name="action_vpn_choose">Ð?ЫÐ?РÐ?ЦЬ Ð?Ð?Ð?Ð?ТÐ?Ð?</string>
 
-    <string name="status_connected">Ð?адклÑ?Ñ?ана!</string>
-
-    <string name="loading_claim_1">Ð?аÑ?а Ñ?азмаÑ?Ñ?аÑ? Ñ?Ñ?полÑ?наÑ?Ñ?Ñ? Ñ?обÑ?Ñ?Ñ? Tor Ñ?Ñ?доÑ?нÑ?м!</string>
-    <string name="loading_claim_2">Ð?ожнÑ? дзенÑ? лÑ?дзÑ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor, каб пазбегнÑ?Ñ?Ñ? Ñ?Ñ?кламÑ?.</string>
-    <string name="loading_claim_3">Ð?алÑ? Facebook заблакаванÑ?, лÑ?дзÑ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor длÑ? Ñ?Ñ?вÑ?зÑ? Ñ?а Ñ?ваÑ?мÑ? Ñ?Ñ?бÑ?амÑ? Ñ? Ñ?Ñ?м\'Ñ?й.</string>
-    <string name="loading_claim_4">Ð?кÑ?Ñ?вÑ?Ñ?Ñ?Ñ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor, каб волÑ?на вÑ?казваÑ?Ñ? Ñ?вае дÑ?мкÑ? Ñ? пеÑ?акананнÑ?.</string>
-    <string name="loading_claim_5">Ð?логеÑ?Ñ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor длÑ? згÑ?Ñ?Ñ?аваннÑ? лÑ?дзей, аÑ?воÑ?нÑ?каÑ? пÑ?авÑ?дзеннÑ? Ñ?аÑ?Ñ?Ñ?лÑ?най Ñ?Ñ?Ñ?оÑ?мÑ?.</string>
-    <string name="loading_claim_6">Ð?Ñ?Ñ?налÑ?Ñ?Ñ?Ñ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor длÑ? бÑ?Ñ?пеÑ?нага вÑ?вÑ?Ñ?Ñ?ннÑ? гÑ?Ñ?Ñ?оÑ?Ñ?й, пÑ?а Ñ?кÑ?Ñ? Ñ?нÑ? Ñ?аÑ?казваÑ?Ñ?Ñ?.</string>
-    <string name="loading_claim_7">Ð?Ñ?знеÑ?оÑ?Ñ?Ñ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor, каб заÑ?аваÑ?Ñ? Ñ? Ñ?аÑ?мнÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аÑ?Ñ?гÑ?Ñ? Ñ?ваÑ?й кампанÑ?Ñ?.</string>
-    <string name="loading_claim_8">Ð?Ñ?знеÑ?оÑ?Ñ?Ñ? Ñ?жÑ?ваÑ?Ñ?Ñ? Tor, каб заÑ?аваÑ?Ñ? Ñ? Ñ?аÑ?мнÑ?Ñ?Ñ? Ñ?Ñ?Ñ?аÑ?Ñ?гÑ?Ñ? Ñ?ваÑ?й кампанÑ?Ñ?.</string>
-
-    <string name="status_connecting">Ð?Ñ? падклÑ?Ñ?аем ваÑ?.\\" = \\"Ð?Ñ? падклÑ?Ñ?аем ваÑ?.</string>
-
     <string name="hello">Ð?Ñ?Ñ?вÑ?Ñ?анне</string>
     <string name="welcome">СаÑ?дÑ?Ñ?на запÑ?аÑ?аем Ñ? Tor длÑ? мабÑ?лÑ?нÑ?Ñ? пÑ?Ñ?лад.</string>
 
diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml
index 5d375da3..0226399a 100644
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@@ -2,125 +2,38 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot â?? гÑ?Ñ?а Ñ?вабоднаÑ? пÑ?агÑ?ама длÑ? пÑ?окÑ?Ñ?-злÑ?Ñ?Ñ?ннÑ?Ñ?, Ñ?на дазвалÑ?е Ñ?нÑ?Ñ?м дадаÑ?кам болÑ?Ñ? бÑ?Ñ?пеÑ?на вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?-злÑ?Ñ?Ñ?нне. Orbot Ñ?жÑ?вае Tor длÑ? Ñ?Ñ?Ñ?Ñ?аваннÑ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?-Ñ?Ñ?аÑ?Ñ?ка, Ñ?кÑ? поÑ?Ñ?м Ñ?аваеÑ?Ñ?а падÑ?аÑ? пеÑ?аÑ?Ñ?ланнÑ? пÑ?аз некалÑ?кÑ? кампÑ?Ñ?аÑ?аÑ? Ñ? Ñ?ознÑ?Ñ? Ñ?аÑ?Ñ?каÑ? планеÑ?Ñ?. Tor з\'Ñ?Ñ?лÑ?еÑ?Ñ?а Ñ?вабоднÑ?м пÑ?агÑ?амнÑ?м дадаÑ?кам, а Ñ?акÑ?ама адкÑ?Ñ?Ñ?ай Ñ?еÑ?кай, Ñ?каÑ? дапамагае абаÑ?анÑ?Ñ?Ñ?а ад Ñ?аÑ?Ñ?ннÑ? Ñ? Ñ?еÑ?каÑ?, Ñ?каÑ? пагÑ?ажае аÑ?абÑ?Ñ?Ñ?ай волÑ? Ñ? пÑ?Ñ?ваÑ?нÑ?м жÑ?Ñ?Ñ?Ñ?, пÑ?Ñ?ваÑ?наÑ?Ñ?Ñ? бÑ?знеÑ?-дзейнаÑ?Ñ?Ñ? Ñ? канÑ?акÑ?аÑ?, а Ñ?акÑ?ама дзÑ?Ñ?жаÑ?най пÑ?агÑ?аме бÑ?Ñ?пекÑ?, вÑ?домай Ñ?к 
 аналÑ?з Ñ?Ñ?аÑ?Ñ?ка.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">запÑ?Ñ?к Ñ? пÑ?Ñ?пÑ?ненне Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Orbot запÑ?Ñ?каеÑ?Ñ?а...</string>
   <string name="status_activated">Ð?адлÑ?Ñ?анÑ? да Ñ?еÑ?кÑ? Tor</string>
   <string name="status_disabled">Orbot адклÑ?Ñ?анÑ?</string>
   <string name="status_shutting_down">СлÑ?жба Tor вÑ?клÑ?Ñ?аеÑ?Ñ?а</string>
   <string name="tor_process_starting">Ð?апÑ?Ñ?каеÑ?Ñ?а клÑ?енÑ? Tor...</string>
   <string name="tor_process_complete">завеÑ?Ñ?ана.</string>
-  <string name="tor_process_waiting">Ñ?аканне.</string>
-  <string name="not_anonymous_yet">УÐ?Ð?Ð?Ð?: ваÑ? Ñ?Ñ?аÑ?Ñ?к Ñ?Ñ?Ñ?Ñ? не ананÑ?мнÑ?! Ð?алÑ? лаÑ?ка, наладзÑ?Ñ?е Ñ?вае пÑ?агÑ?амÑ? на вÑ?каÑ?Ñ?Ñ?Ñ?анне HTTP-пÑ?окÑ?Ñ? 127.0.0.1:8118 Ñ?Ñ? SOCKS4A- Ñ?Ñ? SOCKS5-пÑ?окÑ?Ñ? 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?алоÑ?наÑ?</string>
-  <string name="menu_browse">Ð?Ñ?аглÑ?д</string>
   <string name="menu_settings">Ð?аладÑ?</string>
   <string name="menu_log">Ð?Ñ?Ñ?нал</string>
-  <string name="menu_info">Ð?апамога</string>
-  <string name="menu_apps">Ð?адаÑ?кÑ?â?¦</string>
   <string name="menu_start">Ð?Ñ?Ñ?к</string>
   <string name="menu_stop">СÑ?оп</string>
   <string name="menu_about">Ð?Ñ?а пÑ?агÑ?амÑ?</string>
-  <string name="menu_promo_apps">Ð?Ñ?Ñ?Ñ?маÑ?Ñ? дадаÑ?кÑ?...</string>
   <string name="main_layout_download">СпампаваÑ?Ñ?</string>
   <string name="main_layout_upload">Ð?дпÑ?аÑ?ленне</string>
-  <string name="button_help">Ð?апамога</string>
-  <string name="button_close"> Ð?акÑ?Ñ?Ñ?Ñ?</string>
   <string name="button_about">Ð?Ñ?а пÑ?агÑ?амÑ?</string>
-  <string name="button_clear_log">Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? жÑ?Ñ?нал</string>
-  <string name="menu_verify">Ð?Ñ?авеÑ?ка</string>
   <string name="menu_exit">Ð?Ñ?йÑ?Ñ?е</string>
   <string name="menu_scan">СканаваÑ?Ñ? QR-код моÑ?Ñ?а</string>
   <string name="menu_share_bridge">Ð?пÑ?блÑ?каваÑ?Ñ? QR-код моÑ?Ñ?а</string>
-  <string name="press_to_start">- доÑ?гÑ? наÑ?Ñ?Ñ?к длÑ? запÑ?Ñ?кÑ? -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?азÑ?Ñ?Ñ?Ñ?Ñ? пÑ?окÑ?Ñ? (паÑ?Ñ?абÑ?Ñ?Ñ?Ñ?а пÑ?Ñ?вÑ?леÑ? root)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?азÑ?Ñ?Ñ?Ñ?Ñ? пÑ?окÑ?Ñ?</string>
-  <string name="pref_trans_proxy_summary">Ð?Ñ?Ñ?амаÑ?Ñ?Ñ?наÑ? ТоÑ?Ñ?Ñ?Ñ?каÑ?Ñ?Ñ? дадаÑ?каÑ?</string>
-  <string name="pref_transparent_all_title">Ð?акÑ?Ñ?оÑ?ваÑ?Ñ? Ñ?Ñ?Ñ? пÑ?аз Tor</string>
-  <string name="pref_transparent_all_summary">Ð?акÑ?Ñ?оÑ?ваÑ?Ñ? Ñ?Ñ?аÑ?Ñ?к Ñ?Ñ?Ñ?Ñ? дадаÑ?каÑ? пÑ?аз Tor</string>
-  <string name="pref_transparent_port_fallback_title">РÑ?зеÑ?вовÑ? поÑ?Ñ? пÑ?окÑ?Ñ?</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?ЯРЭÐ?Ð?Ð?Ð?Ð?Ð?: абÑ?Ñ?одзÑ?Ñ?Ñ? агÑ?лÑ?нÑ?Ñ? паÑ?Ñ?Ñ? (80, 443 Ñ? г. д.). *Ð?ЫÐ?Ð?РЫСТÐ?Ð?Ð?Ð?ЦЬ ТÐ?Ð?ЬÐ?Ð?* калÑ? Ñ?Ñ?жÑ?мÑ? \'УÑ?Ñ?\' Ñ?Ñ? \'Ð?адаÑ?ак\' не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпÑ?Ñ? паÑ?Ñ?оÑ?</string>
-  <string name="pref_transparent_port_summary">СпÑ?Ñ? паÑ?Ñ?оÑ? длÑ? пÑ?окÑ?Ñ?каÑ?Ñ?Ñ?. *Ð?ЫÐ?Ð?РЫСТÐ?Ð?Ð?Ð?ЦЬ ТÐ?Ð?ЬÐ?Ð?* калÑ? Ñ?Ñ?жÑ?мÑ? \'УÑ?Ñ?\' Ñ?Ñ? \'Ð?адаÑ?ак\' не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">УвÑ?дзÑ?Ñ?е паÑ?Ñ?Ñ? длÑ? пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?</string>
-  <string name="pref_has_root">Ð?апÑ?Ñ?аÑ?Ñ? root-доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?апÑ?Ñ?аÑ?Ñ? root-доÑ?Ñ?Ñ?п длÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?</string>
-  <string name="status_install_success">Ð?Ñ?наÑ?нÑ?Ñ? Ñ?айлÑ? Tor паÑ?пÑ?Ñ?ова Ñ?Ñ?Ñ?алÑ?ванÑ?!</string>
-  <string name="status_install_fail">Ð?е аÑ?Ñ?Ñ?малаÑ?Ñ? Ñ?Ñ?Ñ?алÑ?ваÑ?Ñ? бÑ?наÑ?нÑ?Ñ? Ñ?айлÑ? Tor. Ð?алÑ? лаÑ?ка, пÑ?авеÑ?Ñ?е Ñ?Ñ?Ñ?Ñ?Ñ?мнÑ? жÑ?Ñ?нал Ñ? паведамÑ?Ñ?е нам: tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?амÑ?лка пÑ?агÑ?амÑ?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?Ñ?а Orbot</string>
-  <string name="btn_next">Ð?алей</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">СконÑ?Ñ?Ñ?Ñ?</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">СкаÑ?аваÑ?Ñ?</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ð?екаÑ?оÑ?Ñ?Ñ? звеÑ?Ñ?кÑ? пÑ?а пÑ?агÑ?амÑ? Orbot</string>
   <string name="wizard_details_msg">Orbot â?? гÑ?Ñ?а пÑ?агÑ?ама з адкÑ?Ñ?Ñ?Ñ?м зÑ?Ñ?однÑ?м кодам, Ñ?каÑ? Ñ?Ñ?Ñ?Ñ?моÑ?вае Tor, Obfs4Proxy, BadVPN Tun2Socks, LibEvent Ñ? Polipo. Яно пÑ?апанÑ?е лакалÑ?нÑ? HTTP- (8118) Ñ? SOCKS-пÑ?окÑ?Ñ? (9050) Ñ? Ñ?еÑ?кÑ? Tor. Orbot Ñ?акÑ?ама дазвалÑ?е на пÑ?Ñ?ладаÑ? з пÑ?авамÑ? root пеÑ?аÑ?Ñ?лаÑ?Ñ? Ñ?веÑ?Ñ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?-Ñ?Ñ?аÑ?Ñ?к пÑ?аз Tor.</string>
-  <string name="wizard_permissions_root">Ð?азвол аÑ?Ñ?Ñ?манÑ?</string>
-  <string name="wizard_permissions_stock">Ð?азволÑ? Orbot</string>
-  <string name="wizard_premissions_msg_root">Ð?Ñ?даÑ?на! Ð?Ñ? вÑ?знаÑ?Ñ?лÑ?, Ñ?Ñ?о вÑ? падалÑ? root-пÑ?авÑ? длÑ? Orbot. Ð?Ñ? бÑ?дзем вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? гÑ?Ñ?Ñ? магÑ?Ñ?маÑ?Ñ?Ñ? з Ñ?озÑ?мам.</string>
-  <string name="wizard_permissions_msg_stock">ХоÑ?Ñ? гÑ?Ñ?а Ñ? не паÑ?Ñ?абÑ?еÑ?Ñ?а, Orbot можа бÑ?Ñ?Ñ? магÑ?Ñ?нейÑ?ай пÑ?Ñ?ладай, калÑ? ваÑ?а пÑ?Ñ?лада мае дазвол root. Ð?аÑ?Ñ?Ñ?нÑ?Ñ?е на кнопкÑ? нÑ?жÑ?й Ñ? падайÑ?е Orbot Ñ?Ñ?пеÑ?магÑ?Ñ?маÑ?Ñ?Ñ?!</string>
-  <string name="wizard_permissions_no_root">Ð?алÑ? Ñ? ваÑ? не root-пÑ?авоÑ? Ñ?Ñ? вÑ? не маеÑ?е Ñ?Ñ?Ñ?леннÑ? пÑ?а Ñ?Ñ?о гавоÑ?Ñ?Ñ?Ñ?а, пÑ?оÑ?Ñ?а пеÑ?аканаеÑ?еÑ?Ñ?, Ñ?Ñ?о вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваеÑ?е пÑ?агÑ?амÑ?, Ñ?аÑ?пÑ?аÑ?аванÑ?Ñ? длÑ? Orbot.</string>
-  <string name="wizard_permissions_consent">Я Ñ?азÑ?меÑ? Ñ? Ñ?аÑ?Ñ? пÑ?аÑ?Ñ?гнÑ?Ñ?Ñ? без пÑ?аÑ? Ñ?Ñ?пеÑ?каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка</string>
-  <string name="wizard_permission_enable_root">Ð?аÑ?Ñ? root-пÑ?ава Orbot</string>
-  <string name="wizard_configure">Ð?аладзÑ?Ñ?Ñ? Tor-Ñ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?агÑ?ама Orbot дае вам магÑ?Ñ?маÑ?Ñ?Ñ? накÑ?Ñ?оÑ?ваÑ?Ñ? Ñ?Ñ?аÑ?Ñ?к Ñ?Ñ?Ñ?Ñ? дадаÑ?каÑ? пÑ?аз Tor ЦÐ? вÑ?бÑ?аÑ?Ñ? дадаÑ?кÑ? длÑ? пеÑ?анакÑ?Ñ?аваннÑ? Ñ?амаÑ?Ñ?ойна.</string>
-  <string name="wizard_configure_all">Ð?акÑ?Ñ?оÑ?ваÑ?Ñ? Ñ?Ñ?е дадаÑ?кÑ? пÑ?аз Tor</string>
-  <string name="wizard_configure_select_apps">Ð?акÑ?Ñ?оÑ?ваÑ?Ñ? абÑ?анÑ?Ñ? дадаÑ?кÑ? пÑ?аз Tor</string>
-  <string name="wizard_tips_tricks">Orbot-задзейнÑ?Ñ?анÑ?Ñ? дадаÑ?кÑ?</string>
-  <string name="wizard_tips_msg">Ð?Ñ? Ñ?аÑ?м вам Ñ?пампаваÑ?Ñ? Ñ? вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? дадаÑ?кÑ?, Ñ?кÑ?Ñ? Ñ?меÑ?Ñ?Ñ? пÑ?аÑ?аваÑ?Ñ? наÑ?пÑ?оÑ?Ñ? пÑ?аз Orbot. Ð?аÑ?Ñ?Ñ?нÑ?Ñ?е на кнопкÑ? нÑ?жÑ?й, каб запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?аÑ?Ñ?Ñ? Ñ?Ñ?Ñ?алÑ?Ñ?кÑ? Ñ?Ñ? вÑ? можаÑ?е знайÑ?Ñ?Ñ? Ñ?Ñ? пазней Ñ? Ð?Ñ?аме Google, на вÑ?б-Ñ?айÑ?е GuardianProject.info Ñ?Ñ? пÑ?аз F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - абаÑ?оненÑ? памен паведамленнÑ?мÑ? Ñ? Android</string>
-  <string name="wizard_tips_proxy">Ð?аладÑ? пÑ?окÑ?Ñ?: даведайÑ?еÑ?Ñ?, Ñ?к наладзÑ?Ñ?Ñ? дадаÑ?кÑ? длÑ? пÑ?аÑ?Ñ? з Orbot</string>
-  <string name="wizard_tips_duckgo">Ð?адаÑ?ак поÑ?Ñ?кавай Ñ?Ñ?Ñ?Ñ?Ñ?мÑ? DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Twitter падÑ?Ñ?Ñ?млÑ?вае http-пÑ?окÑ?Ñ? \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - напÑ?Ñ?Ñ?Ñ?е апавÑ?данне Ñ? пакÑ?нÑ?Ñ?е Ñ?го Tor длÑ? забеÑ?пÑ?Ñ?Ñ?ннÑ? бÑ?Ñ?пекÑ?!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?аладÑ? пÑ?окÑ?Ñ?</string>
-  <string name="wizard_proxy_help_msg">Ð?алÑ? вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ванÑ? вамÑ? дадаÑ?ак длÑ? Android падÑ?Ñ?Ñ?млÑ?вае HTTP Ñ?Ñ? SOCKS-пÑ?окÑ?Ñ?, Ñ?о вÑ? можаÑ?е наладзÑ?Ñ?Ñ? Ñ?го на падклÑ?Ñ?Ñ?нне да Orbot Ñ? вÑ?каÑ?Ñ?Ñ?Ñ?анне Tor.\n\n\nÐ?наÑ?Ñ?нне Ñ?аÑ?Ñ?а - 127.0.0.1 Ñ?Ñ? \"localhost\". Ð?лÑ? HTTP нÑ?маÑ? поÑ?Ñ?а - 8118. Ð?лÑ? SOCKS-пÑ?окÑ?Ñ? - 9050. Ð?а магÑ?Ñ?маÑ?Ñ?Ñ? вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?вайÑ?е SOCKS4A Ñ?Ñ? SOCKS5.\n \n\n\nÐ?Ñ? можаÑ?е даведаÑ?Ñ?а болÑ?Ñ? пÑ?а пÑ?аÑ?Ñ? пÑ?аз пÑ?окÑ?Ñ? на Android, пÑ?аÑ?Ñ?Ñ?аÑ?Ñ?Ñ? гÑ?Ñ?Ñ? FAQ: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot гаÑ?оÑ? да вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ?!</string>
-  <string name="wizard_final_msg">Ð?Ñ?лÑ?Ñ?нÑ? лÑ?дзей ва Ñ?Ñ?Ñ?м Ñ?веÑ?е вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ?Ñ? Tor па Ñ?ознÑ?Ñ? пÑ?Ñ?Ñ?Ñ?наÑ?. Ð?Ñ?Ñ?налÑ?Ñ?Ñ?Ñ? Ñ? блогеÑ?Ñ?, пÑ?аваабаÑ?онÑ?Ñ?, Ñ?Ñ?пÑ?аÑ?оÑ?нÑ?кÑ? пÑ?авааÑ?оÑ?нÑ?Ñ? оÑ?ганаÑ?, Ñ?алдаÑ?Ñ?, каÑ?паÑ?аÑ?Ñ?Ñ?, гÑ?амадзÑ?не кÑ?аÑ?н з Ñ?Ñ?пÑ?Ñ?Ñ?Ñ?Ñ?нÑ?м Ñ?Ñ?жÑ?мам Ñ? пÑ?оÑ?Ñ?а звÑ?Ñ?айнÑ?Ñ? гÑ?амадзÑ?не..., а заÑ?аз гаÑ?овÑ? Ñ? вÑ?!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?алÑ? лаÑ?ка, наладзÑ?Ñ?е Orbot пеÑ?Ñ? Ñ?Ñ?м пÑ?Ñ?Ñ?Ñ?Ñ?пÑ?Ñ?Ñ? да вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ?!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ð?Ñ? паÑ?пÑ?Ñ?ова далÑ?Ñ?Ñ?лÑ?Ñ?Ñ? да Ñ?еÑ?кÑ? Tor, але гÑ?Ñ?а Ð?Ð? знаÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о ваÑ?а пÑ?Ñ?лада бÑ?Ñ?пеÑ?наÑ?. Ð?Ñ? можаÑ?е Ñ?каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а Ñ?Ñ?нкÑ?Ñ?Ñ?й \'Ð?Ñ?авеÑ?ка\' з менÑ?, каб пÑ?аÑ?Ñ?Ñ?Ñ?аваÑ?Ñ? ваÑ? бÑ?аÑ?заÑ?.\n\nÐ?аведаеÑ?е наÑ? Ñ?айÑ? https://guardianproject.info/apps/orbot Ñ?Ñ? адпÑ?аÑ?Ñ?е лÑ?Ñ?Ñ? на адÑ?аÑ? help@xxxxxxxxxxxxxxxxxxxx, каб даведаÑ?Ñ?а болÑ?Ñ?.</string>
-  <string name="tor_check">Ð?Ñ?Ñ?а пÑ?Ñ?вÑ?дзе да запÑ?Ñ?кÑ? бÑ?аÑ?заÑ?а, абÑ?анага на ваÑ?ай пÑ?Ñ?ладзе па змаÑ?Ñ?аннÑ?, Ñ? падклÑ?Ñ?Ñ?ннÑ? да Ñ?айÑ?а https://check.torproject.org дзелÑ? пÑ?авеÑ?кÑ? пÑ?авÑ?лÑ?наÑ?Ñ?Ñ? пÑ?аÑ?Ñ? Orbot Ñ? вÑ?знаÑ?Ñ?ннÑ?, Ñ?Ñ? падклÑ?Ñ?анÑ? вÑ? да Ñ?еÑ?кÑ? Tor.</string>
-  <string name="pref_hs_group">СÑ?аванÑ?Ñ? Ñ?лÑ?жбÑ?</string>
   <string name="pref_general_group">Ð?гÑ?лÑ?нÑ?Ñ?</string>
   <string name="pref_start_boot_title">Ð?апÑ?Ñ?каÑ?Ñ? Orbot пÑ?Ñ? загÑ?Ñ?зÑ?Ñ?</string>
   <string name="pref_start_boot_summary">Ð?Ñ?Ñ?амаÑ?Ñ?Ñ?на запÑ?Ñ?каÑ?Ñ? Orbot Ñ? падлÑ?Ñ?аÑ?Ñ?а да Ñ?еÑ?кÑ? Tor пÑ?Ñ? загÑ?Ñ?зÑ?Ñ? ваÑ?ай Android-пÑ?Ñ?ладÑ?</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot дазвалÑ?е вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Tor на Android!\n\nTor дазвалÑ?е вам абаÑ?анÑ?Ñ?Ñ?а ад Ñ?Ñ?лÑ?Ñ?Ñ?аÑ?Ñ?Ñ? змеÑ?Ñ?Ñ?ва, аналÑ?зÑ? Ñ?Ñ?аÑ?Ñ?ка Ñ? назÑ?Ñ?аннÑ? за Ñ?еÑ?кай, Ñ?кÑ?Ñ? Ñ?Ñ?авÑ?Ñ?Ñ? пад пагÑ?озÑ? пÑ?Ñ?ваÑ?наÑ?Ñ?Ñ?, пÑ?Ñ?ваÑ?нÑ?Ñ? Ñ?нÑ?аÑ?маÑ?Ñ?Ñ? Ñ? аÑ?абÑ?Ñ?Ñ?Ñ?Ñ? адноÑ?Ñ?нÑ?.\n\nÐ?Ñ?Ñ?Ñ? майÑ?Ñ?аÑ? дапаможа вам наладзÑ?Ñ?Ñ? Orbot Ñ? Tor на ваÑ?ай пÑ?Ñ?ладзе.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Увага</string>
-  <string name="wizard_warning_msg">Сама па Ñ?абе Ñ?Ñ?Ñ?алÑ?Ñ?ка Orbot не зÑ?обÑ?Ñ?Ñ? аÑ?Ñ?амаÑ?Ñ?Ñ?на ваÑ? мабÑ?лÑ?нÑ? Ñ?Ñ?аÑ?Ñ?к ананÑ?мнÑ?м.\n\n Ð?Ñ? павÑ?ннÑ? пÑ?авÑ?лÑ?на наладзÑ?Ñ?Ñ? Orbot, ваÑ?Ñ? пÑ?Ñ?ладÑ? Ñ? Ñ?нÑ?Ñ?Ñ? дадаÑ?кÑ?, Ñ?Ñ?о б паÑ?пÑ?Ñ?ова вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Tor.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?азволÑ?</string>
-  <string name="wizard_permissions_root_msg1">Ð?Ñ? гÑ?Ñ?ак жа можаÑ?е па жаданнÑ? даÑ?Ñ? Orbot пÑ?авÑ? \'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\' длÑ? доÑ?Ñ?Ñ?пÑ? да дадаÑ?ковÑ?Ñ? магÑ?Ñ?маÑ?Ñ?Ñ?Ñ? Ñ?Ñ?пÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?.</string>
-  <string name="wizard_permissions_root_msg2">Ð?даеÑ?Ñ?а, ваÑ?а пÑ?Ñ?лада не мае root-пÑ?авоÑ? Ñ? не пÑ?апанÑ?е доÑ?Ñ?Ñ?п \'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\'.\n\nÐ?алÑ? лаÑ?ка, паÑ?пÑ?абÑ?йÑ?е Ñ?Ñ?жÑ?м \'Ð?адаÑ?кÑ?\' на галоÑ?нÑ?м Ñ?кÑ?ане.</string>
-  <string name="wizard_permissions_no_root_msg">Ð?даеÑ?Ñ?а, ваÑ?а пÑ?Ñ?лада не мае root-пÑ?авоÑ? Ñ? не пÑ?апанÑ?е доÑ?Ñ?Ñ?п \'СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а\'.\n\n Ð?алÑ? лаÑ?ка, паÑ?пÑ?абÑ?йÑ?е Ñ?Ñ?жÑ?м \'Ð?адаÑ?кÑ?\' на галоÑ?нÑ?м Ñ?кÑ?ане.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?адаÑ?кÑ?, Ñ?Ñ?о пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: дадаÑ?ак длÑ? бÑ?Ñ?пеÑ?нага лÑ?Ñ?Ñ?аваннÑ? з пÑ?Ñ?ваÑ?нÑ?м Ñ?Ñ?Ñ?Ñ?аваннем</string>
-  <string name="wizard_tips_orweb">Orfox: пÑ?Ñ?ваÑ?нÑ? бÑ?аÑ?заÑ?, Ñ?Ñ?о пÑ?аÑ?Ñ?е пÑ?аз Tor</string>
-  <string name="wizard_tips_play">Ð?найÑ?Ñ?Ñ? Ñ?Ñ?е дадаÑ?кÑ? Guardian Project на Ð?Ñ?ама Google</string>
-  <string name="wizard_tips_fdroid">Ð?найÑ?Ñ?Ñ? Ñ?Ñ?е дадаÑ?кÑ? Guardian Project на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?найÑ?Ñ?Ñ? Ñ?Ñ?е дадаÑ?кÑ? Guardian Project на Ñ?айÑ?е https://f-droid.org</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?азÑ?Ñ?Ñ?Ñ?Ñ? пÑ?окÑ?Ñ?</string>
-  <string name="wizard_transproxy_msg">Ð?Ñ?Ñ?а дазвалÑ?е ваÑ?Ñ?м дадаÑ?кам аÑ?Ñ?амаÑ?Ñ?Ñ?на пÑ?аÑ?аваÑ?Ñ? па Ñ?еÑ?Ñ?Ñ? Tor без Ñ?кой-небÑ?дзÑ? наладÑ?.</string>
-  <string name="wizard_transproxy_hint">(Ð?дзнаÑ?Ñ?е дадзенÑ? пÑ?нкÑ?, калÑ? вÑ? не ведаеÑ?е пÑ?а Ñ?Ñ?о Ñ?дзе гавоÑ?ка)</string>
-  <string name="wizard_transproxy_none">Ð?е</string>
-  <string name="pref_transparent_tethering_title">ТÑ?Ñ?Ñ?Ñ?Ñ?нг Tor</string>
-  <string name="pref_transparent_tethering_summary">УклÑ?Ñ?Ñ?Ñ?Ñ? пÑ?азÑ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?оÑ?кÑ?Ñ?Ñ?каÑ?Ñ?Ñ? Tor длÑ? пÑ?Ñ?лад з Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?нгам па Wi-Fi Ñ? USB (паÑ?Ñ?абÑ?еÑ?Ñ?а пеÑ?азапÑ?Ñ?к)</string>
-  <string name="button_grant_superuser">Ð?апÑ?Ñ?аÑ?Ñ? доÑ?Ñ?Ñ?п СÑ?пеÑ?каÑ?Ñ?Ñ?Ñ?аÑ?а</string>
-  <string name="pref_select_apps">Ð?бÑ?анÑ?Ñ? дадаÑ?кÑ?</string>
-  <string name="pref_select_apps_summary">Ð?бÑ?аÑ?Ñ? дадаÑ?кÑ? длÑ? накÑ?Ñ?аваннÑ? пÑ?аз Tor</string>
   <string name="pref_node_configuration">Ð?анÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? вÑ?зла</string>
   <string name="pref_node_configuration_summary">Ð?Ñ?Ñ?а дадаÑ?ковÑ?Ñ? наладÑ?, Ñ?кÑ?Ñ? могÑ?Ñ?Ñ? зменÑ?Ñ?Ñ?Ñ? ваÑ?Ñ? ананÑ?мнаÑ?Ñ?Ñ?</string>
   <string name="pref_entrance_node">УваÑ?однÑ?Ñ? вÑ?злÑ?</string>
@@ -128,9 +41,6 @@
   <string name="pref_entrance_node_dialog">УвÑ?дзÑ?Ñ?е Ñ?ваÑ?однÑ?Ñ? вÑ?злÑ?</string>
   <string name="pref_allow_background_starts_title">Ð?азволÑ?Ñ?Ñ? Ñ?онавÑ?Ñ? загÑ?Ñ?зкÑ?</string>
   <string name="pref_allow_background_starts_summary">Ð?азволÑ?Ñ?Ñ? кожнамÑ? дадаÑ?кÑ? паÑ?Ñ?абаваÑ?Ñ? ад Orbot запÑ?Ñ?каÑ?Ñ? Tor Ñ? Ñ?кÑ?Ñ? адноÑ?Ñ?Ñ?Ñ?а да Ñ?го Ñ?Ñ?Ñ?вÑ?Ñ?Ñ?</string>
-  <string name="button_proxy_all">Ð?Ñ?акÑ?Ñ?Ñ?ваÑ?Ñ? Ñ?Ñ?Ñ?</string>
-  <string name="button_proxy_none">Ð?е пÑ?акÑ?Ñ?Ñ?ваÑ?Ñ?</string>
-  <string name="button_invert_selection">Ð?нвеÑ?Ñ?аваÑ?Ñ? вÑ?лÑ?Ñ?анае</string>
   <string name="pref_proxy_title">Ð?Ñ?Ñ?однÑ? Ñ?еÑ?кавÑ? пÑ?окÑ?Ñ? (неабавÑ?зкова)</string>
   <string name="pref_proxy_type_title">ТÑ?п пÑ?окÑ?Ñ?</string>
   <string name="pref_proxy_type_summary">Ð?Ñ?аÑ?акол длÑ? вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ? пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ?ам: HTTP, HTTPS, Socks4, Socks5</string>
@@ -147,19 +57,7 @@
   <string name="pref_proxy_password_title">Ð?аÑ?олÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка пÑ?окÑ?Ñ?</string>
   <string name="pref_proxy_password_summary">Ð?аÑ?олÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ?а (неабавÑ?зкова)</string>
   <string name="pref_proxy_password_dialog">УвÑ?дзÑ?Ñ?е паÑ?олÑ? каÑ?Ñ?Ñ?Ñ?алÑ?нÑ?ка пÑ?окÑ?Ñ?</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">УÑ?Ñ?алÑ?Ñ?ка агÑ?лÑ?най пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">УÑ?Ñ?алÑ?Ñ?ка заÑ?наванай на дадаÑ?каÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?азÑ?Ñ?Ñ?Ñ?аÑ? пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ? Ð?Ð?Ð?ЮЧÐ?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">Ð?Ñ?азÑ?Ñ?Ñ?Ñ?Ñ? пÑ?окÑ?Ñ? падÑ?Ñ?Ñ?мвае Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?нг!</string>
-  <string name="warning_error_starting_transparent_proxying_">УÐ?Ð?Ð?Ð?: памÑ?лка запÑ?Ñ?кÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?!</string>
-  <string name="transproxy_rules_cleared">Ð?Ñ?авÑ?лÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ага пÑ?окÑ?Ñ? вÑ?даленÑ?</string>
   <string name="couldn_t_start_tor_process_">Ð?емагÑ?Ñ?ма запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo пÑ?аÑ?Ñ?е на поÑ?Ñ?е:</string>
-  <string name="setting_up_port_based_transparent_proxying_">УÑ?Ñ?алÑ?Ñ?ка заÑ?наванай на паÑ?Ñ?аÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ай пÑ?окÑ?Ñ?Ñ?аÑ?Ñ?Ñ?...</string>
-  <string name="bridge_error">Ð?амÑ?лка моÑ?Ñ?а</string>
-  <string name="bridge_requires_ip">Ð?лÑ? вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ? Ñ?Ñ?Ñ?ба задаÑ?Ñ? IP-адÑ?аÑ? пÑ?Ñ?намÑ?Ñ? аднаго моÑ?Ñ?а.</string>
-  <string name="send_email_for_bridges">Ð?дпÑ?аÑ?Ñ?е лÑ?Ñ?Ñ? на адÑ?аÑ? bridges@xxxxxxxxxxxxxx з Ñ?адком \"get bridges\" Ñ? Ñ?еле паведамленнÑ? з Ñ?лÑ?ковага запÑ?Ñ?Ñ? GMail.</string>
   <string name="error">Ð?амÑ?лка</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?Ñ? наладÑ? даÑ?Ñ?Ñ?пнÑ?Ñ? адÑ?аÑ?оÑ? вÑ?клÑ?калÑ? вÑ?нÑ?Ñ?ак!</string>
   <string name="your_relay_settings_caused_an_exception_">Ð?аÑ?Ñ? наладÑ? Ñ?Ñ?Ñ?Ñ?анÑ?лÑ?Ñ?аÑ?а вÑ?клÑ?калÑ? вÑ?нÑ?Ñ?ак!</string>
@@ -173,9 +71,7 @@
   <string name="use_only_these_specified_nodes">Ð?Ñ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? *Ñ?олÑ?кÑ?* гÑ?Ñ?Ñ?Ñ? зададзенÑ?Ñ? вÑ?злÑ?</string>
   <string name="bridges">Ð?аÑ?Ñ?Ñ?</string>
   <string name="use_bridges">Ð?Ñ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? маÑ?Ñ?Ñ?</string>
-  <string name="bridges_obfuscated">Ð?бÑ?Ñ?Ñ?каванÑ?Ñ? маÑ?Ñ?Ñ?</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">УклÑ?Ñ?Ñ?Ñ?Ñ? алÑ?Ñ?Ñ?Ñ?наÑ?Ñ?Ñ?нÑ?Ñ? Ñ?ваÑ?однÑ?Ñ? вÑ?злÑ? Ñ? Ñ?еÑ?кÑ? Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?ададзенÑ?Ñ? маÑ?Ñ?Ñ? абÑ?Ñ?Ñ?каванÑ?</string>
   <string name="ip_address_and_port_of_bridges">IP-адÑ?аÑ?Ñ? Ñ? паÑ?Ñ?Ñ? маÑ?Ñ?оÑ?</string>
   <string name="enter_bridge_addresses">УвÑ?дзÑ?Ñ?е адÑ?аÑ?Ñ? маÑ?Ñ?оÑ?</string>
   <string name="relays">РÑ?Ñ?Ñ?анÑ?лÑ?Ñ?аÑ?Ñ?</string>
@@ -192,16 +88,9 @@
   <string name="reachable_ports">Ð?аÑ?Ñ?Ñ?пнÑ?Ñ? паÑ?Ñ?Ñ?</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ð?аÑ?Ñ?Ñ?, даÑ?Ñ?Ñ?пнÑ?Ñ? з-за абмежавалÑ?нага Ñ?еÑ?кавага Ñ?кÑ?ана</string>
   <string name="enter_ports">УвÑ?дзÑ?Ñ?е паÑ?Ñ?Ñ?</string>
-  <string name="enable_hidden_services">СÑ?аванÑ?Ñ? Ñ?лÑ?жбÑ?</string>
-  <string name="run_servers_accessible_via_the_tor_network">Ð?азволÑ?Ñ?Ñ? доÑ?Ñ?Ñ?п да Ñ?еÑ?веÑ?а на пÑ?Ñ?ладзе пÑ?аз Ñ?еÑ?кÑ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">УвÑ?дзÑ?Ñ?е лакалÑ?нÑ?Ñ? паÑ?Ñ?Ñ? длÑ? Ñ?Ñ?аваннÑ?Ñ? Ñ?лÑ?жбаÑ?</string>
-  <string name="hidden_service_ports">Ð?аÑ?Ñ?Ñ? Ñ?Ñ?аванай Ñ?лÑ?жбÑ?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ð?дÑ?аÑ?аванае Ñ?мÑ? длÑ? ваÑ?ай Ñ?Ñ?аванай Ñ?лÑ?жбÑ? (Ñ?Ñ?ваÑ?аеÑ?Ñ?а аÑ?Ñ?амаÑ?Ñ?Ñ?на)</string>
   <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">УклÑ?Ñ?Ñ?Ñ?Ñ? вÑ?нÑ?к жÑ?Ñ?нала адладкÑ? (паÑ?Ñ?абÑ?е вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? adb Ñ?Ñ? aLogCat длÑ? пÑ?аглÑ?дÑ?)</string>
   <string name="project_home">ХаÑ?нÑ?Ñ? Ñ?Ñ?аÑ?онка пÑ?аекÑ?а:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ð?Ñ?Ñ?Ñ?нзÑ?Ñ? Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Ð?Ñ?агÑ?амÑ? Ñ?нÑ?Ñ?Ñ? Ñ?аÑ?пÑ?аÑ?оÑ?нÑ?каÑ?: </string>
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
@@ -211,36 +100,17 @@
   <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="hidden_service_on">Ñ?Ñ?аванаÑ? Ñ?лÑ?жба на:</string>
   <string name="unable_to_read_hidden_service_name">немагÑ?Ñ?ма пÑ?аÑ?Ñ?Ñ?аÑ?Ñ? Ñ?мÑ? Ñ?Ñ?аванай Ñ?лÑ?жбÑ?</string>
   <string name="unable_to_start_tor">Ð?емагÑ?Ñ?ма запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Tor:</string>
-  <string name="unable_to_reset_tor">Ð?еÑ?азагÑ?Ñ?зÑ?Ñ?е пÑ?Ñ?ладÑ?, немагÑ?Ñ?ма пеÑ?аÑ?Ñ?Ñ?алÑ?ваÑ?Ñ? Tor!</string>
-  <string name="pref_use_sys_iptables_title">УжÑ?Ñ?Ñ? Iptables па змаÑ?Ñ?аннÑ?</string>
-  <string name="pref_use_sys_iptables_summary">УжÑ?Ñ?Ñ? Ñ?бÑ?даванÑ? Ñ?айл iptables замеÑ?Ñ? паÑ?Ñ?аÑ?лÑ?нага з Orbot</string>
-  <string name="error_installing_binares">Ð?Ñ?полнÑ?емÑ?е Ñ?айлÑ? Tor не Ñ?могли Ñ?Ñ?Ñ?ановиÑ?Ñ?Ñ?Ñ? или обновиÑ?Ñ?Ñ?.</string>
   <string name="pref_use_persistent_notifications">Ð?аÑ?Ñ?Ñ?дÑ? адлÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Ñ?конкÑ? Ñ? панÑ?лÑ? заданнÑ?Ñ? калÑ? Orbot падклÑ?Ñ?анÑ?</string>
   <string name="pref_use_persistent_notifications_title">Ð?Ñ?зменнае апавÑ?Ñ?Ñ?Ñ?нне пÑ?а пÑ?аÑ?Ñ?</string>
   <string name="pref_use_expanded_notifications">Ð?аказаÑ?Ñ? паÑ?Ñ?Ñ?анае апавÑ?Ñ?Ñ?Ñ?нне Tor з кÑ?аÑ?най вÑ?Ñ?адÑ? Ñ? IP</string>
   <string name="pref_use_expanded_notifications_title">Ð?аÑ?Ñ?Ñ?анÑ?Ñ? апавÑ?Ñ?Ñ?Ñ?ннÑ?</string>
-  <string name="notification_using_bridges">Ð?аÑ?Ñ?Ñ? Ñ?клÑ?Ñ?анÑ?!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">Ð?ова</string>
-  <string name="set_locale_summary">Ð?бÑ?аÑ?Ñ? мовÑ? Ñ?нÑ?Ñ?Ñ?Ñ?ейÑ?Ñ? длÑ? Orbot</string>
-  <string name="wizard_locale_title">Ð?бÑ?аÑ?Ñ? мовÑ?</string>
-  <string name="wizard_locale_msg">Ð?акÑ?нÑ?Ñ?Ñ? па змаÑ?Ñ?аннÑ? Ñ?Ñ? пеÑ?амкнÑ?Ñ?Ñ? бÑ?гÑ?Ñ?Ñ?Ñ? мовÑ?</string>
-  <string name="powered_by">заÑ?навана на Tor</string>
-  <string name="btn_save_settings">Ð?аÑ?аваÑ?Ñ? наладÑ?</string>
   <string name="no_internet_connection_tor">Ð?дÑ?Ñ?Ñ?нÑ?Ñ?ае падклÑ?Ñ?Ñ?нне да Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?Ñ?, Tor знаÑ?одзÑ?Ñ?Ñ?а Ñ? Ñ?Ñ?жÑ?ме Ñ?аканнÑ?â?¦</string>
-  <string name="bandwidth_">Ð?анал</string>
-  <string name="down">да наÑ?</string>
-  <string name="up">ад наÑ?</string>
   <string name="pref_disable_network_title">Ð?Ñ?Ñ?азаÑ?Ñ?нанне без Ñ?еÑ?кÑ?</string>
   <string name="pref_disable_network_summary">Ð?еÑ?аводзÑ?Ñ?Ñ? Tor Ñ? Ñ?пÑ?Ñ?Ñ? Ñ?Ñ?жÑ?м пÑ?Ñ? неменÑ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?Ñ?</string>
   <string name="newnym">Ð?Ñ? пеÑ?амкнÑ?лÑ?Ñ?Ñ? на новÑ? Ñ?дÑ?нÑ?Ñ?Ñ?Ñ?каÑ?аÑ? Tor!</string>
-  <string name="menu_verify_browser">Ð?Ñ?авеÑ?Ñ?Ñ?Ñ? бÑ?аÑ?заÑ?</string>
-  <string name="menu_use_chatsecure">СкаÑ?Ñ?Ñ?Ñ?аÑ?Ñ? ChatSecure</string>
-  <string name="permission_manage_tor_label">Ð?Ñ?Ñ?аванне Tor</string>
-  <string name="permission_manage_tor_description">Ð?азволÑ?Ñ?Ñ? дадаÑ?кÑ? кÑ?Ñ?аваÑ?Ñ? Ñ?Ñ?Ñ?вÑ?Ñ?ам Tor</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot найлепей пÑ?аÑ?Ñ?е з бÑ?аÑ?заÑ?ам Orfox. УÑ?Ñ?алÑ?ваÑ?Ñ? Ñ?го?</string>
   <string name="install_apps_">УÑ?Ñ?алÑ?ваÑ?Ñ? бÑ?аÑ?заÑ??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?Ñ?ма падклÑ?Ñ?Ñ?ннÑ? да Ñ?еÑ?кÑ?. Tor пеÑ?аÑ?одзÑ?Ñ?Ñ? Ñ? Ñ?Ñ?жÑ?м Ñ?нÑ?...</string>
@@ -258,18 +128,6 @@
   <string name="pref_torrc_title">Ð?аÑ?Ñ?Ñ?Ñ?алÑ?нÑ?Ñ?кÑ?Ñ? наладÑ? Torrc</string>
   <string name="pref_torrc_summary">ТÐ?Ð?ЬÐ?Ð? Ð?Ð?Я ЭÐ?СÐ?Ð?РТÐ?Ð?: Ñ?нÑ?Ñ?Ñ?Ñ?е наладÑ? наÑ?пÑ?оÑ?Ñ? Ñ? Ñ?адкÑ? Ñ?айла канÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? torrc</string>
   <string name="pref_torrc_dialog">Ð?аÑ?Ñ?Ñ?Ñ?алÑ?нÑ?Ñ?кÑ? Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - дадаÑ?ак Benetech дакÑ?менÑ?аÑ?Ñ?Ñ? па пÑ?аваÑ? Ñ?алавека</string>
-  <string name="your_tor_public_ips_">Ð?аÑ?Ñ? пÑ?блÑ?Ñ?нÑ?Ñ? IP-адÑ?аÑ?Ñ? Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?алÑ? лаÑ?ка, адклÑ?Ñ?Ñ?Ñ?е гÑ?Ñ?Ñ? пÑ?агÑ?амÑ? Ñ? Android-&gt;Ð?аладÑ?-&gt;Ð?Ñ?Ñ?кладаннÑ?, калÑ? Ñ? ваÑ? паÑ?Ñ?Ñ?алÑ? пÑ?аблемÑ? з Orbot:</string>
-  <string name="app_conflict">Ð?анÑ?лÑ?кÑ? дадаÑ?каÑ?</string>
-  <string name="pref_transproxy_refresh_title">Ð?Ñ?Ñ?аабнаÑ?ленне пÑ?азÑ?Ñ?Ñ?Ñ?ага пÑ?окÑ?Ñ?</string>
-  <string name="pref_transproxy_refresh_summary">Ð?аÑ?Ñ?оÑ?на Ñ?жÑ?Ñ?Ñ? пÑ?авÑ?лÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ага пÑ?окÑ?Ñ? пÑ?Ñ? змене Ñ?Ñ?анÑ? Ñ?еÑ?кÑ?</string>
-  <string name="pref_transproxy_flush_title">Ð?РЫÐ?УСÐ?Ð?Ð?Ð? Ð?ЫÐ?Ð?Ð?Ð?Ð?Ð?Ð? пÑ?азÑ?Ñ?Ñ?Ñ?ага пÑ?окÑ?Ñ?</string>
-  <string name="pref_transproxy_flush_summary">Ð?аÑ?Ñ?Ñ?нÑ?Ñ?е Ñ?Ñ?Ñ?, каб Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? аÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? Ñ?Ñ?е Ñ?еÑ?кавÑ?Ñ? пÑ?авÑ?лÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ага пÑ?окÑ?Ñ?</string>
-  <string name="transparent_proxy_rules_flushed_">Ð?Ñ?авÑ?лÑ? пÑ?азÑ?Ñ?Ñ?Ñ?ага пÑ?окÑ?Ñ? вÑ?даленÑ?!</string>
-  <string name="you_do_not_have_root_access_enabled">У ваÑ? нÑ?ма root-доÑ?Ñ?Ñ?пÑ?</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?агÑ?Ñ?ма, запаÑ?Ñ?абÑ?еÑ?Ñ?а Ñ?пÑ?нÑ?Ñ?Ñ? Ñ? запÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Orbot наноÑ? длÑ? вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ? змененÑ?Ñ? налад.</string>
-  <string name="menu_vpn">Ð?адаÑ?кÑ?</string>
   <string name="kbps">кбÑ?Ñ?/Ñ?</string>
   <string name="mbps">мбÑ?Ñ?/Ñ?</string>
   <string name="kb">Ð?Ð?</string>
@@ -283,18 +141,14 @@
   <string name="get_bridges_web">СайÑ?</string>
   <string name="activate">Ð?кÑ?Ñ?ваÑ?Ñ?Ñ?</string>
   <string name="apps_mode">VPN-Ñ?Ñ?жÑ?м</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?Ñ? можаÑ?е дазволÑ?Ñ?Ñ? дадаÑ?кам пÑ?аÑ?одзÑ?Ñ?Ñ? пÑ?аз Tor з дапамогай Ñ?бÑ?даванай VPN-Ñ?еÑ?кÑ? Orbot.\n\nÐ?Ñ?Ñ?а не зÑ?обÑ?Ñ?Ñ? ваÑ? ананÑ?мнÑ?м, але гÑ?Ñ?а дапаможа пÑ?айÑ?Ñ?Ñ? пÑ?аз бÑ?андмаÑ?Ñ?Ñ?Ñ?.</string>
   <string name="send_email">Ð?дпÑ?авÑ?Ñ?Ñ? лÑ?Ñ?Ñ?</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ð?Ñ? можаÑ?е аÑ?Ñ?Ñ?маÑ?Ñ? адÑ?аÑ? моÑ?Ñ?а па Ñ?лекÑ?Ñ?оннай поÑ?Ñ?е, з Ñ?айÑ?а Ñ?Ñ? Ñ?лÑ?Ñ?ам Ñ?канаваннÑ? QR-кода. Ð?бÑ?Ñ?Ñ?Ñ?е \"Эл. поÑ?Ñ?а\" Ñ?Ñ? \"СайÑ?\" нÑ?жÑ?й, каб запÑ?Ñ?аÑ?Ñ? адÑ?аÑ? моÑ?Ñ?а.\n\nÐ?Ñ?Ñ?Ñ?манÑ? адÑ?аÑ? Ñ?капÑ?Ñ?йÑ?е Ñ? Ñ?Ñ?Ñ?аÑ?Ñ?е Ñ?го Ñ? падзеле налад Orbot \"Ð?аÑ?Ñ?Ñ?\", паÑ?лÑ? Ñ?аго пеÑ?азапÑ?Ñ?Ñ?Ñ?Ñ?е дадаÑ?ак.</string>
   <string name="install_orweb">УÑ?Ñ?алÑ?ваÑ?Ñ? Orfox</string>
-  <string name="standard_browser">СÑ?андаÑ?Ñ?нÑ? бÑ?аÑ?заÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?Ð?ТÐ?ТÐ?Ð?: на пÑ?Ñ?ладаÑ? Intel X86/Atom пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? Ñ?олÑ?кÑ? Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? маÑ?Ñ?Ñ? Tor</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="ports">Ð?аÑ?Ñ?Ñ?</string>
   <string name="local_port">Ð?акалÑ?нÑ? поÑ?Ñ?</string>
   <string name="onion_port">Onion-поÑ?Ñ?</string>
   <string name="name">Ð?мÑ?</string>
@@ -308,8 +162,6 @@
   <string name="backup_restored">Ð?дноÑ?лена з Ñ?Ñ?зеÑ?вовай копÑ?Ñ?</string>
   <string name="filemanager_not_available">ФайлавÑ? менеджаÑ? недаÑ?Ñ?Ñ?пнÑ?</string>
   <string name="please_grant_permissions_for_external_storage">Ð?айÑ?е дазвол длÑ? доÑ?Ñ?Ñ?пÑ? да вонкавага Ñ?Ñ?овÑ?Ñ?Ñ?а</string>
-  <string name="permission_granted">Ð?азвол аÑ?Ñ?Ñ?манÑ?</string>
-  <string name="permission_denied">Ð?азвол не аÑ?Ñ?Ñ?манÑ?</string>
   <string name="restore_backup">Ð?днавÑ?Ñ?Ñ? з копÑ?Ñ?</string>
   <string name="create_a_backup_first">СпаÑ?аÑ?кÑ? Ñ?Ñ?ваÑ?Ñ?Ñ?е Ñ?Ñ?зеÑ?вовÑ?Ñ? копÑ?Ñ?</string>
   <string name="name_can_t_be_empty">Ð?мÑ? не можа бÑ?Ñ?Ñ? пÑ?Ñ?Ñ?Ñ?м</string>
@@ -343,9 +195,7 @@
   <string name="pref_connection_padding_summary">Ð?аÑ?Ñ?Ñ?дÑ? Ñ?клÑ?Ñ?ае пÑ?акладкÑ? злÑ?Ñ?Ñ?ннÑ? длÑ? абаÑ?онÑ? ад некаÑ?оÑ?Ñ?Ñ? Ñ?оÑ?маÑ? аналÑ?зÑ? Ñ?Ñ?аÑ?Ñ?ка. Ð?вÑ?Ñ?айна: аÑ?Ñ?а</string>
   <string name="pref_reduced_connection_padding">СокÑ?аÑ?Ñ?ннаÑ? пÑ?окладка Ñ?оединениÑ?</string>
   <string name="pref_reduced_connection_padding_summary">Раней заÑ?Ñ?нÑ?е Ñ?Ñ?Ñ?Ñ?анÑ?лÑ?ванÑ?Ñ? злÑ?Ñ?Ñ?ннÑ? Ñ? адпÑ?аÑ?лÑ?е менÑ? пакеÑ?аÑ? запаÑ?неннÑ? длÑ? змÑ?нÑ?Ñ?ннÑ? аб\'Ñ?мÑ? пеÑ?адаÑ?нÑ?Ñ? дадзенÑ?Ñ? Ñ? вÑ?каÑ?Ñ?Ñ?Ñ?аннÑ? баÑ?аÑ?Ñ?Ñ?</string>
-  <string name="please_enable_vpn">УклÑ?Ñ?Ñ?Ñ?е Ñ?Ñ?жÑ?м VPN, каб дадаÑ?кÑ? маглÑ? вÑ?каÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ? Tor</string>
   <string name="app_shortcuts">Ð?адаÑ?кÑ? з падÑ?Ñ?Ñ?мкай Tor</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
   <string name="testing_bridges">ТÑ?Ñ?Ñ?аванне злÑ?Ñ?Ñ?ннÑ? з Tor пÑ?аз моÑ?Ñ?â?¦</string>
   <string name="testing_bridges_success">Ð?аÑ?пÑ?Ñ?ова! Ð?оÑ?Ñ? наладжанÑ? пÑ?авÑ?лÑ?на.</string>
   <string name="testing_bridges_fail">Ð?ЯÐ?Ð?Ð?Ð?Ð?. Ð?аÑ?пÑ?абÑ?йÑ?е Ñ?нÑ?Ñ? ваÑ?Ñ?Ñ?нÑ?.</string>
diff --git a/app/src/main/res/values-bg/poestrings.xml b/app/src/main/res/values-bg/poestrings.xml
index 66d16dcc..ef3a781b 100644
--- a/app/src/main/res/values-bg/poestrings.xml
+++ b/app/src/main/res/values-bg/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Ð?оÑ?Ñ?овеÑ?е Ñ?а ТоÑ? пÑ?епÑ?аÑ?аÑ?и, коиÑ?о помагаÑ? за пÑ?еодолÑ?ванеÑ?о на Ñ?ензÑ?Ñ?а. Ð?оже да пÑ?обваÑ?е \"Ð?оÑ?Ñ?ове\" ако ТоÑ? е блокиÑ?ан оÑ? Ð?аÑ?иÑ? инÑ?еÑ?неÑ? доÑ?Ñ?авÑ?ик; вÑ?еки вид моÑ?Ñ? използва Ñ?азлиÑ?ен меÑ?од
-за заобикалÑ?не на Ñ?ензÑ?Ñ?аÑ?а: ако един Ñ?ип не Ñ?абоÑ?и, опиÑ?айÑ?е дÑ?Ñ?г.</string>
-
-    <string name="bridges_no">Ð?Ñ?ма Ð?оÑ?Ñ?ове: Ð?иÑ?екÑ?но Ñ?вÑ?Ñ?зване Ñ? ТоÑ?</string>
-    <string name="bridges_provided">Ð?Ñ?игÑ?Ñ?ени Ð?оÑ?Ñ?ове:</string>
-    <string name="bridges_custom">Ð?еÑ?Ñ?онализиÑ?ани Ð?оÑ?Ñ?ове</string>
-
-    <string name="bridges_config">Ð?онÑ?игÑ?Ñ?аÑ?иÑ? на Ð?оÑ?Ñ?ове</string>
-    <string name="action_done">СвÑ?Ñ?Ñ?ено</string>
 
     <string name="bridges_sometimes">Ð?онÑ?кога Ñ?е нÑ?ждаеÑ?е оÑ? моÑ?Ñ?, за да Ñ?Ñ?игнеÑ?е до ТоÑ?.</string>
     <string name="action_more">РазкажеÑ?е ми повеÑ?е</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">Това нÑ?ма да Ð?и напÑ?ави анонимни, но Ñ?е помогне да минеÑ?е пÑ?ез заÑ?иÑ?ни Ñ?Ñ?ени.</string>
     <string name="action_vpn_choose">Ð?збеÑ?еÑ?е пÑ?огÑ?ами</string>
 
-    <string name="status_connected">СвÑ?Ñ?зан !</string>
-
-    <string name="loading_claim_1">Ð?аÑ?аÑ?а Ñ?азнообÑ?азна обÑ?ноÑ?Ñ? е Ñ?ова, коеÑ?о пÑ?ави ТоÑ? Ñ?Ñ?Ñ?аÑ?оÑ?ен!</string>
-    <string name="loading_claim_2">Ð?Ñ?екидневниÑ?е Ñ?оÑ?а използваÑ? ТоÑ?, за да не бÑ?даÑ? поÑ?ледвани оÑ? маÑ?кеÑ?ингови Ñ?еклами.</string>
-    <string name="loading_claim_3">Ð?огаÑ?о Facebook е блокиÑ?ан, Ñ?оÑ?аÑ?а използваÑ? Tor за да Ñ?е Ñ?вÑ?Ñ?жаÑ? Ñ? пÑ?иÑ?Ñ?елиÑ?е и Ñ?емейÑ?Ñ?воÑ?о Ñ?и.</string>
-    <string name="loading_claim_4">Ð?кÑ?ивиÑ?Ñ?иÑ?е използваÑ? ТоÑ?, за да Ñ?азкажаÑ? Ñ?вободно Ñ?воиÑ?е мнениÑ? и вÑ?Ñ?ваниÑ?.</string>
-    <string name="loading_claim_5">Ð?логеÑ?иÑ?е използваÑ? ТоÑ?, за да Ñ?Ñ?беÑ?аÑ? Ñ?оÑ?а кÑ?м Ñ?оÑ?иални Ñ?еÑ?оÑ?ми.</string>
-    <string name="loading_claim_6">Ð?Ñ?Ñ?налиÑ?Ñ?иÑ?е използваÑ? ТоÑ?, за да Ñ?азÑ?ледваÑ? надеждно иÑ?Ñ?оÑ?ииÑ?е вÑ?Ñ?Ñ?Ñ? коиÑ?о Ñ?абоÑ?Ñ?Ñ?.</string>
-    <string name="loading_claim_7">Ð?изнеÑ?мениÑ?е използваÑ? ТоÑ?, за да запазÑ?Ñ? Ñ?еÑ?ниÑ?е Ñ?Ñ?Ñ?аÑ?егии повеÑ?иÑ?елни.</string>
-    <string name="loading_claim_8">РабоÑ?ниÑ?и използваÑ? ТоÑ?, за боÑ?ба за Ñ?пÑ?аведливоÑ?Ñ?, без да Ñ?е Ñ?Ñ?Ñ?аÑ?Ñ?ваÑ? Ñ?е Ñ?е загÑ?бÑ?Ñ? Ñ?абоÑ?аÑ?а Ñ?и.</string>
-
-    <string name="status_connecting">Ð?ие Ð?и Ñ?вÑ?Ñ?зваме.\" = \"Ð?ие Ð?и Ñ?вÑ?Ñ?зваме.</string>
-
     <string name="hello">Ð?дÑ?авейÑ?е</string>
     <string name="welcome">Ð?обÑ?е доÑ?ли в ТоÑ? за мобилни Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва.</string>
 
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index f10af819..d96afb17 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2,134 +2,45 @@
 <resources>
   <string name="app_name">Ð?Ñ?боÑ?</string>
   <string name="app_description">Orbot е безплаÑ?на пÑ?окÑ?и пÑ?огÑ?ама, коÑ?Ñ?о дава вÑ?зможноÑ?Ñ?а на дÑ?Ñ?ги пÑ?огÑ?ами да използваÑ? инÑ?еÑ?енÑ? по-Ñ?игÑ?Ñ?но. Orbot използва Tor, за да кÑ?ипÑ?иÑ?а Ð?нÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ика и Ñ?лед Ñ?ова го Ñ?кÑ?ива каÑ?о пÑ?епÑ?аÑ?а пÑ?ез нÑ?колко компÑ?Ñ?Ñ?Ñ?а по Ñ?елиÑ? Ñ?вÑ?Ñ?. Tor е безплаÑ?ен Ñ?оÑ?Ñ?Ñ?еÑ? и оÑ?воÑ?ена мÑ?ежа, коÑ?Ñ?о Ñ?и помага да Ñ?е пÑ?едпазиÑ? оÑ? Ñ?пиониÑ?ане по мÑ?ежаÑ?а, коеÑ?о заплаÑ?ва Ñ?воÑ?Ñ?а Ñ?вобода и лиÑ?но пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во, конÑ?иденÑ?иални бизнеÑ? оÑ?ноÑ?ение и вÑ?Ñ?зки, и оÑ? вид пÑ?авиÑ?елÑ?Ñ?вено Ñ?ледене наÑ?еÑ?ено Ñ?Ñ?аÑ?ик анализ.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ñ?Ñ?аÑ?Ñ?иÑ?ай и Ñ?Ñ?опиÑ?ай ТоÑ?</string>
-  <string name="tor_proxy_service_process">Tor пÑ?окÑ?и</string>
-  <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?Ñ?аÑ?Ñ?иÑ?а...</string>
+    <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?Ñ?аÑ?Ñ?иÑ?а...</string>
   <string name="status_activated">СвÑ?Ñ?зан кÑ?м ТоÑ? мÑ?ежаÑ?а</string>
   <string name="status_disabled">Ð?Ñ?боÑ? е деакÑ?ивиÑ?ан</string>
   <string name="status_shutting_down">TorService Ñ?пиÑ?а</string>
   <string name="tor_process_starting">СÑ?аÑ?Ñ?иÑ?ане на ТоÑ? клиенÑ?...</string>
   <string name="tor_process_complete">завÑ?Ñ?Ñ?ено.</string>
-  <string name="tor_process_waiting">изÑ?акване.</string>
-  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: ТÑ?аÑ?икÑ?Ñ? Ð?и не е анонимен! Ð?олÑ? конÑ?игÑ?Ñ?иÑ?айÑ?е пÑ?иложениÑ?Ñ?а Ñ?и да използваÑ? HTTP proxy 127.0.0.1:8118 или SOCKS4A или SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?аÑ?ало</string>
-  <string name="menu_browse">Ð?Ñ?елиÑ?Ñ?и</string>
-  <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
+    <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
   <string name="menu_log">Ð?ог</string>
-  <string name="menu_info">Ð?омоÑ?</string>
-  <string name="menu_start">СÑ?аÑ?Ñ?</string>
+    <string name="menu_start">СÑ?аÑ?Ñ?</string>
   <string name="menu_stop">СÑ?оп</string>
   <string name="menu_about">Ð?Ñ?ноÑ?но</string>
-  <string name="menu_promo_apps">Ð?зÑ?егли пÑ?иложениÑ?...</string>
-  <string name="main_layout_download">Ð?зÑ?егли</string>
+    <string name="main_layout_download">Ð?зÑ?егли</string>
   <string name="main_layout_upload">Ð?аÑ?и</string>
-  <string name="button_help">Ð?омоÑ?</string>
-  <string name="button_close">Ð?аÑ?воÑ?и</string>
-  <string name="button_about">Ð?Ñ?ноÑ?но</string>
-  <string name="button_clear_log">Ð?зÑ?иÑ?Ñ?и лог</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Ð?зÑ?од</string>
+    <string name="button_about">Ð?Ñ?ноÑ?но</string>
+    <string name="menu_exit">Ð?зÑ?од</string>
   <string name="menu_scan">СканиÑ?ай BridgeQR</string>
   <string name="menu_share_bridge">Сподели BridgeQR</string>
-  <string name="press_to_start">- за Ñ?Ñ?аÑ?Ñ? наÑ?иÑ?ни и задÑ?Ñ?ж -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и (Ð?зиÑ?ква Root)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?но пÑ?екаÑ?ване на пÑ?иложениÑ?Ñ?а пÑ?ез ТоÑ?</string>
-  <string name="pref_transparent_all_title">Ð?Ñ?иÑ?ко пÑ?ез ТоÑ?</string>
-  <string name="pref_transparent_all_summary">Ð?Ñ?еÑ?вÑ?Ñ?лÑ?й пÑ?ез ТоÑ? Ñ?Ñ?аÑ?ика на вÑ?иÑ?ки пÑ?иложениÑ?</string>
-  <string name="pref_transparent_port_fallback_title">ТоÑ? пÑ?окÑ?и Ñ?Ñ?лÑ?гаÑ?а Ñ?мени поÑ?Ñ?а</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аобикалÑ? Ñ?Ñ?андаÑ?Ñ?ниÑ?е поÑ?Ñ?ове(80, 443, Ñ?.н.). *Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? СÐ?Ð?Ð?* ако Ñ?ежимиеÑ?е \'Ð?Ñ?иÑ?ки\' или \'Ð?Ñ?огÑ?ама\' не Ñ?абоÑ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпиÑ?Ñ?к поÑ?Ñ?ове</string>
-  <string name="pref_transparent_port_summary">СпиÑ?Ñ?к Ñ? поÑ?Ñ?овеÑ?е, на коиÑ?о да Ñ?е ползва пÑ?окÑ?и. *Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? СÐ?Ð?Ð?* ако Ñ?ежимиеÑ?е \'Ð?Ñ?иÑ?ки\' или \'Ð?Ñ?огÑ?ама\' не Ñ?абоÑ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?Ñ?веди поÑ?Ñ?ове на пÑ?окÑ?и</string>
-  <string name="pref_has_root">Ð?зиÑ?квай Root доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?зиÑ?квай root доÑ?Ñ?Ñ?п за пÑ?озÑ?аÑ?но пÑ?окÑ?и</string>
-  <string name="status_install_success">ТоÑ? е Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ан!</string>
-  <string name="status_install_fail">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не Ñ?а инÑ?Ñ?алиÑ?ани. Ð?олÑ? пÑ?овеÑ?еÑ?е лога и Ñ?ведомеÑ?е tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?еÑ?ка в пÑ?иложениеÑ?о</string>
-  <string name="wizard_title">Ð?Ñ?боÑ?</string>
-  <string name="wizard_btn_tell_me_more">Ð?Ñ?ноÑ?но Ð?Ñ?боÑ?</string>
-  <string name="btn_next">СледваÑ?</string>
-  <string name="btn_back">Ð?бÑ?аÑ?но</string>
-  <string name="btn_finish">Ð?Ñ?ай</string>
-  <string name="btn_okay">Ð?Ð?</string>
+    <string name="btn_okay">Ð?Ð?</string>
   <string name="btn_cancel">Ð?Ñ?кажи</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ð?Ñ?кои Ð?Ñ?боÑ? деÑ?айли</string>
-  <string name="wizard_permissions_root">Ð?Ñ?аваÑ?а дадени</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?аÑ?Ñ?коÑ?ме, Ñ?е имаÑ?е root пÑ?ава доÑ?Ñ?Ñ?пни за Ð?Ñ?боÑ?. Ще използваме Ñ?ази Ñ?ила Ñ?азÑ?мно.</string>
-  <string name="wizard_permissions_msg_stock"> Ð?Ñ?пÑ?еки Ñ?е не е задÑ?лжиÑ?елно, Ð?Ñ?боÑ? може да Ñ?Ñ?ане по-моÑ?но пÑ?иложение ако има root доÑ?Ñ?Ñ?п. Ð?зползвайÑ?е бÑ?Ñ?она долÑ? за да дадеÑ?е на Ð?Ñ?боÑ? Ñ?Ñ?пеÑ?Ñ?или!</string>
-  <string name="wizard_permissions_no_root">Ð?ко нÑ?маÑ?е root доÑ?Ñ?Ñ?п или не знаеÑ?е за какво Ñ?Ñ?ава вÑ?пÑ?оÑ?, пÑ?оÑ?Ñ?о използвайÑ?е пÑ?иложениÑ? напÑ?авени да Ñ?абоÑ?Ñ?Ñ? Ñ? Ð?Ñ?боÑ?.</string>
-  <string name="wizard_permissions_consent">РазбиÑ?ам и иÑ?кам да пÑ?одÑ?лжа без СÑ?пеÑ?поÑ?Ñ?ебиÑ?ел</string>
-  <string name="wizard_permission_enable_root">РазÑ?еÑ?и Root за Ð?Ñ?боÑ?</string>
-  <string name="wizard_configure">Ð?аÑ?Ñ?Ñ?ой ТоÑ?иÑ?икаÑ?иÑ?Ñ?а</string>
-  <string name="wizard_configure_msg">Ð?Ñ?боÑ? Ð?и дава вÑ?зможноÑ?Ñ? да пÑ?екаÑ?аÑ?е вÑ?иÑ?киÑ? Ñ?Ñ?аÑ?ик пÑ?ез ТоÑ? или да избеÑ?еÑ?е пÑ?иложениÑ? по оÑ?делно.</string>
-  <string name="wizard_configure_all">Ð?Ñ?екаÑ?ай вÑ?иÑ?ки пÑ?иложениÑ? пÑ?ез ТоÑ?</string>
-  <string name="wizard_configure_select_apps">Ð?збеÑ?и оÑ?делни пÑ?иложениÑ? за ТоÑ?</string>
-  <string name="wizard_tips_tricks">Ð?оддÑ?Ñ?жани оÑ? Ð?Ñ?боÑ? пÑ?иложениÑ?</string>
-  <string name="wizard_tips_msg">Ð?Ñ?иложениÑ?Ñ?а по-долÑ? Ñ?а Ñ?Ñ?здадени Ñ?ака, Ñ?е да Ñ?абоÑ?Ñ?Ñ? Ñ? Ð?Ñ?боÑ?. ЦÑ?кни на вÑ?еки бÑ?Ñ?он, за да инÑ?Ñ?алиÑ?аÑ? Ñ?ега или може да ги намеÑ?иÑ? по-кÑ?Ñ?но в Ð?ндÑ?оид маÑ?кеÑ?.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?Ñ?ипÑ?иÑ?ан Ñ?аÑ? пÑ?огÑ?ама за Ð?ндÑ?оид</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Ð?аÑ?Ñ?еÑ?е как да конÑ?игÑ?Ñ?иÑ?аÑ?е пÑ?иложениÑ? да Ñ?абоÑ?Ñ?Ñ? пÑ?ез Ð?Ñ?боÑ?</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ТÑ?Ñ?Ñ?аÑ?ка</string>
-  <string name="wizard_tips_twitter">Ð?аглаÑ?еÑ?е пÑ?окÑ?иÑ?о на Twitter на \"localhost\" и поÑ?Ñ? 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - СÑ?здай иÑ?Ñ?оÑ?иÑ? и оÑ?Ñ?ави Ñ?игÑ?Ñ?ноÑ?Ñ?а на tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?Ñ?окÑ?и наÑ?Ñ?Ñ?ойки</string>
-  <string name="wizard_proxy_help_msg">Ð?ко Ð?ндÑ?оид пÑ?иложениеÑ?о, коеÑ?о използваÑ? поддÑ?Ñ?жа HTTP или SOCKS пÑ?окÑ?и, Ñ?огава мжоеÑ? да го конÑ?игÑ?Ñ?иÑ?аÑ? да Ñ?е Ñ?вÑ?Ñ?зва Ñ? Orbot и да използва Tor.\n\n\nÐ?аÑ?Ñ?ойкиÑ?е Ñ?а host 127.0.0.1 или \"localhost\". Ð?а HTTP, поÑ?Ñ?Ñ?Ñ? е 8118. Ð?а SOCKS пÑ?окÑ?иÑ?о е 9050. Ð?ай-добÑ?е е по вÑ?зможноÑ?Ñ? да Ñ?е използва SOCKS4A или SOCKS5.\n\n\n\nÐ?ожеÑ? да наÑ?Ñ?иÑ? повеÑ?е за пÑ?окÑ?иÑ?аÑ?а в Ð?ндÑ?оид пÑ?ез Ñ?Ñ?Ñ?анÑ?иÑ?а Ñ? вÑ?пÑ?оÑ?и и оÑ?говоÑ?и: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Ð?Ñ?боÑ? е гоÑ?ов!</string>
-  <string name="wizard_final_msg">Ð?илиони Ñ?оÑ?а по Ñ?веÑ?а използваÑ? Tor по голÑ?м бÑ?ой пÑ?иÑ?ини.\n\nÐ?Ñ?Ñ?налиÑ?Ñ?и и блогÑ?Ñ?и, заÑ?иÑ?ниÑ?и на Ñ?овеÑ?киÑ?е пÑ?ава, оÑ?ганиÑ?е на Ñ?еда, войниÑ?и, коÑ?поÑ?аÑ?ии, гÑ?аждани на дÑ?Ñ?жави Ñ? Ñ?епÑ?еÑ?ивни Ñ?ежими, и най-обикновени гÑ?аждани... а Ñ?ега и Ñ?и!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?олÑ?, наÑ?Ñ?Ñ?ой Orbot пÑ?еди да поÑ?неÑ? да го използваÑ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">УÑ?пеÑ?н Ñ?е Ñ?вÑ?Ñ?заÑ?Ñ?е Ñ? Tor мÑ?ежаÑ?а - Ñ?ова Ð?Ð? знаÑ?и, Ñ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ð?и е пÑ?едпазено. Ð?оже да използваÑ?е \'Ð?Ñ?аÑ?зÑ?Ñ?\' бÑ?Ñ?она да Ñ?еÑ?Ñ?ваÑ?е вÑ?Ñ?зкаÑ?а. \n\nÐ?Ñ?идеÑ?е на https://guardianproject.info/apps/orbot или изпÑ?аÑ?еÑ?е имейл на help@xxxxxxxxxxxxxxxxxxxx, за да наÑ?Ñ?иÑ?е повеÑ?е.</string>
-  <string name="tor_check">Това Ñ?е Ñ?е заведе на https://check.torproject.org, за да пÑ?овеÑ?и дали Orbot е пÑ?авилно наÑ?Ñ?Ñ?оен и дали Ñ?и Ñ?вÑ?Ñ?зан Ñ? TоÑ?.</string>
-  <string name="pref_hs_group">СкÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="pref_general_group">Ð?лавни</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-->
-  <string name="wizard_title_msg">Ð?Ñ?боÑ? дава доÑ?Ñ?Ñ?п до Tor пÑ?ез Android!\n\nTor Ñ?и помага да Ñ?е пÑ?едпазиÑ? оÑ? Ñ?илÑ?Ñ?иÑ?ане на инÑ?еÑ?неÑ?Ñ?Ñ?, анализ на Ñ?Ñ?аÑ?ика и подÑ?лÑ?Ñ?ване по инÑ?еÑ?неÑ? вÑ?иÑ?ки, оÑ? коиÑ?о заплаÑ?ваÑ? лиÑ?ноÑ?о Ñ?и пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во, конÑ?иденÑ?иалнаÑ?а Ñ?и инÑ?оÑ?маÑ?иÑ? и лиÑ?ниÑ?е Ñ?и вÑ?Ñ?зки.\n\nТози Ñ?Ñ?Ñ?пка по Ñ?Ñ?Ñ?пка наÑ?Ñ?Ñ?ни Ñ?е Ñ?и помогне да наÑ?Ñ?Ñ?оиÑ? Orbot и Tor на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?нимание</string>
-  <string name="wizard_warning_msg">СамоÑ?о инÑ?Ñ?алиÑ?ане на Orbot нÑ?ма авÑ?омаÑ?иÑ?но да анонимизиÑ?а мобилниÑ? Ñ?и Ñ?Ñ?аÑ?ик.\n\nТÑ?Ñ?бва да наÑ?Ñ?Ñ?оиÑ? Orbot, Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и и дÑ?Ñ?ги пÑ?иложениÑ?, за да ползваÑ? Tor Ñ?Ñ?пеÑ?но.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?Ñ?ава</string>
-  <string name="wizard_permissions_root_msg1">Ð?ко желаеÑ? може да Ñ?азÑ?еÑ?иÑ? на Orbot \'Superuser\' пÑ?ава, за да вклÑ?Ñ?иÑ? допÑ?лниÑ?елни Ñ?Ñ?нкиÑ?ии, каÑ?о Ð?Ñ?озÑ?аÑ?но Ð?Ñ?окÑ?иÑ?иÑ?иÑ?ане.</string>
-  <string name="wizard_permissions_root_msg2">Ð?ко не желаеÑ? Ñ?ова Ñ?е Ñ?веÑ?и, Ñ?е пÑ?огÑ?амиÑ?е, коиÑ?о Ñ?е използваÑ? Ñ?а Ñ?Ñ?вмеÑ?Ñ?ими Ñ? Orbot </string>
-  <string name="wizard_permissions_no_root_msg">УÑ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и не изглежда да има или пÑ?едлага root или Ñ?ака наÑ?еÑ?ениÑ? \'СÑ?пеÑ?поÑ?Ñ?ебиÑ?елÑ?ки\' доÑ?Ñ?Ñ?п.\n\nÐ?олÑ?, използвай Ñ?ежидÑ?мÑ?Ñ? \'Ð?Ñ?иложениÑ?\' на главниÑ? екÑ?ан.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?Ñ?иложениÑ? пÑ?ез Ð?Ñ?боÑ?</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ð?Ñ?ипÑ?иÑ?ана Ñ?аÑ? пÑ?огÑ?ама Ñ? подÑ?Ñ?жка на Off-the-Record енкÑ?ипÑ?иÑ?.</string>
-  <string name="wizard_tips_orweb">Orfox: Ð?Ñ?аÑ?зÑ?Ñ? Ñ? наÑ?оÑ?еноÑ?Ñ? кÑ?м оÑ?игÑ?Ñ?Ñ?ване на лиÑ?ноÑ?о пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во, койÑ?о Ñ?абоÑ?и пÑ?ез Tor</string>
-  <string name="wizard_tips_play">Ð?амеÑ?и вÑ?ики Guardin Project пÑ?огÑ?ами в Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?амеÑ?и вÑ?иÑ?ки пÑ?иложениÑ? на Guardian Project в F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?амеÑ?и вÑ?иÑ?ки Guardian Project пÑ?иложениÑ? на https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и</string>
-  <string name="wizard_transproxy_msg">Това позволÑ?ва на пÑ?иложениÑ?Ñ?а Ð?и авÑ?омаÑ?иÑ?но да използваÑ? мÑ?ежаÑ?а на ТоÑ? без никаква конÑ?игÑ?Ñ?аÑ?иÑ?.</string>
-  <string name="wizard_transproxy_hint">(Ð?збеÑ?и Ñ?ази опÑ?иÑ? ако нÑ?маÑ? пÑ?едÑ?Ñ?ава за какво Ñ?Ñ?ава вÑ?пÑ?оÑ?)</string>
-  <string name="wizard_transproxy_none">Ð?иÑ?о</string>
-  <string name="pref_transparent_tethering_title">ТеÑ?Ñ?Ñ?инг пÑ?ез ТоÑ?</string>
-  <string name="pref_transparent_tethering_summary">Ð?клÑ?Ñ?и Ð?Ñ?озÑ?аÑ?но ТоÑ? Ð?Ñ?окÑ?иÑ?иÑ?иÑ?ане пÑ?ез Wifi и USB (изиÑ?ква Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?ване)</string>
-  <string name="button_grant_superuser">Ð?зиÑ?кай доÑ?Ñ?Ñ?п на СÑ?пеÑ?поÑ?Ñ?ебиÑ?ел</string>
-  <string name="pref_select_apps">Ð?збеÑ?и пÑ?иложениÑ?</string>
-  <string name="pref_select_apps_summary">Ð?збÑ?еÑ?и пÑ?иложениÑ? за използване пÑ?ез ТоÑ?</string>
-  <string name="pref_node_configuration">Ð?аÑ?Ñ?Ñ?ойки на node-а</string>
+    <!--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="button_proxy_all">Ð?Ñ?окÑ?и за вÑ?иÑ?ки</string>
-  <string name="button_proxy_none">Ð?Ñ?окÑ?и за ниÑ?о една</string>
-  <string name="button_invert_selection">Ð?бÑ?Ñ?ни Ñ?елекÑ?иÑ?Ñ?а</string>
-  <string name="pref_proxy_title">Ð?зÑ?одÑ?Ñ?о Ð?Ñ?ежово Ð?Ñ?окÑ?и (Ð?езадÑ?лжиÑ?елно)</string>
+    <string name="pref_proxy_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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">Ð?зÑ?одÑ?Ñ?а Ð?Ñ?окÑ?и Ð?аÑ?ола</string>
   <string name="pref_proxy_password_summary">Ð?Ñ?окÑ?и Ð?аÑ?ола (Ð?езадÑ?лжиÑ?елно)</string>
   <string name="pref_proxy_password_dialog">Ð?Ñ?веди Ð?Ñ?окÑ?и Ð?аÑ?ола</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на напÑ?лно пÑ?озÑ?аÑ?но пÑ?окÑ?и...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?окÑ?и на база пÑ?иложение...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и Ð?Ð?ТÐ?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy е вклÑ?Ñ?ен за ТеÑ?Ñ?Ñ?инг!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: гÑ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?оÑ?ки!</string>
-  <string name="transproxy_rules_cleared">TransProxy пÑ?авила изÑ?иÑ?Ñ?ени</string>
-  <string name="couldn_t_start_tor_process_">Ð?еÑ?Ñ?пеÑ?но Ñ?Ñ?аÑ?Ñ?иÑ?ане на ТоÑ? пÑ?оÑ?еÑ?: </string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?абоÑ?и на поÑ?Ñ?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?окÑ?и на база поÑ?Ñ?...</string>
-  <string name="bridge_error">Ð?Ñ?идж гÑ?еÑ?ка</string>
-  <string name="bridge_requires_ip">Ð?а да използваÑ?е бÑ?идж Ñ?Ñ?нкÑ?ионалноÑ?Ñ?Ñ?а Ñ?Ñ?Ñ?бва да вÑ?ведеÑ?е поне един IP адÑ?еÑ? на бÑ?идж.</string>
-  <string name="send_email_for_bridges">Ð?зпÑ?аÑ?и и-мейл до bridges@xxxxxxxxxxxxxx Ñ?Ñ?Ñ? Ñ?Ñ?дÑ?Ñ?жание \"get bridges\" в  и-мейл оÑ? акаÑ?нÑ? в gmail.</string>
-  <string name="error">Ð?Ñ?еÑ?ка</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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Ð?зползвай *Ñ?амо* избÑ?оениÑ?е node-ве</string>
   <string name="bridges">Ð?Ñ?иджове</string>
   <string name="use_bridges">Ð?зползвай Ð?Ñ?иджове</string>
-  <string name="bridges_obfuscated">СкÑ?иÑ?и Ð?оÑ?Ñ?ове</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?клÑ?Ñ?и ако наÑ?Ñ?Ñ?оениÑ?е моÑ?Ñ?ове Ñ?а Ñ?кÑ?иÑ?и моÑ?Ñ?ове</string>
-  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ? и поÑ?Ñ? на бÑ?иджове</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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пни поÑ?Ñ?ове</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?ове доÑ?Ñ?Ñ?пни зад firewall Ñ? Ñ?еÑ?Ñ?Ñ?икÑ?ивни полиÑ?ики</string>
   <string name="enter_ports">Ð?Ñ?веди поÑ?Ñ?ове</string>
-  <string name="enable_hidden_services">Ð?клÑ?Ñ?и Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="run_servers_accessible_via_the_tor_network">Ñ?Ñ?аÑ?Ñ?иÑ?ай Ñ?Ñ?Ñ?вÑ?Ñ?и доÑ?Ñ?Ñ?пни пÑ?ез ТоÑ? мÑ?ежаÑ?а</string>
-  <string name="enter_localhost_ports_for_hidden_services">вÑ?веди локални поÑ?Ñ?ове за Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?ове на Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ð?вÑ?омаÑ?иÑ?но генеÑ?иÑ?ан адÑ?еÑ? за Ñ?воÑ?Ñ?а Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га(hidden service)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">вклÑ?Ñ?и запиÑ? на дебÑ?г доклади (Ñ?Ñ?Ñ?бва да ползваÑ?е aLogCat или adb, за да ги Ñ?азглеждаÑ?)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">вклÑ?Ñ?и запиÑ? на дебÑ?г доклади (Ñ?Ñ?Ñ?бва да ползваÑ?е aLogCat или adb, за да ги Ñ?азглеждаÑ?)</string>
   <string name="project_home">Ð?аÑ?ални СÑ?аниÑ?и на Ð?Ñ?оекÑ?иÑ?е:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">ТоÑ? лиÑ?енз</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">СоÑ?Ñ?Ñ?еÑ? на Ñ?Ñ?еÑ?и Ñ?Ñ?Ñ?ани: </string>
+    <string name="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="hidden_service_on">СкÑ?иÑ?а Ñ?Ñ?лÑ?га вклÑ?Ñ?ена:</string>
-  <string name="unable_to_read_hidden_service_name">не може да пÑ?оÑ?еÑ?е име на Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га</string>
+    <string name="unable_to_read_hidden_service_name">не може да пÑ?оÑ?еÑ?е име на Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га</string>
   <string name="unable_to_start_tor">Ð?е може да Ñ?Ñ?аÑ?Ñ?иÑ?а ТоÑ?:</string>
-  <string name="unable_to_reset_tor">РеÑ?Ñ?аÑ?Ñ?иÑ?ай Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и, неÑ?Ñ?пеÑ?но Ñ?еÑ?Ñ?аÑ?иване на Tor!</string>
-  <string name="pref_use_sys_iptables_title">Ð?зползвай Iptables по подÑ?азбиÑ?ане</string>
-  <string name="pref_use_sys_iptables_summary">използвай вгÑ?адениÑ?е двÑ?иÑ?ни iptables вмеÑ?Ñ?о Ñ?ези идваÑ?и Ñ? Orbot</string>
-  <string name="error_installing_binares">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не бÑ?Ñ?а инÑ?Ñ?алиÑ?ани или обновени.</string>
-  <string name="pref_use_persistent_notifications">Ð?инаги показвай икона в Ñ?Ñ?лбаÑ?а когаÑ?о Ð?Ñ?боÑ? е Ñ?вÑ?Ñ?зан</string>
+    <string name="pref_use_persistent_notifications">Ð?инаги показвай икона в Ñ?Ñ?лбаÑ?а когаÑ?о Ð?Ñ?боÑ? е Ñ?вÑ?Ñ?зан</string>
   <string name="pref_use_persistent_notifications_title">УведомлениÑ? винаги вклÑ?Ñ?ени</string>
   <string name="pref_use_expanded_notifications">Ð?окажи Ñ?азÑ?иÑ?ена инÑ?оÑ?маÑ?иÑ? за Tor изÑ?однаÑ?а дÑ?Ñ?жава и IP в ленÑ?аÑ?а за извеÑ?Ñ?иÑ?</string>
   <string name="pref_use_expanded_notifications_title">РазÑ?иÑ?ени извеÑ?Ñ?иÑ?</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?ове вклÑ?Ñ?ени!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ð?зик</string>
-  <string name="set_locale_summary">Ð?збеÑ?и меÑ?Ñ?оположение и език за Ð?Ñ?боÑ?</string>
-  <string name="wizard_locale_title">Ð?збеÑ?и език</string>
-  <string name="wizard_locale_msg">Ð?Ñ?Ñ?ави по подÑ?азбиÑ?ане или Ñ?мени налиÑ?ниÑ? език</string>
-  <string name="powered_by">базиÑ?ан на Tor</string>
-  <string name="btn_save_settings">Ð?апази наÑ?Ñ?Ñ?ойки</string>
-  <string name="no_internet_connection_tor">Ð?Ñ?ма инÑ?еÑ?неÑ? вÑ?Ñ?зка; Tor е в Ñ?ежим на изÑ?акване...</string>
-  <string name="bandwidth_">СкоÑ?оÑ?Ñ?:</string>
-  <string name="down">Ñ?еглене</string>
-  <string name="up">изпÑ?аÑ?ане</string>
-  <string name="pref_disable_network_title">Ð?иÑ?пва Ð?вÑ?омаÑ?иÑ?ен Режим на Ð?зÑ?акване</string>
+    <string name="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="menu_verify_browser">Ð?Ñ?аÑ?зÑ?Ñ?</string>
-  <string name="menu_use_chatsecure">Ð?зползвай ChatSecure</string>
-  <string name="permission_manage_tor_label">Ð?аÑ?Ñ?Ñ?ой Tor</string>
-  <string name="permission_manage_tor_description">РазÑ?еÑ?и Ñ?ази пÑ?огÑ?ама да конÑ?Ñ?олиÑ?а Tor</string>
-  <string name="install_apps_">Ð?нÑ?Ñ?алиÑ?ане на бÑ?аÑ?зÑ?Ñ??</string>
+    <string name="install_apps_">Ð?нÑ?Ñ?алиÑ?ане на бÑ?аÑ?зÑ?Ñ??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?Ñ?ма инÑ?еÑ?неÑ? вÑ?Ñ?зка. Ð?Ñ?еминаване в Ñ?ежим на изÑ?каване...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Ð?обÑ?а инÑ?еÑ?неÑ? вÑ?Ñ?зка. СÑ?бÑ?ждане на Tor...</string>
   <string name="updating_settings_in_tor_service">обновÑ?ване на наÑ?Ñ?Ñ?ойкиÑ?е в Tor Ñ?Ñ?лÑ?гаÑ?а</string>
@@ -251,19 +122,7 @@
   <string name="pref_torrc_title">Torrc Custom Config</string>
   <string name="pref_torrc_summary">СÐ?Ð?Ð? Ð?Ð? Ð?Ð?СÐ?Ð?РТÐ?: вÑ?веди диÑ?екÑ?но torrc конÑ?игÑ?Ñ?аÑ?ионниÑ?Ñ? код</string>
   <string name="pref_torrc_dialog">РÑ?Ñ?но наÑ?Ñ?Ñ?оен Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">ТвоиÑ?е пÑ?блиÑ?ни Tor IP-Ñ?а:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?олÑ?, забÑ?ани Ñ?ази пÑ?огÑ?ама в  Android-&gt;Ð?аÑ?Ñ?Ñ?ойки-&gt;Ð?Ñ?иложениÑ? ако имаÑ? пÑ?облеми Ñ? Orbot:</string>
-  <string name="app_conflict">Ð?онÑ?ликÑ? Ñ? дÑ?Ñ?го пÑ?иложение</string>
-  <string name="pref_transproxy_refresh_title">ТÑ?анÑ?пÑ?окÑ?и авÑ?омаÑ?иÑ?но оÑ?вежаване</string>
-  <string name="pref_transproxy_refresh_summary">Ð?Ñ?иложи повÑ?оÑ?но Ñ?Ñ?анÑ?пÑ?окÑ?и пÑ?авилаÑ?а пÑ?и пÑ?омÑ?на на Ñ?Ñ?Ñ?Ñ?оÑ?ниеÑ?о на мÑ?ежаÑ?а</string>
-  <string name="pref_transproxy_flush_title">ТÑ?анÑ?пÑ?оÑ?ки Ð?РÐ?Ð?УÐ?Ð?ТÐ?Ð?Ð?Ð? Ð?РÐ?Ð?Ð?Ð¥Ð?Ð?Ð?Ð?</string>
-  <string name="pref_transproxy_flush_summary">Ð?аÑ?иÑ?ни Ñ?Ñ?к, за да изÑ?Ñ?иеÑ? вÑ?иÑ?ки Ñ?Ñ?анÑ?пÑ?кÑ?и мÑ?ежови пÑ?авила Ð?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="transparent_proxy_rules_flushed_">ТÑ?анÑ?пÑ?окÑ?и пÑ?авилаÑ?а изÑ?Ñ?иÑ?и!</string>
-  <string name="you_do_not_have_root_access_enabled">Ð?Ñ?маÑ? ROOT доÑ?Ñ?Ñ?п до Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?оже да Ñ?е наложи да Ñ?пÑ?еÑ? и Ñ?Ñ?аÑ?Ñ?иÑ?аÑ? Orbot, за да могаÑ? нÑ?кои наÑ?Ñ?Ñ?ойки да влÑ?заÑ? в дейÑ?Ñ?вие.</string>
-  <string name="menu_vpn">Ð?Ñ?иложениÑ?</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -277,9 +136,7 @@
   <string name="send_email">Ð?зпÑ?аÑ?и имейл</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ð?ожеÑ? да полÑ?Ñ?иÑ? адÑ?еÑ?а на моÑ?Ñ? по имейл, инÑ?еÑ?неÑ? или каÑ?о Ñ?каниÑ?аÑ? QR kod. Ð?збеÑ?и \'Ð?мейл\' или \'Ð?нÑ?еÑ?неÑ?\' по-долÑ?, за да поиÑ?каÑ? адÑ?еÑ? на моÑ?Ñ?.\n\nÐ?еднÑ?ж Ñ?ом полÑ?Ñ?иÑ? адÑ?еÑ?а го копиÑ?ай в \"Ð?оÑ?Ñ?ове\", в наÑ?Ñ?Ñ?ойкиÑ?е на Orbot и Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?ай пÑ?иложениеÑ?о.</string>
   <string name="install_orweb">Ð?нÑ?Ñ?алиÑ?ай Orfox</string>
-  <string name="standard_browser">Ð?оÑ?мален Ð?Ñ?аÑ?зÑ?Ñ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Само Ñ?Ñ?андаÑ?Ñ?ни Tor моÑ?Ñ?ове Ñ?абоÑ?Ñ? на Intel X86/ATOM Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва</string>
-  <string name="hidden_services">СкÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
+    <string name="hidden_services">СкÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
   <string name="title_activity_hidden_services">СкÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
   <string name="menu_hidden_services">СкÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
   <string name="save">Ð?апази</string>
diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml
index 121cb5a2..e8c7ab54 100644
--- a/app/src/main/res/values-bn-rBD/strings.xml
+++ b/app/src/main/res/values-bn-rBD/strings.xml
@@ -2,68 +2,38 @@
 <resources>
   <string name="app_name">�রব�</string>
   <string name="app_description">Orbot à¦?à¦?à¦?ি ফà§?রি পà§?রà¦?à§?সি à¦?à§?যাপà§?লিà¦?à§?শন যা à¦?নà§?যানà§?য Apps à¦?à§? à¦?রà¦? নিরাপদভাবà§? à¦?নà§?à¦?ারনà§?à¦? বà§?যবহার à¦?রার à¦?à§?ষমতাপà§?রদান à¦?রà§?।  Orbot à¦?পনার à¦?নà§?à¦?ারনà§?à¦? à¦?à§?রাফিà¦? à¦?নà¦?à§?রিপà§?à¦? à¦?রতà§? à¦?র বà§?যবহার à¦?বà¦? তারপর সারা বিশà§?বà§?র à¦?মà§?পিà¦?à¦?ারà§?র সিরিà¦?à§?র moddho diye porichalito kore gopon kore. à¦?র ফà§?রি সফà¦?à¦?য়à§?যার à¦?বà¦? à¦?পনি à¦?à§?রাফিà¦? বিশà§?লà§?ষণ হিসà§?বà§? পরিà¦?িত বà§?যà¦?à§?তিà¦?ত সà§?বাধà§?নতা à¦? à¦?à§?পনà§?য়তা, à¦?à§?পনà§?য় বাণিà¦?à§?যিà¦? à¦?ারà§?যà¦?à§?রম à¦?বà¦? সমà§?পরà§?à¦?, à¦?বà¦? রà¦
 ¾à¦·à§?à¦?à§?রà§?য় নিরাপতà§?তা হà§?মà¦?ির মà§?à¦?à§? পড়à§? নà§?à¦?à¦?য়ারà§?à¦? নà¦?রদারি à¦?à¦?à¦?ি ফরà§?ম বিরà§?দà§?ধà§? রà¦?à§?ষা à¦?রতà§? সাহাযà§?য à¦?রà§? যà§? à¦?à¦?à¦?ি à¦?à§?লা নà§?à¦?à¦?য়ারà§?à¦?.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor �াল� বন�ধ �র�ন </string>
-  <string name="tor_proxy_service_process">�র প�র��সি সার�ভিস</string>
-  <string name="status_starting_up">�রব� �াল� হ���� . . . </string>
+    <string name="status_starting_up">�রব� �াল� হ���� . . . </string>
   <string name="status_activated">�র ন����ার���র সাথ� স�য���ত হ����</string>
   <string name="status_disabled">�রব� নিষ���রি� �রা হ����</string>
   <string name="status_shutting_down">�র সার�ভিস বন�ধ �রা হ����</string>
   <string name="tor_process_starting">�র ��লা��ন�� �াল� �রা হ����</string>
   <string name="tor_process_complete">সম�প�র�ণ</string>
-  <string name="tor_process_waiting">�প���ষা �রা হ����</string>
-  <string name="menu_home">হ�ম</string>
-  <string name="menu_browse">দ���ন</string>
-  <string name="menu_settings">নি�ম বিন�যাস</string>
+    <string name="menu_settings">নি�ম বিন�যাস</string>
   <string name="menu_log">ল�</string>
-  <string name="menu_info">সাহায�য</string>
-  <string name="menu_start">শ�র�</string>
+    <string name="menu_start">শ�র�</string>
   <string name="menu_stop">শ�ষ</string>
   <string name="menu_about">বিস�তারিত</string>
-  <string name="menu_promo_apps">�পস দ���ন...</string>
-  <string name="main_layout_download">ডা�নল�ড</string>
+    <string name="main_layout_download">ডা�নল�ড</string>
   <string name="main_layout_upload">�পল�ড</string>
-  <string name="button_help">সাহায�য</string>
-  <string name="button_close">বন�ধ</string>
-  <string name="button_about">বিস�তারিত</string>
-  <string name="button_clear_log">ল� ��লি�ার �র�ন</string>
-  <string name="menu_verify">��� �র�ন</string>
-  <string name="menu_exit">প�রস�থান</string>
+    <string name="button_about">বিস�তারিত</string>
+    <string name="menu_exit">প�রস�থান</string>
   <string name="menu_scan">ব�রি��ি��র ��� �র�ন</string>
   <string name="menu_share_bridge">ব�রি��ি��র শ��ার �র�ন</string>
-  <string name="press_to_start">�াল� �রার �ন�য ধর� থা��ন</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_transparent_all_title">সব �ি�� �র�র মাধ�যম� �র�ন </string>
-  <string name="wizard_title">�রব�</string>
-  <string name="btn_next">পরবর�ত�</string>
-  <string name="btn_back">প��ন�</string>
-  <string name="btn_finish">শ�ষ</string>
-  <string name="btn_okay">ঠি� ���</string>
+    <string name="btn_okay">ঠি� ���</string>
   <string name="btn_cancel">বাদ</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_permissions_stock">�রব� �র �ন�মতিসম�হ </string>
-  <string name="wizard_permissions_consent">�মি ব��ত� প�র��ি �ব� ��িয়� য�ত� �া� Superuser �া�া।</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">সাধারণ</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">�ন�মতিসম�হ</string>
-  <!--TipsAndTricks screen-->
+    <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="status">�বস�থা</string>
-  <string name="error">ভ�ল</string>
+    <string name="error">ভ�ল</string>
   <string name="bridges">ব�রি�</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ভাষা</string>
-  <string name="bandwidth_">ব�যান�ড��থ:</string>
-  <string name="save">স�র��ষণ �র�ন</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/src/main/res/values-bn-rIN/strings.xml b/app/src/main/res/values-bn-rIN/strings.xml
index 79fc21a7..e832af24 100644
--- a/app/src/main/res/values-bn-rIN/strings.xml
+++ b/app/src/main/res/values-bn-rIN/strings.xml
@@ -1,17 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_info">Help</string>
-  <string name="button_help">Help</string>
-  <string name="btn_cancel">Cancel</string>
+    <string name="btn_cancel">Cancel</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
-  <string name="name">Name</string>
+    <string name="name">Name</string>
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 957581a8..df729d30 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -1,23 +1,16 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_home">ম�ল</string>
-  <string name="menu_settings">বিন�যাস</string>
+    <string name="menu_settings">বিন�যাস</string>
   <string name="menu_log">ল�</string>
-  <string name="menu_info">সাহায�য </string>
-  <string name="menu_start">শ�র�</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_help">সাহায�য </string>
-  <string name="button_close">বন�ধ �রা</string>
-  <string name="button_about">সম�বন�ধ�</string>
+    <string name="button_about">সম�বন�ধ�</string>
   <string name="menu_exit">বন�ধ</string>
-  <string name="btn_next">পরবর�ত�</string>
-  <string name="btn_back">পি�ন�</string>
-  <string name="btn_cancel">বাতিল</string>
+    <string name="btn_cancel">বাতিল</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">প�র��সি স��ি�স</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">সাধারণ</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -25,13 +18,10 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">�বস�থা</string>
-  <string name="error">ভ�ল</string>
+    <string name="error">ভ�ল</string>
   <string name="bridges">ব�রি�</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ভাষা</string>
-  <string name="bandwidth_">ব�যান�ড��থ:</string>
-  <string name="get_bridges_email">�ম��ল</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>
diff --git a/app/src/main/res/values-brx/strings.xml b/app/src/main/res/values-brx/strings.xml
index ff04b27d..806663f3 100644
--- a/app/src/main/res/values-brx/strings.xml
+++ b/app/src/main/res/values-brx/strings.xml
@@ -1,9 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="menu_settings">स��ि���स</string>
-  <string name="menu_info">ह�फा�ाब</string>
-  <string name="button_help">ह�फा�ाब</string>
-  <string name="menu_exit">����ारला�</string>
+    <string name="menu_exit">����ारला�</string>
   <string name="btn_cancel">न�वसि</string>
   <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
@@ -13,6 +11,5 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
-  <string name="save">थिना द�न</string>
+    <string name="save">थिना द�न</string>
 </resources>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 7db55c79..85fe87e3 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1,15 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="menu_settings">Postavke</string>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zatvori</string>
-  <string name="btn_next">Naprijed</string>
-  <string name="btn_back">Nazad</string>
-  <string name="btn_cancel">Otkaži</string>
+    <string name="btn_cancel">Otkaži</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proksi postavke</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Osnovno</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -17,9 +11,7 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Status</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jezik</string>
+    <string name="set_locale_title">Jezik</string>
   <string name="activate">Aktiviraj</string>
   <string name="save">SaÄ?uvaj</string>
   <string name="name">Ime</string>
diff --git a/app/src/main/res/values-ca/poestrings.xml b/app/src/main/res/values-ca/poestrings.xml
index 5d1e77a2..7f4028bb 100644
--- a/app/src/main/res/values-ca/poestrings.xml
+++ b/app/src/main/res/values-ca/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Els ponts són connexions de Tor que ajuden a evitar la censura. Pots provar els ponts si Tor està bloquejat pel teu proveïdor d\'internet, cada tipus de pont utilitza un mètode diferent.
-per evitar la censura: Si un tipus no funciona, prova un altre.</string>
-
-    <string name="bridges_no">Sense ponts: Connecta directament amb Tor</string>
-    <string name="bridges_provided">Ponts proveïts:</string>
-    <string name="bridges_custom">Ponts personalitzats</string>
-
-    <string name="bridges_config">Configuració dels ponts Tor</string>
-    <string name="action_done">Fet</string>
 
     <string name="bridges_sometimes">A vegades necessites un pont per accedir a Tor.</string>
     <string name="action_more">Més informació</string>
@@ -17,19 +8,6 @@ per evitar la censura: Si un tipus no funciona, prova un altre.</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="status_connected">Connectat!</string>
-
-    <string name="loading_claim_1">La nostra diversa comunitat és el que fa Tor genial!</string>
-    <string name="loading_claim_2">Cada dia la gent utilitza Tor per evitar ser perseguit per anuncis.</string>
-    <string name="loading_claim_3">Si bloquegen Facebook, la gent utilitza Tor per connectar amb els seus amics i família.</string>
-    <string name="loading_claim_4">Activistes utilitzen Tor per piular lliurement les seves opinions i creences.</string>
-    <string name="loading_claim_5">Bloguers utilitzen Tor congregar gent per a reformes socials.</string>
-    <string name="loading_claim_6">Periodistes utilitzen Tor per investigar segurs els seus reportatges.</string>
-    <string name="loading_claim_7">Gent de negocis utilitza Tor per mantenir les estratègies de l\'empresa privades</string>
-    <string name="loading_claim_8">Treballadors utilitzen Tor per lluitar per la justícia sense por de perdre el seu treball</string>
-
-    <string name="status_connecting">Et connectem.\" = \"Et connectem.</string>
-
     <string name="hello">Hola</string>
     <string name="welcome">Us donem la benvinguda al Tor.</string>
 
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index bac4cbad..65cd0597 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">https://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Inicia i atura Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
+    <string name="status_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="tor_process_waiting">s\'està esperant.</string>
-  <string name="not_anonymous_yet">ATENCI�: El trànsit de la vostra connexió encara no és anònim! Heu de configurar les vostres aplicacions per utilitzar un proxy HTTP a 127.0.0.1:8118, o un proxy SOCKS4A o SOCKS5 a 127.0.0.1:9050</string>
-  <string name="menu_home">Inici</string>
-  <string name="menu_browse">Navega</string>
-  <string name="menu_settings">Preferències</string>
+    <string name="menu_settings">Preferències</string>
   <string name="menu_log">Registre</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_apps">Aplicacions...</string>
-  <string name="menu_start">Inicia</string>
+    <string name="menu_start">Inicia</string>
   <string name="menu_stop">Atura</string>
   <string name="menu_about">Quant a...</string>
-  <string name="menu_promo_apps">Aconseguiu les aplis...</string>
-  <string name="main_layout_download">Baixada</string>
+    <string name="main_layout_download">Baixada</string>
   <string name="main_layout_upload">Pujada</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Tanca</string>
-  <string name="button_about">Quant a...</string>
-  <string name="button_clear_log">Esborra el registre</string>
-  <string name="menu_verify">Prova</string>
-  <string name="menu_exit">Surt</string>
+    <string name="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="press_to_start">- mantén-lo premut per iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxy transparent (requereix Root)</string>
-  <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
-  <string name="pref_trans_proxy_summary">Torificació automàtica de les apps</string>
-  <string name="pref_transparent_all_title">Tor per a tot</string>
-  <string name="pref_transparent_all_summary">Canalitza el trànsit de totes les aplicacions a través de Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port alternatiu per al proxy </string>
-  <string name="pref_transparent_port_fallback_summary">ATENCI�: Això trampeja els ports habituals (80, 443, etc.) *UTILITZEU-HO NOM�S* si el mode «Totes» o «App» no funcionen.</string>
-  <string name="pref_transparent_port_title">Llista de ports</string>
-  <string name="pref_transparent_port_summary">Llista de ports a canalitzar per proxy. *UTILITZEU-HO NOM�S* si el mode «Totes» o «App» no funcionen.</string>
-  <string name="pref_transparent_port_dialog">Introduïu els ports a canalitzar per proxy</string>
-  <string name="pref_has_root">Demana l\'accés root</string>
-  <string name="pref_has_root_summary">Demana l\'accés root per a la canalització a través de proxy transparent</string>
-  <string name="status_install_success">Els binaris de Tor s\'han instal·lat correctament.</string>
-  <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instal·lar. Comproveu el registre i notifiqueu-ho a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de l\'aplicació</string>
-  <string name="wizard_title">Us donem la benvinguda a l\'Orbot</string>
-  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
-  <string name="btn_next">Següent</string>
-  <string name="btn_back">Enrere</string>
-  <string name="btn_finish">Fi</string>
-  <string name="btn_okay">D\'acord</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permís concedit</string>
-  <string name="wizard_permissions_stock">Permisos de l\'Orbot</string>
-  <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que teniu els permisos root activats per a l\'Orbot. Utilitzarem aquesta capacitat amb sensatesa.</string>
-  <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, l\'Orbot pot esdevenir una eina molt més potent si el vostre terminal té accés root. Utilitzeu el botó d\'aquí sota per concedir superpoders a l\'Orbot!</string>
-  <string name="wizard_permissions_no_root">Si no teniu accés root, o no teniu ni idea del què us estem parlant, simplement assegureu-vos d\'utilitzar aplicacions dissenyades per funcionar amb l\'Orbot.</string>
-  <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés de superusuari</string>
-  <string name="wizard_permission_enable_root">Concedeix accés root a l\'Orbot</string>
-  <string name="wizard_configure">Configura la connexió a Tor</string>
-  <string name="wizard_configure_msg">L\'Orbot us ofereix l\'opció de canalitzar el trànsit de totes les aplicacions a través de Tor o bé escollir quines aplicacions voleu que utilitzin Tor.</string>
-  <string name="wizard_configure_all">Canalitza totes les aplicacions a través de Tor.</string>
-  <string name="wizard_configure_select_apps">Selecciona les aplicacions individualment</string>
-  <string name="wizard_tips_tricks">Aplicacions per utilitzar amb l\'Orbot</string>
-  <string name="wizard_tips_msg">Les aplicacions d\'aquí sota s\'han dissenyat per funcionar amb l\'Orbot. Feu clic a cada botó per instalar-les ara, o busqueu-les després a Google Play Store, al lloc web de GuardianProject.info o a F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client de missatgeria instantània segura per a Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Aprèn a configurar aplicacions per a què funcionin amb l\'Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo - Aplicació de cerca al web</string>
-  <string name="wizard_tips_twitter">Estableix el proxy de Twitter a l\'amfitrió «localhost» i port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Creeu una història i deixeu-la a Tor per seguretat!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ajustaments del proxy</string>
-  <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que esteu utilitzant permet l\'ús d\'un servidor intermediari HTTP o SOCKS, podeu configurar-la per connectar a través de l\'Orbot i utilitzar el Tor.\n\n\n Al paràmetre «amfitrió» o «host» poseu 127.0.0.1 o «localhost». Per a HTTP, el port és 8118. Per a SOCKS és 9050. Hauríeu d\'utilitzar SOCKS4A o SOCKS5 si és possible.\n \n\n\n Podeu obtenir més informació sobre servidors intermediaris a Android a través del FAQ: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">L\'Orbot és a punt!</string>
-  <string name="wizard_final_msg">Milions de persones arreu del món utilitzen el Tor per moltes i diverses raons.\n\nPeriodistes i bloguers, activistes dels drets humans, agents de policia, soldats, corporacions, ciutadans de règims repressors, i simplement ciutadans normals... i ara també esteu preparat per fer-ho!</string>
-  <string name="wizard_exit_at_first_screen_toast">Configureu l\'Orbot abans d\'utilitzar-lo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Us heu connectat correctament a la xarxa Tor - però això NO significa que el vostre dispositiu sigui segur. Podeu utilitzar el botó «Navegador» per comprovar la vostra connexió. \n\nVisiteu-nos a https://guardianproject.info/apps/orbot o envieu-nos un missatge a help@xxxxxxxxxxxxxxxxxxxx per saber-ne més.</string>
-  <string name="tor_check">S\'obrirà el vostre navegador web a https://check.torproject.org per tal de comprovar si l\'Orbot està ben configurat i estàs connectat a Tor.</string>
-  <string name="pref_hs_group">Serveis ocults</string>
-  <string name="pref_general_group">General</string>
+    <!--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-->
-  <string name="wizard_title_msg">L\'Orbot porta Tor a Android!\n\nTor us ajuda a defensar-vos del filtratge de continguts, l\'anàlisi de trànsit i la vigilància de la xarxa que amenaça la privadesa, la informació confidencial i les relacions personals.\n\nAquest assistent us ajudarà a configurar l\'Orbot i el Tor al vostre dispositiu.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Advertència</string>
-  <string name="wizard_warning_msg">Instal·lant només l\'Orbot no anonimitzarà el trànsit de les vostres dades mòbils.\n\nHeu de configurar l\'Orbot al dispositiu i a les aplicacions que empreu per poder utilitzar correctament la xarxa Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalment podeu concedir accés «superusuari» a l\'Orbot per activar funcions avançades, com el servidor intermediari transparent.</string>
-  <string name="wizard_permissions_root_msg2">Si no voleu fer això assegureu-vos de fer servir aplicacions dissenyades per funcionar amb l\'Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Sembla que no teniu permisos de superusuari o accés «Root» al dispositiu.\n\nProveu el mode «Aplicacions» a la pantalla principal</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicacions dissenyades per a l\'Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplicació de xat segur amb encriptació confidencial.</string>
-  <string name="wizard_tips_orweb">Orfox: un navegador millorat per a la privadesa que funciona mitjançant Tor</string>
-  <string name="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string>
-  <string name="wizard_tips_fdroid">Trobeu totes les aplicacions de Guardian Project a l\'F-Droid </string>
-  <string name="wizard_tips_fdroid_org">Trobeu totes les aplicacions de Guardian Project a https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Servidor intermediari transparent</string>
-  <string name="wizard_transproxy_msg">Això permet que les vostres aplicacions es connectin a través de la xarxa Tor sense haver de configurar res.</string>
-  <string name="wizard_transproxy_hint">(Marqueu aquesta casella si no teniu ni idea del que estem parlant)</string>
-  <string name="wizard_transproxy_none">Cap</string>
-  <string name="pref_transparent_tethering_title">Compartició de xarxa amb Tor</string>
-  <string name="pref_transparent_tethering_summary">Activa el servidor intermediari transparent de Tor pels dispositius connectats a través de la compartició de xarxa via Wifi o USB (cal reiniciar)</string>
-  <string name="button_grant_superuser">Petició d\'accés de superusuari</string>
-  <string name="pref_select_apps">Selecciona les apps</string>
-  <string name="pref_select_apps_summary">Trieu quines apps s\'han de canalitzar a través de Tor</string>
-  <string name="pref_node_configuration">Configuració de node</string>
+    <!--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="button_proxy_all">Totes via proxy</string>
-  <string name="button_proxy_none">Cap via proxy</string>
-  <string name="button_invert_selection">Inverteix selecció</string>
-  <string name="pref_proxy_title">Servidor intermediari de sortida a la xarxa (opcional)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Contrasenya del servidor intermediari de sortida</string>
   <string name="pref_proxy_password_summary">Contrasenya del servidor intermediari (opcional)</string>
   <string name="pref_proxy_password_dialog">Introduïu la contrasenya del servidor intermediari</string>
-  <string name="status">Estat</string>
-  <string name="setting_up_full_transparent_proxying_">S\'està configurant el servidor intermediari transparent complet...</string>
-  <string name="setting_up_app_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per apps...</string>
-  <string name="transparent_proxying_enabled">S\'ha ACTIVAT el servidor intermediari transparent</string>
-  <string name="transproxy_enabled_for_tethering_">S\'ha activat el servidor intermediari per la compartició de xarxa</string>
-  <string name="warning_error_starting_transparent_proxying_">ATENCIÃ?: hi ha hagut un error en iniciar el servidor intermediari transparent</string>
-  <string name="transproxy_rules_cleared">S\'han esborrat les regles del servidor intermediari transparent</string>
-  <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
-  <string name="privoxy_is_running_on_port_">S\'està executant Polipo al port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per ports...</string>
-  <string name="bridge_error">Hi ha hagut un error de pont</string>
-  <string name="bridge_requires_ip">Per poder utilitzar la funcionalitat de pont, cal que introduïu almenys una adreça IP de pont.</string>
-  <string name="send_email_for_bridges">Envieu un correu a bridges@xxxxxxxxxxxxxx amb la línia «get bridges» sola al cos del missatge des d\'un compte de gmail.</string>
-  <string name="error">Error</string>
+    <string name="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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Utilitza *només* aquests nodes especificats</string>
   <string name="bridges">Ponts</string>
   <string name="use_bridges">Utilitza ponts</string>
-  <string name="bridges_obfuscated">Ponts ofuscats</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar entrades alternes a la xarxa Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeu-ho si els ponts configurats són ponts ofuscats</string>
-  <string name="ip_address_and_port_of_bridges">Adreça IP i port dels ponts</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Ports accessibles</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ports que es poden accedir darrera d\'un tallafocs restrictiu</string>
   <string name="enter_ports">Introduïu els ports</string>
-  <string name="enable_hidden_services">Allotjament de servei ocult</string>
-  <string name="run_servers_accessible_via_the_tor_network">Permet que un servidor al dispositiu sigui accessible des de la xarxa Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">introduïu els ports de l\'amfitrió local pels serveis ocults</string>
-  <string name="hidden_service_ports">Ports del servei coult</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">el nom adreçable pel vostre servei ocult (generat automàticament)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activa la sortida del registre de depuració (cal utilitzar l\'adb o l\'aLogCat per veure\'l)</string>
+    <string name="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="the_tor_license">La llicència Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Programari de terceres parts:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">servei ocult a:</string>
-  <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
+    <string name="unable_to_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="unable_to_reset_tor">No s\'ha pogut reiniciar Tor. Reinicieu el dispositiu!</string>
-  <string name="pref_use_sys_iptables_title">Utilitza les Iptables per defecte</string>
-  <string name="pref_use_sys_iptables_summary">utilitza el binari incorporat amb l\'Iptables enlloc del que porta l\'Orbot</string>
-  <string name="error_installing_binares">Els binaris de Tor no s\'han pogut instal·lar o actualitzar.</string>
-  <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
+    <string name="pref_use_persistent_notifications">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="notification_using_bridges">Ponts activats.</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Llengua</string>
-  <string name="set_locale_summary">Trieu la localització i la llengua per l\'Orbot</string>
-  <string name="wizard_locale_title">Tria la llengua</string>
-  <string name="wizard_locale_msg">Deixa-ho per defecte o canvia la llengua actual</string>
-  <string name="powered_by">funciona amb Tor</string>
-  <string name="btn_save_settings">Desa els paràmetres</string>
-  <string name="no_internet_connection_tor">No s\'ha trobat cap connexió a Internet; el Tor és a l\'espera</string>
-  <string name="bandwidth_">Ample de banda:</string>
-  <string name="down">baixada</string>
-  <string name="up">pujada</string>
-  <string name="pref_disable_network_title">No hi ha autodesconnexió de xarxa</string>
+    <string name="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="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Utilitza ChatSecure</string>
-  <string name="permission_manage_tor_label">Gestiona Tor</string>
-  <string name="permission_manage_tor_description">Activa aquesta app per controlar el servei Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona millor amb el navegador Orfox. Instal·lar ara?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona millor amb el navegador Orfox. Instal·lar ara?</string>
   <string name="install_apps_">Instal·lar navegador?</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>
@@ -258,19 +128,7 @@
   <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="wizard_tips_martus">Mobile Martus - Aplicació de Documentació dels Drets Humans de Benetech</string>
-  <string name="your_tor_public_ips_">Les vostres IP públiques de Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Si teniu problemes amb l\'Orbot, inhabiliteu aquesta aplicació d\'Android a Configuració â?? Aplicacions:</string>
-  <string name="app_conflict">Aplicació conflictiva</string>
-  <string name="pref_transproxy_refresh_title">Actualització automàtica del TransProxy</string>
-  <string name="pref_transproxy_refresh_summary">Aplica novament les regles quan canviï l\'estat de la xarxa</string>
-  <string name="pref_transproxy_flush_title">SUPRESSIÃ? FORÃ?ADA del Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Toqueu aquí per suprimir ara totes les regles de xarxa</string>
-  <string name="transparent_proxy_rules_flushed_">S\'han suprimit les regles transparents del servidor intermediari!</string>
-  <string name="you_do_not_have_root_access_enabled">No teniu habilitat l\'accés a Root</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Potser necessiteu aturar i iniciar novament l\'Orbot per aplicar la configuració nova.</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Activa</string>
   <string name="apps_mode">Mode VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Pots activar aplicacions per anar a través de Tor utilitzant el Orbot VPN incorporat.\n\nAixò no et farà anònim, però t\'ajudarà a passar tallafocs.</string>
-  <string name="send_email">Envia correu-e</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="install_orweb">Instal·la l\'Orfox</string>
-  <string name="standard_browser">Navegador estàndard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Els ponts estàndards del Tor només funciones en dispositius Intel X86/ATOM</string>
-  <string name="vpn_default_world">Global (auto)</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="ports">Ports</string>
-  <string name="local_port">Port local</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Permís concedit</string>
-  <string name="permission_denied">Permís denegat</string>
-  <string name="restore_backup">Restaurar còpia de seguretat</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Si us plau activa el mode VPN per permetre a les aplicacions emprar Tor</string>
-  <string name="app_shortcuts">Aplicacions emprant Tor</string>
-  <string name="title_activity_bridge_wizard">ActivitatAssistentPont</string>
-  <string name="testing_bridges">Provant connexió pont a Tor...</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>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 06712165..87aae913 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -2,133 +2,45 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">spustit a vypnout Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se spouští...</string>
+    <string name="status_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="tor_process_waiting">Ä?ekám.</string>
-  <string name="not_anonymous_yet">VAROVÃ?NÃ?: VaÅ¡e komunikace jeÅ¡tÄ? není anonymní! Prosím nastavte vaÅ¡im aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A Ä?i SOCKS5 proxy 172.0.0.1:9050</string>
-  <string name="menu_home">Domů</string>
-  <string name="menu_browse">Prohlížet</string>
-  <string name="menu_settings">Nastavení</string>
+    <string name="menu_settings">Nastavení</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Pomoc</string>
-  <string name="menu_start">Zapnout</string>
+    <string name="menu_start">Zapnout</string>
   <string name="menu_stop">Vypnout</string>
   <string name="menu_about">O aplikaci</string>
-  <string name="menu_promo_apps">Získat aplikace...</string>
-  <string name="main_layout_download">Stáhnout</string>
+    <string name="main_layout_download">Stáhnout</string>
   <string name="main_layout_upload">Nahrát</string>
-  <string name="button_help">NápovÄ?da</string>
-  <string name="button_close">ZavÅ?ít</string>
-  <string name="button_about">O aplikaci</string>
-  <string name="button_clear_log">VyÄ?istit log</string>
-  <string name="menu_verify">OvÄ?Å?it</string>
-  <string name="menu_exit">Konec</string>
+    <string name="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="press_to_start">- podržte pro spuÅ¡tÄ?ní -</string>
-  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
-  <string name="pref_trans_proxy_title">Transparentní proxy</string>
-  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
-  <string name="pref_transparent_all_title">Torovat všechno</string>
-  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
-  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
-  <string name="pref_transparent_port_fallback_summary">VAROVÃ?NÃ?: Obchází bÄ?žné porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
-  <string name="pref_transparent_port_title">Seznam portů</string>
-  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
-  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
-  <string name="pref_has_root">Vyžaduje root pÅ?ístup</string>
-  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
-  <string name="status_install_success">Binárky toru byly úspÄ?Å¡nÄ? nainstalovány!</string>
-  <string name="status_install_fail">Nebylo možno nainstalovat binárky Toru. Prosím zkontrolujte log a upozornÄ?te tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Chyba aplikace</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
-  <string name="btn_next">Další</string>
-  <string name="btn_back">ZpÄ?t</string>
-  <string name="btn_finish">DokonÄ?it</string>
-  <string name="btn_okay">Budiž</string>
+    <string name="btn_okay">Budiž</string>
   <string name="btn_cancel">Zrušit</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Pár detailů o Orbot</string>
-  <string name="wizard_permissions_root">Práva udÄ?lena</string>
-  <string name="wizard_permissions_stock">OprávnÄ?ní Orbota</string>
-  <string name="wizard_premissions_msg_root">VýbornÄ?! Bylo detekováno, že root oprávnÄ?ní bylo Orbotu udÄ?leno. Budeme tuto sílu užívat moudÅ?e.</string>
-  <string name="wizard_permissions_msg_stock">I když to není nutné, Orbot může pracovat lépe, pokud má vaÅ¡e zaÅ?ízení root. Použijte tlaÄ?ítko dole pro udÄ?lení supersíly Orbotovi. </string>
-  <string name="wizard_permissions_no_root">Pokud nemáte pÅ?ístup roota, nebo nevíte, o co se jedná, ujistÄ?te se, že používáte aplikace, které s Orbotem spolupracují.</string>
-  <string name="wizard_permissions_consent">Rozumín a pÅ?eji si pokraÄ?ovat bez roota (superuživatelských oprávnÄ?ní)</string>
-  <string name="wizard_permission_enable_root">UdÄ?lit Orbotovi root oprávnÄ?ní</string>
-  <string name="wizard_configure">Nastavení Torování</string>
-  <string name="wizard_configure_msg">Orbot umožÅ?uje smÄ?rovat datový provoz vÅ¡ech aplikací pÅ?es Tor NEBO zvolit aplikace individuálnÄ?.</string>
-  <string name="wizard_configure_all">Tor Proxy pro všechny aplikace</string>
-  <string name="wizard_configure_select_apps">Zvolit aplikace pro Tor individuálnÄ?</string>
-  <string name="wizard_tips_tricks">Aplikace povolené pro Orbota</string>
-  <string name="wizard_tips_msg">Aplikace níže byly vyvinuty tak, aby spolupracovaly s Orbotem. KliknÄ?te na každé tlaÄ?ítko pro instalaci, aplikace můžete najít i v Obchodu Play nebo na webu GuardianProject.info Ä?i F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - BezpeÄ?ný instant messaging klient pro Android</string>
-  <string name="wizard_tips_proxy">Proxy Nastavení - NauÄ?te se, jak nastavit aplikace, aby pracovaly s Orbotem</string>
-  <string name="wizard_tips_duckgo">Aplikace DuckDuckGo pro vyhledávací engine</string>
-  <string name="wizard_tips_twitter">Nastavit Twitter proxy na host \"localhost\" a port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Nastavení Proxy</string>
-  <string name="wizard_proxy_help_msg">Pokud používaná aplikace podporuje HTTP, nebo SOCKS proxy, můžete ji nastavit pro pÅ?ipojení pÅ?es Orbot a používání Tor.\n\n\n Nastavení hostitele je 127.0.0.1, nebo \"localhost\". Pro HTTP je port 8118. Pro SOCKS je port proxy 9050. Pokud je to možné, mÄ?li byste použít SOCKS4A, nebo SOCKS5.\n \n\n\n Více o používání proxy na Androidu je možné zjistit v FAQ na: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot je pÅ?ipraven!</string>
-  <string name="wizard_final_msg">Milliony lidí po celém svÄ?tÄ? používají Tor z celé Å?ady důvodů.\n\nNovináÅ?i a blogeÅ?i, ochránci lidských práv, policejní detektivové, vojáci, firmy, obyvatelé států s nesvobodným režimem a naprosto obyÄ?ejní obÄ?anéâ?¦ a nyní se můžete pÅ?ipojit i vy</string>
-  <string name="wizard_exit_at_first_screen_toast">Orbot musíte nejdÅ?íve nastavit, než ho zaÄ?nete používat!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ã?spÄ?Å¡nÄ? jste se pÅ?ipojili k síti Tor - toto ale NEZNAMENÃ?, že vaÅ¡e zaÅ?íení je bezpeÄ?né. Můžete použít tlaÄ?ítko \'ProhlížeÄ?\' pro zkouÅ¡ku spojení. \n\nNavÅ¡tivte nás na https://guardianproject.info/apps/orbot , nebo nám napiÅ¡te na email help@xxxxxxxxxxxxxxxxxxxx pro více informací.</string>
-  <string name="tor_check">Tato volba otevÅ?e ve webovém prohlížeÄ?i stránku https://check.torproject.org pro kontrolu, jestli je Orbot správnÄ? nastaven a jste pÅ?ipojen k Tor.</string>
-  <string name="pref_hs_group">Skrytý hosting služby</string>
-  <string name="pref_general_group">Obecné</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot pÅ?ináší Tor na Android!\n\nTor pomáhá chránit se proti filtrování obsahu, anylýze obsahu a sledování síťového provozu, které ohrožují bezpeÄ?nost, důvÄ?rnost informací a osbní vztahy.\n\nTento průvodce vám pomůže nastavit Orbot a Tor na vaÅ¡em zaÅ?ízení.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Varování</string>
-  <string name="wizard_warning_msg">Samotná instalace Orbot neudÄ?lá vaÅ¡e mobilní pÅ?enosy anonymními.\n\nMusíte správnÄ? nastavit Orbot, vaÅ¡e zaÅ?ízení a aplikace pro úspÄ?Å¡né používání Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">OprávnÄ?ní</string>
-  <string name="wizard_permissions_root_msg1">VolitelnÄ? můžete Orbotu udÄ?lit \'siperuýivatelský\' (root) pÅ?ístup pto povolení rozšíÅ?ených funkcí, napÅ?íklad transparentní proxy.</string>
-  <string name="wizard_permissions_root_msg2">Pokud si to nepÅ?ejete, používejte prosím aplikace napsané tak, aby spolupracovaly s Orbotem</string>
-  <string name="wizard_permissions_no_root_msg">VaÅ¡e zaÅ?ízení nejspíš nemá oprávnÄ?ní root, nebo nepovoluje \'Superuser\' pÅ?ístup.\n\nProsím zkuste místo toho mód \'Aplikace\' na hlavní stránce.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-povolené aplikace</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: BezpeÄ?ná chatovací aplikace s technologií Off-the-Record Encryption</string>
-  <string name="wizard_tips_orweb">Orfox: ProhlížeÄ? s rozšíÅ?eným soukroním, který funguje pÅ?es Tor</string>
-  <string name="wizard_tips_play">NajdÄ?te vÅ¡echny aplikace Guardian Projektu na Obchodu Play</string>
-  <string name="wizard_tips_fdroid">NajdÄ?te vÅ¡echny Gurdian Project aplikace na F-Droid</string>
-  <string name="wizard_tips_fdroid_org">NajdÄ?te vÅ¡echny Guardian Project aplikace na https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentní proxy</string>
-  <string name="wizard_transproxy_msg">Toto povolí aplikacím automaticky bÄ?žet pÅ?es Tor síť bez jakéhokoliv nastavování.</string>
-  <string name="wizard_transproxy_hint">(Povolte tuto volbu, pokud nemáte ponÄ?tí, o co se jedná)</string>
-  <string name="wizard_transproxy_none">Žádné</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Povolit Tor transparentní proxy pro zaÅ?ízení pÅ?ipojená pÅ?es Wi-Fi a USB tethering (vyžaduje restart)</string>
-  <string name="button_grant_superuser">Požadavek na Superuživatelský pÅ?ístup</string>
-  <string name="pref_select_apps">Vybrat aplikace</string>
-  <string name="pref_select_apps_summary">Zvolte aplikace používající smÄ?rováni pÅ?es Tor</string>
-  <string name="pref_node_configuration">Konfigurace uzlu (nodu)</string>
+    <!--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="button_proxy_all">Proxy vše</string>
-  <string name="button_proxy_none">Proxy nic</string>
-  <string name="button_invert_selection">PÅ?evrátit výbÄ?r</string>
-  <string name="pref_proxy_title">Odchozí síťová proxy (volitelné)</string>
+    <string name="pref_proxy_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>
@@ -144,20 +56,8 @@
   <string name="pref_proxy_password_title">Heslo odchozí proxy</string>
   <string name="pref_proxy_password_summary">Proxy heslo (volitelné)</string>
   <string name="pref_proxy_password_dialog">Zadejte Proxy heslo</string>
-  <string name="status">Stav</string>
-  <string name="setting_up_full_transparent_proxying_">Nastavuji transparentní proxy�</string>
-  <string name="setting_up_app_based_transparent_proxying_">Nastavení na aplikacích založené transparentní proxy...</string>
-  <string name="transparent_proxying_enabled">Transparentní proxy POVOLENA</string>
-  <string name="transproxy_enabled_for_tethering_">Transparentní proxy povolena pro Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">VAROVÃ?NÃ?: chyba pÅ?i startu transparentní proxy!</string>
-  <string name="transproxy_rules_cleared">Pravidla TransProxy vymazána</string>
-  <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
-  <string name="privoxy_is_running_on_port_">Polipo bÄ?ží na portu:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Nastavení na portu založené transparentní proxy...</string>
-  <string name="bridge_error">Chyba bridge</string>
-  <string name="bridge_requires_ip">Pro použití bridge musíte zadat minimálné jednu IP adresu bridge.</string>
-  <string name="send_email_for_bridges">ZaÅ¡lete email pouze s Å?ádkem \"get bridges\" v obsahu zprávy z vaÅ¡eho gmail úÄ?tu na adresu bridges@xxxxxxxxxxxxxx</string>
-  <string name="error">Chyba</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>
@@ -170,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Použít *pouze* tyto specifické nody</string>
   <string name="bridges">Bridge</string>
   <string name="use_bridges">Použít bridge</string>
-  <string name="bridges_obfuscated">Matoucí bridge (Obfuscated Bridges)</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Povolte, pokud jsou nastavené bridge matoucí bridge</string>
-  <string name="ip_address_and_port_of_bridges">IP adresy a porty bridgů</string>
+    <string name="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>
@@ -188,52 +86,26 @@
   <string name="reachable_ports">Dostupné porty</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostupné za restriktivním firewallem</string>
   <string name="enter_ports">Zadejte porty</string>
-  <string name="enable_hidden_services">Skrytý hosting služby</string>
-  <string name="run_servers_accessible_via_the_tor_network">umožnit serveru na zaÅ?ízení být pÅ?ístupné skrze síť Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">vložte porty localhostu pro skryté služby</string>
-  <string name="hidden_service_ports">Skryté porty služby</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresovatelné jméno pro vaši skrytou službu (generováno automaticky)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">umožnit ladicí informace na výstup (musí používat adb nebo aLogCat k prohlížení)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">umožnit ladicí informace na výstup (musí používat adb nebo aLogCat k prohlížení)</string>
   <string name="project_home">Domovské(á) umístÄ?ní projektu</string>
-  <string name="the_tor_license">Tor Licence</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software tÅ?etích stran:</string>
+    <string name="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="hidden_service_on">skrytá služba na:</string>
-  <string name="unable_to_read_hidden_service_name">nelze Ä?íst název skryté služby</string>
+    <string name="unable_to_read_hidden_service_name">nelze Ä?íst název skryté služby</string>
   <string name="unable_to_start_tor">Nelze spustit Tor:</string>
-  <string name="unable_to_reset_tor">Restartujte vaÅ¡e zaÅ?ízení, nejsme schopni resetovat Tor!</string>
-  <string name="pref_use_sys_iptables_title">Použít defaultní Iptables</string>
-  <string name="pref_use_sys_iptables_summary">použít vestavÄ?né iptables binárky místo tÄ?ch dodávaných s Orbotem</string>
-  <string name="error_installing_binares">Nelze nainstalovat nebo aktualizovat Tor binárky.</string>
-  <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém Å?ádku, pokud je Orbot pÅ?ipojen.</string>
+    <string name="pref_use_persistent_notifications">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="notification_using_bridges">Bridge povoleny!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jazyk</string>
-  <string name="set_locale_summary">Zvolte jazyk pro Orbot</string>
-  <string name="wizard_locale_title">Zvolte jazyk</string>
-  <string name="wizard_locale_msg">Ponechat standartní, nebo pÅ?epnout stávající jazyk</string>
-  <string name="powered_by">pohánÄ?no Tor projektem</string>
-  <string name="btn_save_settings">Uložit nastavení</string>
-  <string name="no_internet_connection_tor">Žádné pÅ?ipojení k internetu; Tor je standby...</string>
-  <string name="bandwidth_">ŠíÅ?ka pásma:</string>
-  <string name="down">stahování</string>
-  <string name="up">nahrávání</string>
-  <string name="pref_disable_network_title">Vypnout uspávání sítÄ?</string>
+    <string name="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="menu_verify_browser">ProhlížeÄ?</string>
-  <string name="menu_use_chatsecure">Použít ChatSecure</string>
-  <string name="permission_manage_tor_label">Spravovat Tor</string>
-  <string name="permission_manage_tor_description">Umožnit této aplikaci ovládat službu Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Žádný síťový provoz. Ukládám Tor k spánku�</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>
@@ -248,18 +120,7 @@
   <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="your_tor_public_ips_">VaÅ¡e veÅ?ejná Tor IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Prosím zakažte tuto aplikaci v  Android-&gt;Nastavení-&gt;Aplikace pokud máte problémy s Orbot: </string>
-  <string name="app_conflict">Konfliktní aplikace</string>
-  <string name="pref_transproxy_refresh_title">Transproxy auto-obnovení</string>
-  <string name="pref_transproxy_refresh_summary">Znovuaplikovat pravidla Transproxy, pokud se zmÄ?ní stav sítÄ?</string>
-  <string name="pref_transproxy_flush_title">VYNUTIT ODEBRÃ?NÃ? Transproxy</string>
-  <string name="pref_transproxy_flush_summary">KlepnÄ?te zde pro smazání vÅ¡ch pravidel transproxy NYNÃ?</string>
-  <string name="transparent_proxy_rules_flushed_">Pravidla transparentní proxy smazána!</string>
-  <string name="you_do_not_have_root_access_enabled">Nemáte povolen ROOT pÅ?ístup</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Možná bude potÅ?eba zastavit a spustit Orbot pro aplikaci zmÄ?n.</string>
-  <string name="menu_vpn">Aplikace</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">kB</string>
   <string name="mb">MB</string>
@@ -273,9 +134,7 @@
   <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 &amp; vložte ji do položky \"Bridge\" v nastavení Orbot a restartujte aplikaci.</string>
   <string name="install_orweb">Instalovat Orfox</string>
-  <string name="standard_browser">Standartní prohlížeÄ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">POZN�MKA: Na Intel X86/ATOM funguje pouze standartní Tor bridge</string>
-  <string name="save">Uložit</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/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c9cbb2fb..5fe50ed5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2,91 +2,40 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">spustit a vypnout Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se spouští�</string>
+    <string name="status_starting_up">Orbot se spouští�</string>
   <string name="status_activated">PÅ?ipojen k síti Tor</string>
   <string name="status_disabled">\"Orbot je deaktivován</string>
   <string name="status_shutting_down">Orbot se vypíná</string>
   <string name="tor_process_starting">Startuji Tor klientaâ?¦</string>
   <string name="tor_process_complete">hotovo.</string>
-  <string name="tor_process_waiting">Ä?ekám.</string>
-  <string name="not_anonymous_yet">VAROVÃ?NÃ?: VaÅ¡e komunikace jeÅ¡tÄ? není anonymní! Prosím nastavte vaÅ¡im aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A Ä?i SOCKS5 proxy 172.0.0.1:9050</string>
-  <string name="menu_home">Domů</string>
-  <string name="menu_browse">Prohlížet</string>
-  <string name="menu_settings">Nastavení</string>
+    <string name="menu_settings">Nastavení</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Pomoc</string>
-  <string name="menu_start">Zapnout</string>
+    <string name="menu_start">Zapnout</string>
   <string name="menu_stop">Vypnout</string>
   <string name="menu_about">O aplikaci</string>
-  <string name="menu_promo_apps">Získejte aplikace...</string>
-  <string name="main_layout_download">Stahování</string>
+    <string name="main_layout_download">Stahování</string>
   <string name="main_layout_upload">Nahrávání</string>
-  <string name="button_help">Pomoc</string>
-  <string name="button_close">ZavÅ?ít</string>
-  <string name="button_about">O aplikaci</string>
-  <string name="button_clear_log">VyÄ?istit log</string>
-  <string name="menu_verify">OvÄ?Å?it</string>
-  <string name="menu_exit">Konec</string>
+    <string name="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="press_to_start">- podržte pro spuÅ¡tÄ?ní -</string>
-  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
-  <string name="pref_trans_proxy_title">Transparentní proxy</string>
-  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
-  <string name="pref_transparent_all_title">Torovat všechno</string>
-  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
-  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
-  <string name="pref_transparent_port_fallback_summary">VAROVÃ?NÃ?: Obchází Ä?asté porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
-  <string name="pref_transparent_port_title">Seznam portů</string>
-  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
-  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
-  <string name="pref_has_root">Vyžaduje root pÅ?ístup</string>
-  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
-  <string name="status_install_success">Binárky toru byly úspÄ?Å¡nÄ? nainstalovány!</string>
-  <string name="title_error">Chyba aplikace</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
-  <string name="btn_next">Další</string>
-  <string name="btn_back">ZpÄ?t</string>
-  <string name="btn_finish">DokonÄ?it</string>
-  <string name="btn_cancel">Zrušit</string>
+    <string name="btn_cancel">Zrušit</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Detaily o Orbotu</string>
-  <string name="wizard_permissions_root">Práva udÄ?lena</string>
-  <string name="wizard_permissions_stock">Orbot práva</string>
-  <string name="wizard_premissions_msg_root">VýbornÄ?! Detekovali jsme, že Orbot má dostupná práva roota. MoudÅ?e je využijeme.</string>
-  <string name="wizard_proxy_help_info">Nastavení Proxy6</string>
-  <string name="wizard_final">Orbot je pÅ?ipraven!</string>
-  <string name="wizard_exit_at_first_screen_toast">Prosím, nakonfigurujte Orbot dÅ?íve, než ho zaÄ?nete pužívat!</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--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-->
-  <string name="wizard_warning_title">Varování</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentní proxy</string>
-  <string name="wizard_transproxy_hint">(ZaÅ¡krtnÄ?te, jestli netušíte, o Ä?em je Å?eÄ?)</string>
-  <string name="wizard_transproxy_none">Není</string>
-  <string name="status">Status</string>
-  <string name="error">Chyba</string>
+    <string name="error">Chyba</string>
   <string name="bridges">PÅ?emostÄ?ní</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jazyk</string>
-  <string name="btn_save_settings">Ulož nastavení</string>
-  <string name="bandwidth_">Sirka pasma:</string>
-  <string name="menu_vpn">Aplikace</string>
-  <string name="get_bridges_email">Email</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>
diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml
index 25a6dd54..9bd3852d 100644
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@@ -1,86 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">cychwyn a stopio Tor</string>
-  <string name="tor_proxy_service_process">gwasanaethdirpwrytor</string>
-  <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
+    <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
   <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string>
   <string name="tor_process_starting">Yn cychwyn cleient Tor</string>
   <string name="tor_process_complete">Wedi ei gwblhau.</string>
-  <string name="tor_process_waiting">yn aros.</string>
-  <string name="not_anonymous_yet">RHYBUDD: Nid yw eich traffig yn ddienw eto! Os gwelwch yn dda ffurfweddu eich ceisiadau at arfer HTTP proxy 127.0.0.1:8118 neu SOCKS4A neu ddirprwy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Hafan</string>
-  <string name="menu_browse">Pori</string>
-  <string name="menu_settings">Gosodiadau</string>
+    <string name="menu_settings">Gosodiadau</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_start">Cychwyn</string>
+    <string name="menu_start">Cychwyn</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Amdanom ni</string>
   <string name="main_layout_download">Llwytho i lawr</string>
   <string name="main_layout_upload">Llwytho i fyny</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Cau</string>
-  <string name="button_about">Amdanom ni</string>
-  <string name="button_clear_log">Clirio log</string>
-  <string name="menu_verify">Gwirio</string>
-  <string name="menu_exit">Gadael</string>
-  <string name="press_to_start">- pwyswch yn hir i gychwyn -</string>
-  <string name="pref_trans_proxy_group">Dirprwyo tryloyw (angen Gwreiddyn)</string>
-  <string name="pref_trans_proxy_title">Dirprwyo tryloyw</string>
-  <string name="pref_trans_proxy_summary">\'Torifying\' o Apps yn awtomatig</string>
-  <string name="pref_transparent_all_title">Popeth Tor</string>
-  <string name="pref_transparent_all_summary">Traffig dirprwy i\'r holl apps drwy Tor</string>
-  <string name="pref_transparent_port_title">Rhestr Porthau</string>
-  <string name="pref_transparent_port_summary">Rhestr o borthau i\'w dirprwyo. *DEFNYDDIER YN UNIG* os nad yw modd \'Popeth\' neu \'App\' yn gweithio</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Am Orbot</string>
-  <string name="btn_next">Nesaf</string>
-  <string name="btn_back">Yn ôl</string>
-  <string name="btn_finish">Gorffen</string>
-  <string name="btn_okay">Iawn</string>
+    <string name="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>
-  <string name="wizard_permissions_root">Caniatâd wedi\'i roi</string>
-  <string name="wizard_proxy_help_info">Gosodiadau Dirprwy</string>
-  <string name="wizard_final">Mae Orbot yn barod!</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Cyffredinol</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Rhybudd</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Dirprwyo\'n dryloyw</string>
-  <string name="wizard_transproxy_none">Dim</string>
-  <string name="pref_select_apps">Dewiswch Apps</string>
-  <string name="pref_select_apps_summary">Dewiswch Apps i\'w llwybro drwy Tor</string>
-  <string name="pref_node_configuration">Ffurfweddiad nod</string>
+    <string name="pref_node_configuration">Ffurfweddiad nod</string>
   <string name="pref_entrance_node">Nodau mynediad</string>
   <string name="pref_entrance_node_dialog">I mewn i nodau mynediad</string>
   <string name="pref_proxy_password_summary">Cyfrinair y Dirprwy (Dewisol)</string>
-  <string name="status">Statws</string>
-  <string name="error">Gwall</string>
+    <string name="error">Gwall</string>
   <string name="exit_nodes">Nodau Gadael</string>
   <string name="enter_exit_nodes">I mewn i Nodau Gadael</string>
   <string name="exclude_nodes">Yn eithrio Nodau</string>
   <string name="enter_exclude_nodes">I mewn i Nodau Eithrio</string>
-  <string name="the_tor_license">Trwydded Tor</string>
-  <string name="third_party_software">Meddalwedd 3ydd-parti</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Iaith</string>
-  <string name="set_locale_summary">Dewiswch locale ac iaith i Orbot</string>
-  <string name="wizard_locale_title">Dewiswch iaith</string>
-  <string name="btn_save_settings">Cadw\'r gosodiadau</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="activate">Ysgogi</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>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index bf019372..d212aac5 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2,111 +2,38 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start og stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot starter op ...</string>
+    <string name="status_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="tor_process_waiting">afventer.</string>
-  <string name="not_anonymous_yet">ADVARSEL: Din trafik er ikke endnu ikke anonym! Konfigurér venligst dine programmer, så de bruger HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5-proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Hjem</string>
-  <string name="menu_browse">Brows</string>
-  <string name="menu_settings">Indstillinger</string>
+    <string name="menu_settings">Indstillinger</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Hjælp</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Om</string>
-  <string name="menu_promo_apps">FÃ¥ apps...</string>
-  <string name="main_layout_download">Henter</string>
+    <string name="main_layout_download">Henter</string>
   <string name="main_layout_upload">Sender</string>
-  <string name="button_help">Hjælp</string>
-  <string name="button_close">Luk</string>
-  <string name="button_about">Om</string>
-  <string name="button_clear_log">Ryd log</string>
-  <string name="menu_verify">Tjek</string>
-  <string name="menu_exit">Afslut</string>
+    <string name="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="press_to_start">- hold nede for start -</string>
-  <string name="pref_trans_proxy_group">Transparent proxy (kræver Root)</string>
-  <string name="pref_trans_proxy_title">Transparent proxy</string>
-  <string name="pref_trans_proxy_summary">Anvend automatisk Tor på programmer</string>
-  <string name="pref_transparent_all_title">Brug Tor til alt</string>
-  <string name="pref_transparent_all_summary">Proxy-trafik for alle programmer gennem Tor</string>
-  <string name="pref_transparent_port_fallback_title">Tilbagefaldsport for proxy</string>
-  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår almindelige porte (80, 443, osv). Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
-  <string name="pref_transparent_port_title">Portliste</string>
-  <string name="pref_transparent_port_summary">Liste af porte der skal filtreres gennem proxyen. Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
-  <string name="pref_transparent_port_dialog">Indtast porte der skal filtreres gennem proxyen.</string>
-  <string name="pref_has_root">Forespørg om Root-adgang</string>
-  <string name="pref_has_root_summary">Kræver root privilegier for gennemsigtig proxy.</string>
-  <string name="status_install_success">Tor\'s binære filer succesfuldt installeret!</string>
-  <string name="status_install_fail">Tor\'s binære filer kunne ikke installeres. Læs venligst loggen og underret tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Programfejl</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Om Orbot</string>
-  <string name="btn_next">Næste</string>
-  <string name="btn_back">Tilbage</string>
-  <string name="btn_finish">Afslut</string>
-  <string name="btn_okay">Okay</string>
+    <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Fortryd</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Nogle Orbot detaljer</string>
-  <string name="wizard_permissions_root">Tilladelse givet</string>
-  <string name="wizard_permissions_stock">Orbot tilladelser</string>
-  <string name="wizard_premissions_msg_root">Fremragende! Vi kan se at du har givet root tilladelser til Orbot . Vi vil bruge denne magt med omtanke.</string>
-  <string name="wizard_permissions_msg_stock">Selvom det ikke er påkrævet, kan Orbot blive et mere nyttigt værktøj, hvis din enhed har root adgang. Benyt knappen herunder for at tildele Orbot superkræfter!</string>
-  <string name="wizard_permissions_no_root">Hvis du ikke har root adgang eller ikke aner hvad vi snakker om, skal du være sikker på at du benytter dig af apps som kan fungere med Orbot.</string>
-  <string name="wizard_permissions_consent">Jeg forstår og vil gerne fortsætte uden Superuser</string>
-  <string name="wizard_permission_enable_root">Tillad root for Orbot</string>
-  <string name="wizard_configure">Indstil Torifikation</string>
-  <string name="wizard_configure_msg">Orbot giver dig mulighed for at føre al app-trafik igennem Tor ELLER vælge individuelt imellem apps.</string>
-  <string name="wizard_configure_all">Kør alle programmers trafik gennem Tor proxyen</string>
-  <string name="wizard_configure_select_apps">Vælg individuelle apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-aktiverede apps</string>
-  <string name="wizard_tips_msg">De nedenstående programmer er udviklet for at fungere med Orbot. Klik hver knap for at installere nu. Ellers kan de senere findes på Google play, på hjemmesiden GuardianProject.info eller via F-Droid.org.</string>
-  <string name="wizard_tips_proxy">Proxy indstillinger - Lær hvordan du konfigurerer apps til at fungere med Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo søgemaskine-programmet</string>
-  <string name="wizard_tips_twitter">Indstil Twitter proxyen til værten \"localhost\" og port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-indstillinger</string>
-  <string name="wizard_final">Orbot er klar!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Dette vil åbne din browser på https://check.torproject.org for at se om Orbot er korrekt konfigureret og at du er forbundet til Tor.</string>
-  <string name="pref_hs_group">Udbyd en skjult service</string>
-  <string name="pref_general_group">Generelt</string>
+    <!--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-->
-  <string name="wizard_warning_title">Advarsel</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Tilladelser</string>
-  <string name="wizard_permissions_root_msg1">Du kan eventuelt give Orbot \'Superuser\' adgang for at aktivere funktioner som f.eks. Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, så vær sikker på at du bruger apps som fungerer med Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-aktiverede apps</string>
-  <string name="wizard_tips_play">Find alle Guardian Project programmer på Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transperant Proxying</string>
-  <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string>
-  <string name="wizard_transproxy_hint">(Check denne boks hvis du ikke aner hvad vi snakker om)</string>
-  <string name="wizard_transproxy_none">Ingen</string>
-  <string name="pref_transparent_tethering_title">Tor internet-hotspot</string>
-  <string name="pref_transparent_tethering_summary">Start Tor gennemsigtig proxy for Wifi og internetdeling over USB (kræver genstart)</string>
-  <string name="button_grant_superuser">Anmod om Superuser adgang</string>
-  <string name="pref_select_apps">Vælg apps</string>
-  <string name="pref_select_apps_summary">Vælg apps som føres gennem Tor</string>
-  <string name="pref_node_configuration">Konfiguration af Tor node</string>
+    <!--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>
@@ -128,19 +55,8 @@
   <string name="pref_proxy_password_title">Kodeord for udgående proxy</string>
   <string name="pref_proxy_password_summary">Adgangskode for udgående proxy (Valgfri)</string>
   <string name="pref_proxy_password_dialog">Indtast proxy-kodeordet</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Opsætter total, gennemsigtig proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Opsætter program-afhængig transparent proxy...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy slået til for internetdeling!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: fejl under start af den gennemsigtige proxy!</string>
-  <string name="transproxy_rules_cleared">Indstillinger for TransProxy er nulstillet</string>
-  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Opsætter port-baseret gennemsigtig proxy...</string>
-  <string name="bridge_error">Fejl ved Bro</string>
-  <string name="bridge_requires_ip">For at kunne bruge bro-komponenten, skal du indaste mindst én IP-adresse på en bro.</string>
-  <string name="send_email_for_bridges">Send en e-mail til bridges@xxxxxxxxxxxxxx med teksten \"get bridges\" alene i mailens tekstfelt fra en gmail-konto.</string>
-  <string name="error">Fejl</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>
@@ -153,9 +69,7 @@
   <string name="use_only_these_specified_nodes">Brug *kun* disse specificerede punkter</string>
   <string name="bridges">Broer</string>
   <string name="use_bridges">Brug broer</string>
-  <string name="bridges_obfuscated">Skjulte broer</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de indstillede broer er skjulte broer</string>
-  <string name="ip_address_and_port_of_bridges">IP adresser og porte på broer</string>
+    <string name="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>
@@ -171,43 +85,19 @@
   <string name="reachable_ports">Porte hvor forbindelse kan dannes</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porte bag en restriktiv firewall hvor en forbindelse kan oprettes</string>
   <string name="enter_ports">Indtast porte</string>
-  <string name="enable_hidden_services">Udbyd en service</string>
-  <string name="run_servers_accessible_via_the_tor_network">tillad at en server på enheden er tilgængelig via Tor-netværket</string>
-  <string name="enter_localhost_ports_for_hidden_services">indtast lokale adresser for skjulte services</string>
-  <string name="hidden_service_ports">Skjulte service porte</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">den absolutte sti til din skjulte service (genereres automatisk)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver fejlfindings-log til output (der skal anvendes adb eller aLogCat for at se dette)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver fejlfindings-log til output (der skal anvendes adb eller aLogCat for at se dette)</string>
   <string name="project_home">Projekt hjemmeside(r):</string>
-  <string name="the_tor_license">Tor licensen</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Tredjeparts-software:</string>
+    <string name="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="hidden_service_on">skjult service på:</string>
-  <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
+    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
   <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
-  <string name="unable_to_reset_tor">Genstart din enhed. Ude af stand til at nulstille tor!</string>
-  <string name="pref_use_sys_iptables_title">Anvend standardindstillinger for Iptables</string>
-  <string name="pref_use_sys_iptables_summary">anvend det indbyggede iptables-program i stedet for versionen der følger med Orbot</string>
-  <string name="error_installing_binares">Kunne ikke installere eller opgradere Tor programmerne.</string>
-  <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
+    <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
   <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
-  <string name="notification_using_bridges">Broer er aktiverede!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Sprog</string>
-  <string name="set_locale_summary">Vælg sproginstillinger og sprog for Orbot</string>
-  <string name="wizard_locale_title">Vælg sprog</string>
-  <string name="wizard_locale_msg">Behold standardindstilling eller skift det nuværende sprog</string>
-  <string name="powered_by">drevet af Tor</string>
-  <string name="btn_save_settings">Gem Indstillinger</string>
-  <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
-  <string name="bandwidth_">BÃ¥ndbredde:</string>
-  <string name="down">Ned</string>
-  <string name="up">Op</string>
-  <string name="menu_verify_browser">Browser</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kb">KB</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>
diff --git a/app/src/main/res/values-de-rAT/strings.xml b/app/src/main/res/values-de-rAT/strings.xml
index 844f834c..49c8dbc4 100644
--- a/app/src/main/res/values-de-rAT/strings.xml
+++ b/app/src/main/res/values-de-rAT/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-de/poestrings.xml b/app/src/main/res/values-de/poestrings.xml
index 6bed0225..052b7157 100644
--- a/app/src/main/res/values-de/poestrings.xml
+++ b/app/src/main/res/values-de/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Brücken, sind Tor-Relais die helfen sollen, die Zensur zu umgehen. Sie können Brücken nutzen, wenn Tor von Ihrem Internet-Anbieter blockiert wird; Jeder Brückentyp verwendet eine andere Methode, um Zensur zu vermeiden: Wenn ein Typ nicht funktioniert, versuchen Sie es mit einem anderen Typ.</string>
-
-    <string name="bridges_no">Keine Brücken: Verbinde Direkt mit Tor</string>
-    <string name="bridges_provided">Bereitgestellte Brücken:</string>
-    <string name="bridges_custom">Benutzerdefinierte Brücken</string>
-
-    <string name="bridges_config">Brücken-Konfiguration</string>
-    <string name="action_done">Fertig</string>
 
     <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>
@@ -16,19 +8,6 @@
     <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="status_connected">Verbunden!</string>
-
-    <string name="loading_claim_1">Unsere vielfältige Community macht Tor gro�artig!</string>
-    <string name="loading_claim_2">Menschen verwenden täglich Tor, um zu vermeiden, dass sie aufgrund von Marketingzwecken verfolgt werden.</string>
-    <string name="loading_claim_3">Wenn Facebook blockiert ist, verwenden die Menschen Tor, um sich mit ihren Freunden und ihrer Familie zu verbinden.</string>
-    <string name="loading_claim_4">Aktivisten nutzen Tor, um ihre Meinungen und Ã?berzeugungen frei zu Twittern.</string>
-    <string name="loading_claim_5">Blogger nutzen Tor, um Menschen für soziale Reformen zu gewinnen.</string>
-    <string name="loading_claim_6">Journalisten verwenden Tor, um Investigativ-Stories auf sichere Weise, zu veröffentlichen.</string>
-    <string name="loading_claim_7">Geschäftsleute nutzen Tor, um ihre Unternehmensstrategien Privat zu halten.</string>
-    <string name="loading_claim_8">Arbeitnehmer nutzen Tor, um für Gerechtigkeit zu kämpfen, ohne Angst davor zu haben, ihren Job zu verlieren.</string>
-
-    <string name="status_connecting">Wir verbinden Dich. "=" Wir verbinden Dich.</string>
-
     <string name="hello">Hallo</string>
     <string name="welcome">Willkommen auf der Mobilen Plattform von Tor.</string>
 
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index c9b435da..8f313dfc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,136 +2,46 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Starten und Stoppen von Tor</string>
-  <string name="tor_proxy_service_process">Tor-Vermittlungsdienst</string>
-  <string name="status_starting_up">Orbot startet â?¦</string>
+    <string name="status_starting_up">Orbot startet â?¦</string>
   <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
   <string name="status_disabled">Orbot ist Deaktiviert</string>
   <string name="status_shutting_down">TorService wird heruntergefahren</string>
   <string name="tor_process_starting">Tor-Programm wird gestartet â?¦</string>
   <string name="tor_process_complete">abgeschlossen.</string>
-  <string name="tor_process_waiting">warten.</string>
-  <string name="not_anonymous_yet">ACHTUNG: Ihr Datenverkehr ist noch nicht Anonym! Konfigurieren Sie Ihre Anwendungen so, dass sie HTTP-Proxy 127.0.0.1:8118 oder SOCKS4A oder SOCKS5-Proxy 127.0.0.1:9050 verwenden</string>
-  <string name="menu_home">Start</string>
-  <string name="menu_browse">Durchsuchen</string>
-  <string name="menu_settings">Einstellungen</string>
+    <string name="menu_settings">Einstellungen</string>
   <string name="menu_log">Protokoll</string>
-  <string name="menu_info">Hilfe</string>
-  <string name="menu_apps">Apps...</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">Ã?ber</string>
-  <string name="menu_promo_apps">Weitere Apps â?¦</string>
-  <string name="main_layout_download">Herunterladen</string>
+    <string name="main_layout_download">Herunterladen</string>
   <string name="main_layout_upload">Hochladen</string>
-  <string name="button_help">Hilfe</string>
-  <string name="button_close">SchlieÃ?en</string>
-  <string name="button_about">Ã?ber</string>
-  <string name="button_clear_log">Protokoll löschen</string>
-  <string name="menu_verify">�berprüfen</string>
-  <string name="menu_exit">Beenden</string>
+    <string name="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="press_to_start">- Zum Starten lang gedrückt halten -</string>
-  <string name="pref_trans_proxy_group">Transparente Vermittlung (benötigt Root-Zugriff)</string>
-  <string name="pref_trans_proxy_title">Transparente Vermittlung</string>
-  <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
-  <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
-  <string name="pref_transparent_all_summary">Verbindungen aller Anwendungen durch Tor leiten</string>
-  <string name="pref_transparent_port_fallback_title">Anschluss Proxy Rückfall</string>
-  <string name="pref_transparent_port_fallback_summary">ACHTUNG: Umgeht öffentliche Anschlüsse (80, 443, usw.). *NUR BENUTZEN*, wenn »All« oder »App«-Modus nicht funktioniert.</string>
-  <string name="pref_transparent_port_title">Anschluss-Liste</string>
-  <string name="pref_transparent_port_summary">Liste von Anschlüssen zur Vermittlung. *NUR BENUTZEN* wenn »All« oder »App«-Modus nicht funktioniert</string>
-  <string name="pref_transparent_port_dialog">Anschlüsse zur Vermittlung eingeben</string>
-  <string name="pref_has_root">Anfrage Root-Zugriff</string>
-  <string name="pref_has_root_summary">Anfrage Root-Zugriff für transparente Vermittlung</string>
-  <string name="status_install_success">Die Tor-Programmdateien wurden erfolgreich installiert!</string>
-  <string name="status_install_fail">Die Tor-Programmdateien konnten nicht erfolgreich installiert werden. Bitte prüfen Sie das Protokoll und wenden Sie sich an tor-assistants@xxxxxxxxxxxxxx.</string>
-  <string name="title_error">Anwendungsfehler</string>
-  <string name="wizard_title">Willkommen bei Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ã?ber Orbot</string>
-  <string name="btn_next">Weiter</string>
-  <string name="btn_back">Zurück</string>
-  <string name="btn_finish">Fertigstellen</string>
-  <string name="btn_okay">Okay</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>
-  <string name="wizard_permissions_root">Berechtigung erteilt</string>
-  <string name="wizard_permissions_stock">Orbot-Berechtigungen</string>
-  <string name="wizard_premissions_msg_root">Ausgezeichnet! Sie haben Orbot Root-Rechte eingeräumt. Orbot wird diese Berechtigung sinnvoll verwenden.</string>
-  <string name="wizard_permissions_msg_stock">Es ist nicht zwingend erforderlich, aber Orbot kann ein leistungsfähigeres Werkzeug werden, wenn Ihr Gerät gerootet ist. Drücken Sie unten auf den Schalter, um Orbot Superuser-Rechte zu gewähren.</string>
-  <string name="wizard_permissions_no_root">Wenn du keinen Root-Zugriff hast oder keine Ahnung hast, wovon wir reden, solltest du nur Apps verwenden, die für die Zusammenarbeit mit Orbot entwickelt wurden.</string>
-  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Root weitermachen</string>
-  <string name="wizard_permission_enable_root">Root-Zugriff für Orbot gewähren</string>
-  <string name="wizard_configure">Konfiguriere Torifikation</string>
-  <string name="wizard_configure_msg">Orbot lässt Ihnen die Wahl, den Datenverkehr aller Anwendungen durch Tor zu leiten ODER einzelne Anwendungen auszuwählen.</string>
-  <string name="wizard_configure_all">Den Verkehr aller Anwendungen durch Tor leiten</string>
-  <string name="wizard_configure_select_apps">Wählen Sie individuell Apps für Tor</string>
-  <string name="wizard_tips_tricks">Aktive Orbot Anwendungen</string>
-  <string name="wizard_tips_msg">Die Folgenden Apps wurden für die Zusammenarbeit mit Orbot entwickelt. Klicken Sie auf die einzelnen Schaltflächen, um sie zu Installieren, oder Sie finden sie später auf Google Play auf der Website von GuardianProject.info oder über F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Sicherer Sofortnachrichtendienst für Android</string>
-  <string name="wizard_tips_proxy">Vermittlungseinstellungen - Lernen, wie Sie Anwendungen so konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo-Suchmaschinen-App</string>
-  <string name="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Anschluss 8118 einstellen</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Erstelle eine Geschichte und überlasse die Sicherheit, Tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Vermittlungseinstellungen</string>
-  <string name="wizard_proxy_help_msg">Wenn die verwendete Android-App die Nutzung eines HTTP- oder SOCKS-Proxys unterstützt, kann sie mit Orbot verknüpft werden und Tor nutzen.\n\n\n    Die Einstellung für \'Host\' ist 127.0.0.1 oder \'localhost\'. Für HTTP wird der Port 8118 eingetragen. Für SOCKS der Port 9050. Sie sollten möglichst SOCKS4A oder SOCKS5 verwenden.\n\n\n\n Mehr Informationen zur Verwendung von Proxys unter Android finden Sie in den FAQ auf http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot ist bereit!</string>
-  <string name="wizard_final_msg">Millionen Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen.\n\nJournalisten und Blogger, Verteidiger für Menschenrechte, Polizeibeamte, Soldaten, Firmen, Bürger repressiver Regime und ganz normale Menschen � und Sie können das auch!</string>
-  <string name="wizard_exit_at_first_screen_toast">Bitte konfigurieren Sie Orbot, bevor Sie es verwenden können!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Sie haben sich Erfolgreich mit dem Tor-Netzwerk verbunden - was aber NICHT bedeutet, dass Ihr Gerät sicher ist. Sie können den Knopf »Browser« verwenden, um Ihre Verbindung zu überprüfen. \n\nBesuchen Sie uns auf https://guardianproject.info/apps/orbot oder senden Sie uns eine E-Mail an help@xxxxxxxxxxxxxxxxxxxx, um mehr zu erfahren.</string>
-  <string name="tor_check">Durch das Bestätigen mit »OK« wird die Seite https://check.torproject.org in Ihrem Webbrowser geöffnet, sodass Sie überprüfen können, ob Orbot richtig konfiguriert ist und Sie mit Tor verbunden sind.</string>
-  <string name="pref_hs_group">Versteckter Dienst</string>
-  <string name="pref_general_group">Allgemein</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-->
-  <string name="wizard_title_msg">Orbot bringt Tor zu Android!\n\nTor unterstützt Sie, sich gegen Zensur, Datenrückverfolgung und die �berwachung des Netzes zu wehren, die Ihre Privatsphäre, vertraulichen Informationen und persönlichen Beziehungen bedrohen.\n\nDieser Assistent hilft Ihnen dabei, Orbot und Tor auf Ihrem Gerät einzurichten.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Achtung</string>
-  <string name="wizard_warning_msg">Durch die einfache Installation von Orbot wird Ihr mobiler Datenverkehr nicht automatisch anonymisiert.\n\nSie müssen Orbot, Ihr Gerät und andere Apps ordnungsgemä� konfigurieren, um Tor erfolgreich zu nutzen.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Zugriffsrechte</string>
-  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise Rootzugriff gewähren, um erweiterte Funktionen zu aktivieren, wie z.B. Transparente Vermittlung.</string>
-  <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht tun möchten, verwenden Sie bitte Apps, die für die Zusammenarbeit mit Orbot entwickelt wurden</string>
-  <string name="wizard_permissions_no_root_msg">Ihr Gerät scheint nicht Gerootet zu sein oder stellt keinen Root oder \'Superuser-Zugriff\' bereit.\n\nBitte nutzen Sie den \'Apps\' Modus auf dem Hauptbildschirm.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aktive Orbot Anwendungen</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Sichere Chat-App mit OTR-Verschlüsselung</string>
-  <string name="wizard_tips_orweb">Orfox: Privatsphären-Optimierter Browser, der über Tor läuft</string>
-  <string name="wizard_tips_play">Finde alle Guardian Project Apps im Google Play Store</string>
-  <string name="wizard_tips_fdroid">Finde alle Guardian Project Apps bei F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Finde alle Guardian Project Apps unter https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparente Vermittlung</string>
-  <string name="wizard_transproxy_msg">Dadurch können Ihre Apps ohne Konfiguration automatisch durch das Tor-Netzwerk laufen.</string>
-  <string name="wizard_transproxy_hint">(Dieses Feld auswählen, wenn Sie nicht wissen wovon wir reden)</string>
-  <string name="wizard_transproxy_none">Nichts</string>
-  <string name="pref_transparent_tethering_title">Tor-Anbindung</string>
-  <string name="pref_transparent_tethering_summary">Aktiviere Transparente Tor-Vermittlung für WLAN und angebundene USB-Geräte (Benötigt Neustart)</string>
-  <string name="button_grant_superuser">Superuser-Zugriff anfordern</string>
-  <string name="pref_select_apps">Wähle Apps</string>
-  <string name="pref_select_apps_summary">Wähle die Apps aus, die durch Tor vermittelt werden sollen</string>
-  <string name="pref_node_configuration">Netzknoten-Konfiguration</string>
+    <!--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="button_proxy_all">Alles über Proxy</string>
-  <string name="button_proxy_none">Nichts über Proxy</string>
-  <string name="button_invert_selection">Auswahl umkehren</string>
-  <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy (Optional)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Ausgehendes Proxy-Passwort</string>
   <string name="pref_proxy_password_summary">Proxy-Passwort (Optional)</string>
   <string name="pref_proxy_password_dialog">Proxy-Passwort eingeben</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Volle Transparent-Vermittlung wird eingestellt â?¦</string>
-  <string name="setting_up_app_based_transparent_proxying_">Appbasierte Transparente Vermittlung wird eingestellt â?¦</string>
-  <string name="transparent_proxying_enabled">Transparente Vermittlung AKTIVIERT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy für Anbindung Aktiviert!</string>
-  <string name="warning_error_starting_transparent_proxying_">ACHTUNG: Fehler beim Starten der Transparenten Vermittlung!</string>
-  <string name="transproxy_rules_cleared">TransProxy Regeln gelöscht</string>
-  <string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
-  <string name="privoxy_is_running_on_port_">Polipo läuft auf Anschluss: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Anschlussbasierte Transparente Vermittlung wird eingestellt â?¦</string>
-  <string name="bridge_error">Brückenfehler</string>
-  <string name="bridge_requires_ip">Um die Brückenfunktion nutzen zu können, müssen Sie mindestens eine Brücken-IP-Adresse eingeben.</string>
-  <string name="send_email_for_bridges">Sende eine E-Mail an bridges@xxxxxxxxxxxxxx mit dem Text »get bridges« im Nachrichtenfeld senden.</string>
-  <string name="error">Fehler</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>
@@ -173,10 +71,8 @@
   <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="bridges_obfuscated">Verschleierte Brücken</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiviere alternative Zugangswege ins Tor-Netzwerk</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls konfigurierte Brücken verschleierte Brücken sind</string>
-  <string name="ip_address_and_port_of_bridges">IP-Adresse und Anschluss der Brücken</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>
@@ -192,17 +88,10 @@
   <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_hidden_services">Versteckte Dienste</string>
-  <string name="run_servers_accessible_via_the_tor_network">Erlaube, das der Auf-dem-Gerät-Server erreichbar ist über das Tor-Netzwerk</string>
-  <string name="enter_localhost_ports_for_hidden_services">Lokale Anschlüsse für versteckte Dienste eingeben</string>
-  <string name="hidden_service_ports">Anschlüsse der versteckten Dienste</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Deinen versteckten Dienst  (automatisch generiert)</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="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="the_tor_license">Die Tor-Lizenz</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Drittanbieteranwendungen:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">Versteckte Dienste auf:</string>
-  <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
+    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
   <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
-  <string name="unable_to_reset_tor">Starten Sie Ihr Gerät neu, Tor konnte nicht zurückgesetzt werden!</string>
-  <string name="pref_use_sys_iptables_title">Vorgegebene IPtables verwenden</string>
-  <string name="pref_use_sys_iptables_summary">Vorhandene IPtables-Datei verwenden, anstatt der von Orbot mitgelieferten.</string>
-  <string name="error_installing_binares">Die Tor-Programmdateien konnten nicht installiert oder aktualisiert werden.</string>
-  <string name="pref_use_persistent_notifications">Behalte immer das Symbol in der Symbolleiste, wenn Orbot verbunden ist</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="notification_using_bridges">Brücken Aktiviert!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Sprache</string>
-  <string name="set_locale_summary">Wähle das Gebietsschema und die Sprache für Orbot</string>
-  <string name="wizard_locale_title">Sprache auswählen</string>
-  <string name="wizard_locale_msg">Belassen Sie den Standardwert oder wechseln Sie die derzeitige Sprache</string>
-  <string name="powered_by">Betrieben von Tor</string>
-  <string name="btn_save_settings">Speichere Einstellungen</string>
-  <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft...</string>
-  <string name="bandwidth_">Bandbreite:</string>
-  <string name="down">runter</string>
-  <string name="up">hoch</string>
-  <string name="pref_disable_network_title">Kein Automatischer Netzwerk Ruhezustand</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="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Nutze ChatSecure</string>
-  <string name="permission_manage_tor_label">Tor verwalten</string>
-  <string name="permission_manage_tor_description">Aktiviere diese App, um den Tor-Dienst zu kontrollieren</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funktioniert am Besten mit dem Orfox-Browser. Jetzt Installieren?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funktioniert am Besten mit dem Orfox-Browser. Jetzt Installieren?</string>
   <string name="install_apps_">Browser installieren?</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>
@@ -258,19 +128,7 @@
   <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="wizard_tips_martus">Mobile Martus - Benetech-App zur Menschenrechtsdokumentation</string>
-  <string name="your_tor_public_ips_">Deine Ã?ffentlichen Tor IPs:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Bitte deaktivieren Sie diese Anwendung unter Android-&gt;Einstellungen-&gt;Anwendungen, falls Sie Probleme mit Orbot haben:</string>
-  <string name="app_conflict">App-Konflikt</string>
-  <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string>
-  <string name="pref_transproxy_refresh_summary">Transproxy-Regeln erneut anwenden, wenn sich der Netzwerkstatus ändert</string>
-  <string name="pref_transproxy_flush_title">Transproxy ENTFERNEN ERZWINGEN</string>
-  <string name="pref_transproxy_flush_summary">Hier Tippen, um JETZT alle Transparent-Proxy Netzwerkregeln zu löschen</string>
-  <string name="transparent_proxy_rules_flushed_">Regeln vom Transparenten Proxy geleert!</string>
-  <string name="you_do_not_have_root_access_enabled">Sie haben keinen ROOT-Zugriff Aktiviert</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Sie müssen Tor Stoppen und Erneut Starten, um die Einstellungen zu übernehmen.</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">Kbit/s</string>
+    <string name="kbps">Kbit/s</string>
   <string name="mbps">Mbit/s</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Netz</string>
   <string name="activate">Aktivieren</string>
   <string name="apps_mode">VPN Modus</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Sie können Apps aktivieren, um mit dem integrierten Orbot VPN durch Tor zu gehen.\n\nDies wird Sie nicht anonym machen, aber es wird Ihnen helfen, durch Firewalls zu kommen.</string>
-  <string name="send_email">E-Mail senden</string>
+    <string name="send_email">E-Mail senden</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Sie können eine Brücken-Adresse per E-Mail, im Web oder per Scan eines BrückenQR-Codes erhalten. Wählen Sie unten \'E-Mail\' oder \'Web\', um eine Brückenadresse anzufordern.\n\nSobald Sie eine Adresse haben, fügen Sie diese bei den Einstellungen für Brücken ein und starten Sie Orbot neu.</string>
   <string name="install_orweb">Installiere Orfox</string>
-  <string name="standard_browser">Standard-Browser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HINWEIS: Nur die Standard Tor-Brücken funktionieren mit Intel X86/Atom Geräten</string>
-  <string name="vpn_default_world">Global (Automatisch)</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="ports">Anschlüsse</string>
-  <string name="local_port">Lokaler Anschluss</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Berechtigung erteilt</string>
-  <string name="permission_denied">Zugriff verweigert</string>
-  <string name="restore_backup">Sicherung wiederherstellen</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Aktiviere bitte den VPN-Modus, um Apps die Nutzung von Tor zu ermöglichen</string>
-  <string name="app_shortcuts">Tor-Aktivierte Apps</string>
-  <string name="title_activity_bridge_wizard">BrückenAssistentAktivität</string>
-  <string name="testing_bridges">Brücken-Verbindung zu Tor wird getestet ....</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>
diff --git a/app/src/main/res/values-el/poestrings.xml b/app/src/main/res/values-el/poestrings.xml
index 88156a42..0676df68 100644
--- a/app/src/main/res/values-el/poestrings.xml
+++ b/app/src/main/res/values-el/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Î?ι γέÏ?Ï?Ï?εÏ? είναι κÏ?μβοι Tor Ï?οÏ? βοηθοÏ?ν Ï?Ï?ην καÏ?αÏ?Ï?Ï?αÏ?ήγηÏ?η Ï?ηÏ? λογοκÏ?ιÏ?ίαÏ?. Î?Ï?οÏ?είÏ?ε να δοκιμάÏ?εÏ?ε Ï?ιÏ? γέÏ?Ï?Ï?εÏ? εάν ο Tor είναι αÏ?οκλειÏ?μένοÏ? αÏ?Ï? Ï?ον ISP Ï?αÏ?· κάθε Ï?Ï?Ï?οÏ? γέÏ?Ï?Ï?αÏ? Ï?Ï?ηÏ?ιμοÏ?οιεί διαÏ?οÏ?εÏ?ική μέθοδο
-για να αÏ?οÏ?Ï?γεÏ?ε Ï?η λογοκÏ?ιÏ?ία: εάν έναÏ? Ï?Ï?Ï?οÏ? δεν λειÏ?οÏ?Ï?γεί, δοκιμάÏ?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε έναν διαÏ?οÏ?εÏ?ικÏ? Ï?Ï?Ï?ο.</string>
-
-    <string name="bridges_no">ΧÏ?Ï?ίÏ? Î?έÏ?Ï?Ï?εÏ?: Î?μεÏ?η Ï?Ï?νδεÏ?η με Ï?ο Tor</string>
-    <string name="bridges_provided">ΠÏ?οÏ?Ï?εÏ?Ï?μενεÏ? γέÏ?Ï?Ï?εÏ?: </string>
-    <string name="bridges_custom">ΠÏ?οÏ?αÏ?μοÏ?μένεÏ? Î?έÏ?Ï?Ï?εÏ?</string>
-
-    <string name="bridges_config">Î?ιαμÏ?Ï?Ï?Ï?Ï?η Î?εÏ?Ï?Ï?Ï?ν </string>
-    <string name="action_done">ΤέλοÏ?</string>
 
     <string name="bridges_sometimes">Î?εÏ?ικέÏ? Ï?οÏ?έÏ? Ï?Ï?ειάζεÏ?Ï?ε μια γέÏ?Ï?Ï?α για να Ï?Ï?ηÏ?ιμοÏ?οίηÏ?εÏ?ε Ï?ο Tor.</string>
     <string name="action_more">ΠÎ?Σ Î?Î?Î¥ ΠÎ?ΡÎ?ΣΣÎ?ΤÎ?ΡÎ?</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">Î?Ï?Ï?Ï? θα γίνει ανÏ?νÏ?μα, αλλά θα Ï?αÏ? βοηθήÏ?ει να Ï?εÏ?άÏ?εÏ?ε μέÏ?α αÏ?Ï? Ï?είÏ?η Ï?Ï?οÏ?Ï?αÏ?ίαÏ?.</string>
     <string name="action_vpn_choose">Î?ΠÎ?Î?Î?Î?Î? Î?ΦÎ?ΡÎ?Î?Î?ΩÎ?</string>
 
-    <string name="status_connected">ΣÏ?νδέθηκε!</string>
-
-    <string name="loading_claim_1">Î?ία Ï?οικιλÏ?μοÏ?Ï?η κοινÏ?Ï?ηÏ?α είναι αÏ?Ï?Ï? Ï?οÏ? κάνει Ï?ο Tor Ï?Ï?οÏ?δαίο!</string>
-    <string name="loading_claim_2">Î?αθημεÏ?ινά άνθÏ?Ï?Ï?οι Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για να αÏ?οÏ?Ï?γοÏ?ν να ακολοÏ?θοÏ?νÏ?αι αÏ?Ï? διαÏ?ημίÏ?ειÏ?.</string>
-    <string name="loading_claim_3">Î?Ï?αν Ï?ο Facebook είναι αÏ?οκλειÏ?μένο, οι άνθÏ?Ï?Ï?οι Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για να Ï?Ï?νδεθοÏ?ν με Ï?ίλοÏ?Ï? και Ï?ην οικογένεια Ï?οÏ?Ï?.</string>
-    <string name="loading_claim_4">Î?κÏ?ιβιÏ?Ï?έÏ? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για διÏ?δÏ?Ï?οÏ?ν ελεÏ?θεÏ?α Ï?ιÏ? αÏ?Ï?Ï?ειÏ? και Ï?ιÏ? Ï?εÏ?οιθήÏ?ειÏ? Ï?οÏ?Ï?.</string>
-    <string name="loading_claim_5">Î?ί μÏ?λÏ?γκεÏ? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για να Ï?Ï?Ï?Ï?ειÏ?Ï?Ï?οÏ?ν Ï?ον κÏ?Ï?μο Ï?Ï?οÏ? Ï?ην κοινÏ?νική μεÏ?αÏ?Ï?Ï?θμιÏ?η.</string>
-    <string name="loading_claim_6">Î?ι δημοÏ?ιογÏ?άÏ?οι Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για αÏ?Ï?αλή διεÏ?εÏ?νηÏ?η ιÏ?Ï?οÏ?ιÏ?ν Ï?οÏ? αναÏ?έÏ?οÏ?ν.</string>
-    <string name="loading_claim_7">Î?Ï?ιÏ?ειÏ?ημαÏ?ίεÏ? Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για να κÏ?αÏ?ήÏ?οÏ?ν κÏ?Ï?Ï?η Ï?ην Ï?Ï?Ï?αÏ?ηγική Ï?ηÏ? εÏ?αιÏ?ίαÏ? Ï?οÏ?Ï?.</string>
-    <string name="loading_claim_8">Î?Ï?γαζÏ?μενοι Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Tor για να Ï?ολεμήÏ?οÏ?ν για δικαιοÏ?Ï?νη, Ï?Ï?Ï?ίÏ? Ï?ον Ï?Ï?βο να Ï?άÏ?οÏ?ν Ï?ην δοÏ?λειά Ï?οÏ?Ï?.</string>
-
-    <string name="status_connecting">ΣαÏ? Ï?Ï?νδέοÏ?με.\" = \"ΣαÏ? Ï?Ï?νδέοÏ?με.</string>
-
     <string name="hello">Î?εια</string>
     <string name="welcome">Î?αλÏ?Ï? ήÏ?θαÏ?ε Ï?Ï?ο Tor για κινηÏ?Ï?.</string>
 
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 12015e1c..5f294870 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Το Orbot είναι μια δÏ?Ï?εάν εÏ?αÏ?μογή μεÏ?ολάβηÏ?ηÏ? Ï?οÏ? εÏ?ιÏ?Ï?έÏ?ει Ï?ε άλλεÏ? εÏ?αÏ?μογέÏ? να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ο Î?ιαδίκÏ?Ï?ο με Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?η αÏ?Ï?άλεια. Το Orbot Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ον Tor για Ï?ην κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η Ï?ηÏ? διαδικÏ?Ï?ακήÏ? Ï?αÏ? κίνηÏ?ηÏ? και Ï?Ï?η Ï?Ï?νέÏ?εια Ï?ην κÏ?Ï?βει αναÏ?ηδÏ?νÏ?αÏ? μέÏ?Ï? μιαÏ? Ï?ειÏ?άÏ? Ï?Ï?ολογιÏ?Ï?Ï?ν Ï?ε Ï?λο Ï?ον κÏ?Ï?μο. Το Tor είναι ελεÏ?θεÏ?ο λογιÏ?μικÏ? και ένα ανοιÏ?Ï?Ï? δίκÏ?Ï?ο Ï?οÏ? Ï?αÏ? βοηθά να Ï?Ï?αθείÏ?ε ενάνÏ?ια Ï?ε μια μοÏ?Ï?ή εÏ?ιÏ?ήÏ?ηÏ?ηÏ? δικÏ?Ï?οÏ? Ï?οÏ? αÏ?ειλεί Ï?ην Ï?Ï?οÏ?Ï?Ï?ική ελεÏ?θεÏ?ία και ιδιÏ?Ï?ικÏ?Ï?ηÏ?α, εμÏ?ιÏ?Ï?εÏ?Ï?ικέÏ? εÏ?ιÏ?ειÏ?ημαÏ?ικέÏ? δÏ?αÏ?Ï?ηÏ?ιÏ?Ï?ηÏ?εÏ? και Ï?Ï?Î
 ­Ï?ειÏ?, και Ï?ην κÏ?αÏ?ική αÏ?Ï?άλεια γνÏ?Ï?Ï?ή Ï?Ï? traffic analysis.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">εκκίνηÏ?η και διακοÏ?ή Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Το Orbot ξεκινά</string>
+    <string name="status_starting_up">Το Orbot ξεκινά</string>
   <string name="status_activated">ΣÏ?νδέθηκε Ï?Ï?ο δίκÏ?Ï?ο Tor</string>
   <string name="status_disabled">\"Το Orbot είναι Î?Ï?ενεÏ?γοÏ?οιημένο</string>
   <string name="status_shutting_down">Î? Ï?Ï?ηÏ?εÏ?ία Tor Ï?εÏ?μαÏ?ίζεÏ?αι</string>
   <string name="tor_process_starting">Î?κκίνηÏ?η Ï?οÏ? Ï?ελάÏ?η Tor...</string>
   <string name="tor_process_complete">ολοκληÏ?Ï?θηκε...</string>
-  <string name="tor_process_waiting">αναμονή</string>
-  <string name="not_anonymous_yet">ΠΡÎ?Î?Î?Î?Î?ΠÎ?Î?Î?ΣÎ?: Î? κÏ?κλοÏ?οÏ?ία Ï?αÏ? δεν είναι ακÏ?μη ανÏ?νÏ?μη! ΡÏ?θμίÏ?Ï?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?Ï? Ï?ληÏ?εξοÏ?Ï?ιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Î?Ï?Ï?ική</string>
-  <string name="menu_browse">ΠεÏ?ιήγηÏ?η</string>
-  <string name="menu_settings">ΡÏ?θμίÏ?ειÏ?</string>
+    <string name="menu_settings">ΡÏ?θμίÏ?ειÏ?</string>
   <string name="menu_log">Î?αÏ?αγÏ?αÏ?ή</string>
-  <string name="menu_info">Î?οήθεια</string>
-  <string name="menu_apps">Î?Ï?αÏ?μογέÏ?...</string>
-  <string name="menu_start">Î?κκίνηÏ?η</string>
+    <string name="menu_start">Î?κκίνηÏ?η</string>
   <string name="menu_stop">Î?ιακοÏ?ή</string>
   <string name="menu_about">ΣÏ?εÏ?ικά</string>
-  <string name="menu_promo_apps">Î?Ï?οκÏ?ήÏ?Ï?ε εÏ?αÏ?μογέÏ?...</string>
-  <string name="main_layout_download">Î?ήÏ?η (Ï?αÏ?Ï?Ï?ηÏ?α/Ï?Ï?νολο)</string>
+    <string name="main_layout_download">Î?ήÏ?η (Ï?αÏ?Ï?Ï?ηÏ?α/Ï?Ï?νολο)</string>
   <string name="main_layout_upload">Î?Ï?οÏ?Ï?ολή (Ï?αÏ?Ï?Ï?ηÏ?α/Ï?Ï?νολο)</string>
-  <string name="button_help">Î?οήθεια</string>
-  <string name="button_close">Î?λείÏ?ιμο</string>
-  <string name="button_about">ΣÏ?εÏ?ικά</string>
-  <string name="button_clear_log">Î?ιαγÏ?αÏ?ή Î?αÏ?αγÏ?αÏ?ήÏ?</string>
-  <string name="menu_verify">Î?λεγÏ?οÏ?</string>
-  <string name="menu_exit">Î?ξοδοÏ?</string>
+    <string name="button_about">ΣÏ?εÏ?ικά</string>
+    <string name="menu_exit">Î?ξοδοÏ?</string>
   <string name="menu_scan">ΣάÏ?Ï?Ï?η BridgeQR</string>
   <string name="menu_share_bridge">Î?οινή Ï?Ï?ήÏ?η BridgeQR</string>
-  <string name="press_to_start">-για να εκκινήÏ?ει κÏ?αÏ?ήÏ?Ï?ε Ï?ο Ï?αÏ?ημένο-</string>
-  <string name="pref_trans_proxy_group">Î?ιαÏ?ανήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομηÏ?Ï?ήÏ? (Î?Ï?αιÏ?εί διαÏ?είÏ?ιÏ?η root)</string>
-  <string name="pref_trans_proxy_title">Î?ιαÏ?ανήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομηÏ?Ï?ήÏ?</string>
-  <string name="pref_trans_proxy_summary">Î?Ï?Ï?Ï?μαÏ?η ΠÏ?οÏ?αÏ?μογή Î?Ï?αÏ?μογÏ?ν Ï?Ï?ο Tor</string>
-  <string name="pref_transparent_all_title">Î?νÏ?νÏ?μοÏ?οίηÏ?η Î?λÏ?ν</string>
-  <string name="pref_transparent_all_summary">Î?α γίνεÏ?αι η μεÏ?αβίβαÏ?η Ï?ηÏ? κÏ?κλοÏ?οÏ?ίαÏ? Ï?λÏ?ν Ï?Ï?ν εÏ?αÏ?μογÏ?ν μέÏ?Ï? Ï?οÏ? Tor</string>
-  <string name="pref_transparent_port_fallback_title">Î?Ï?Ï?α αναδίÏ?λÏ?Ï?ηÏ? Ï?οÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή</string>
-  <string name="pref_transparent_port_fallback_summary">ΠΡÎ?Î?Î?Î?Î?ΠÎ?Î?Î?ΣÎ?: ΠαÏ?ακάμÏ?Ï?ει Ï?ιÏ? κοινέÏ? θÏ?Ï?εÏ? (80, 443, κλÏ?). *Î?Î? ΧΡÎ?ΣÎ?Î?Î?ΠÎ?Î?Î?Î?ΤÎ?Î? Î?Î?Î?Î?Î?* Ï?Ï?αν οι λειÏ?οÏ?Ï?γίεÏ? \'All\' ή \'App\' δεν αÏ?οδίδοÏ?ν.</string>
-  <string name="pref_transparent_port_title">Î?ίÏ?Ï?α θÏ?Ï?Ï?ν</string>
-  <string name="pref_transparent_port_summary">Î?ίÏ?Ï?α θÏ?Ï?Ï?ν Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή. *Î?Î? ΧΡÎ?ΣÎ?Î?Î?ΠÎ?Î?Î?Î?ΤÎ?Î? Î?Î?Î?Î?Î?* Ï?Ï?αν οι λειÏ?οÏ?Ï?γίεÏ? \'All\' ή \'App\' δεν αÏ?οδίδοÏ?ν.</string>
-  <string name="pref_transparent_port_dialog">Î?ιÏ?άγεÏ?ε θÏ?Ï?εÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή</string>
-  <string name="pref_has_root">Î?ιÏ?ημα Ï?Ï?Ï?Ï?βαÏ?ηÏ? με δικαιÏ?μαÏ?α Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η</string>
-  <string name="pref_has_root_summary">Î?ιÏ?ημα Ï?Ï?Ï?Ï?βαÏ?ηÏ? με δικαιÏ?μαÏ?α Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η για διαÏ?ανή μεÏ?αβίβαÏ?η δεδομένÏ?ν μέÏ?Ï? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή</string>
-  <string name="status_install_success">Τα δÏ?αδικά αÏ?Ï?εία Ï?οÏ? Tor εγκαÏ?αÏ?Ï?άθηκαν με εÏ?ιÏ?Ï?Ï?ία!</string>
-  <string name="status_install_fail">Τα δÏ?αδικά αÏ?Ï?εία Ï?οÏ? Tor δεν εγκαÏ?αÏ?Ï?άθηκαν. Î?λέγξÏ?ε Ï?ιÏ? καÏ?αγÏ?αÏ?έÏ? και ειδοÏ?οιείÏ?Ï?ε Ï?Ï?ην διεÏ?θÏ?νÏ?η tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ΣÏ?άλμα εÏ?αÏ?μογήÏ?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">ΣÏ?εÏ?ικά με Ï?ο Orbot</string>
-  <string name="btn_next">Î?Ï?Ï?μενο</string>
-  <string name="btn_back">ΠίÏ?Ï?</string>
-  <string name="btn_finish">ΤέλοÏ?</string>
-  <string name="btn_okay">Okay</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Î? άδεια Ï?αÏ?αÏ?Ï?Ï?ήθηκε</string>
-  <string name="wizard_permissions_stock">Î?δειεÏ? Orbot</string>
-  <string name="wizard_premissions_msg_root">Î?αλÏ?Ï?! Î?ιαÏ?ιÏ?Ï?Ï?νοÏ?με Ï?Ï?ι έÏ?εÏ?ε ενεÏ?γοÏ?οιημένο Ï?ον Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η για Ï?ο Orbot. Î?α Ï?Ï?ηÏ?ιμοÏ?οιήÏ?οÏ?με Ï?ο Ï?Ï?ονÏ?μιο αÏ?Ï?Ï? με Ï?Ï?νεÏ?η.</string>
-  <string name="wizard_permissions_msg_stock"> Î?ν και δεν είναι αÏ?αÏ?αίÏ?ηÏ?ο, Ï?ο Orbot μÏ?οÏ?εί να γίνει ιÏ?Ï?Ï?Ï?Ï?Ï?εÏ?ο Ï?Ï?αν η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? έÏ?ει διαμοÏ?Ï?Ï?θεί για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η. ΠαÏ?ήÏ?Ï?ε Ï?ο Ï?ιο κάÏ?Ï? κοÏ?μÏ?ί για να δÏ?Ï?εÏ?ε αÏ?ξημένα δικαιÏ?μαÏ?α Ï?Ï?ο Orbot! </string>
-  <string name="wizard_permissions_no_root">Î?ν δεν διαθέÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?εÏ?Ï?ήÏ?Ï?η ή δεν καÏ?αλαβαίνεÏ?ε Ï?ι εννοοÏ?με, αÏ?λÏ?Ï? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?ιάÏ?Ï?ηκαν για να Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot.</string>
-  <string name="wizard_permissions_consent">Î?αÏ?αλαβαίνÏ? και θέλÏ? να Ï?Ï?νεÏ?ίÏ?Ï? Ï?Ï? Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?ηÏ?</string>
-  <string name="wizard_permission_enable_root">Î?Ï?Ï?δοÏ?η Î?ιαÏ?ειÏ?ιÏ?ηÏ? Ï?Ï?ο Orbot</string>
-  <string name="wizard_configure">ΡÏ?θμιÏ?η Torification</string>
-  <string name="wizard_configure_msg">Το Orbot Ï?αÏ? εÏ?ιÏ?Ï?έÏ?ει να καÏ?εÏ?θÏ?νεÏ?ε Ï?λη Ï?ην κÏ?κλοÏ?οÏ?ία κάÏ?οιαÏ? εÏ?αÏ?μογήÏ? Ï?Ï?οÏ? Ï?ο Tor ή να εÏ?ιλέξεÏ?ε κάθε μια εÏ?αÏ?μογή ξεÏ?Ï?Ï?ιÏ?Ï?ά.</string>
-  <string name="wizard_configure_all">Το Tor να γίνει ενδιάμεÏ?οÏ? διακομιÏ?Ï?ήÏ? Proxy για Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ?</string>
-  <string name="wizard_configure_select_apps">Î?Ï?ιλογή μεμονÏ?μένÏ?ν εÏ?αÏ?μογÏ?ν για Ï?ο Tor</string>
-  <string name="wizard_tips_tricks">Î?Ï?αÏ?μογέÏ? Ï?Ï?μβαÏ?έÏ? για Orbont</string>
-  <string name="wizard_tips_msg">Î?ι Ï?αÏ?ακάÏ?Ï? εÏ?αÏ?μογέÏ? αναÏ?Ï?Ï?Ï?θηκαν Ï?Ï?Ï?ε να λειÏ?οÏ?Ï?γοÏ?ν με Ï?ο Orbot. ΠαÏ?ήÏ?Ï?ε Ï?ε κάθε κοÏ?μÏ?ί για να εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?α ή μÏ?οÏ?είÏ?ε να Ï?ιÏ? βÏ?είÏ?ε αÏ?γÏ?Ï?εÏ?α Ï?Ï?ο Android Market</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Î?Ï?αÏ?μογή αÏ?Ï?αλοÏ?Ï? ανÏ?αλλαγήÏ? άμεÏ?Ï?ν μηνÏ?μάÏ?Ï?ν για Android</string>
-  <string name="wizard_tips_proxy">ΡÏ?θμίÏ?ειÏ? proxy: Î?άθεÏ?ε Ï?Ï?Ï? θα Ï?Ï?θμίÏ?εÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?Ï?Ï?ε να λειÏ?οÏ?Ï?γοÏ?ν με Ï?ο Orbot</string>
-  <string name="wizard_tips_duckgo">Î?Ï?αÏ?μογή Î?ηÏ?ανήÏ? Î?ναζήÏ?ηÏ?ηÏ? Duckduckgo</string>
-  <string name="wizard_tips_twitter">Το Twitter Ï?Ï?οÏ?Ï?ηÏ?ίζει http proxy localhost:8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ΦÏ?ιάξÏ?ε μια ιÏ?Ï?οÏ?ία και αÏ?ήÏ?Ï?ε Ï?ην Ï?Ï?ο tor για αÏ?Ï?άλεια!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">ΡÏ?θμίÏ?ειÏ? proxy</string>
-  <string name="wizard_proxy_help_msg">Î?άν η εÏ?αÏ?μογή Android Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε μÏ?οÏ?εί να Ï?Ï?οÏ?Ï?ηÏ?ίξει Ï?η Ï?Ï?ήÏ?η ενÏ?Ï? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? HTTP ή SOCKS, Ï?Ï?Ï?ε μÏ?οÏ?είÏ?ε να Ï?ην Ï?Ï?θμίÏ?εÏ?ε Ï?Ï?Ï?ε να Ï?Ï?νδέεÏ?αι Ï?Ï?ο Orbot και να Ï?Ï?ηÏ?ιμοÏ?οιεί Ï?ον Tor.\n\n\n Î?ι Ï?Ï?θμίÏ?ειÏ? κενÏ?Ï?ικοÏ? Ï?Ï?ολογιÏ?Ï?ή είναι 127.0.0.1 ή \"localhost\". Î?ια Ï?ο HTTP, η Ï?Ï?θμιÏ?η θÏ?Ï?αÏ? είναι 8118. Î?ια Ï?ο SOCKS, ο proxy είναι 9050. Î?α Ï?Ï?έÏ?ει να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε SOCKS4A ή SOCKS5, αν είναι δÏ?ναÏ?Ï?ν.\n \n\n\n Î?Ï?οÏ?είÏ?ε να μάθεÏ?ε Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α Ï?Ï?εÏ?ικά με Ï?ο proxying Ï?ε Android μέÏ?Ï? Ï?οÏ? FAQ Ï?Ï?ο: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Το Orbot είναι έÏ?οιμο!</string>
-  <string name="wizard_final_msg">Î?καÏ?ομμÏ?Ï?ια άνθÏ?Ï?Ï?οι Ï?ε Ï?λο Ï?ον κÏ?Ï?μο Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?ον Tor για διάÏ?οÏ?οÏ?Ï? λÏ?γοÏ?Ï?.\n\nÎ?ημοÏ?ιογÏ?άÏ?οι και bloggers, Ï?Ï?εÏ?αÏ?Ï?ιÏ?Ï?έÏ? Ï?Ï?ν ανθÏ?Ï?Ï?ίνÏ?ν δικαιÏ?μάÏ?Ï?ν, αÏ?μÏ?διοι εÏ?ιβολήÏ? Ï?οÏ? νÏ?μοÏ?, Ï?Ï?Ï?αÏ?ιÏ?Ï?ικοί, εÏ?αιÏ?ίεÏ?, Ï?ολίÏ?εÏ? καÏ?αÏ?ιεÏ?Ï?ικÏ?ν καθεÏ?Ï?Ï?Ï?Ï?ν και αÏ?λοί Ï?ολίÏ?εÏ? ... και Ï?Ï?Ï?α εÏ?οιμάζεÏ?Ï?ε και εÏ?είÏ?!</string>
-  <string name="wizard_exit_at_first_screen_toast">ΠαÏ?ακαλοÏ?με Ï?Ï?θμίÏ?Ï?ε Ï?ο Orbot για να μÏ?οÏ?έÏ?εÏ?ε να Ï?ο Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Î?Ï?εÏ?ε Ï?Ï?νδέÏ?ει με εÏ?ιÏ?Ï?Ï?ία Ï?ο δίκÏ?Ï?ο Tor - αλλά αÏ?Ï?Ï? Î?Î?Î? Ï?ημαίνει Ï?Ï?ι η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? είναι αÏ?Ï?αλήÏ?. Î?Ï?οÏ?είÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε Ï?ο κοÏ?μÏ?ί \'Browser\' για να ελέγξεÏ?ε Ï?η Ï?Ï?νδεÏ?ή Ï?αÏ?. \n\nÎ?Ï?ιÏ?κεÏ?θείÏ?ε μαÏ? Ï?Ï?η διεÏ?θÏ?νÏ?η https://guardianproject.info/apps/orbot ή Ï?Ï?είλÏ?ε ένα μήνÏ?μα Ï?Ï?η διεÏ?θÏ?νÏ?η help@xxxxxxxxxxxxxxxxxxxx για να μάθεÏ?ε Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?α.</string>
-  <string name="tor_check">Î?α ανοίξει ο Ï?εÏ?ιηγηÏ?ήÏ? δικÏ?Ï?οÏ? Ï?Ï?ην Ï?ελίδα https://check.torproject.org για να διαÏ?ιÏ?Ï?Ï?Ï?εÏ?ε αν Ï?ο Orbot είναι Ï?Ï?Ï?Ï?ά Ï?Ï?θμιÏ?μένο και Ï?Ï?ι είÏ?Ï?ε Ï?Ï?νδεδεμένοÏ?/η Ï?Ï?ο Tor.</string>
-  <string name="pref_hs_group">Φιλοξενία κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
-  <string name="pref_general_group">Î?ενικά</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-->
-  <string name="wizard_title_msg">Το Orbot Ï?έÏ?νει Ï?ο Tor Ï?ε Android!\n\nΤο Tor Ï?αÏ? βοηθά να Ï?Ï?αθείÏ?ε ενάνÏ?ια Ï?Ï?ο Ï?ιλÏ?Ï?άÏ?ιÏ?μα Ï?εÏ?ιεÏ?ομένοÏ?, Ï?ην ανάλÏ?Ï?η κÏ?κλοÏ?οÏ?ίαÏ? και Ï?ην εÏ?ιÏ?ήÏ?ηÏ?η δικÏ?Ï?οÏ? Ï?οÏ? αÏ?ειλεί Ï?ην ιδιÏ?Ï?ικÏ?Ï?ηÏ?α, Ï?ιÏ? εμÏ?ιÏ?Ï?εÏ?Ï?ικέÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ? και Ï?ιÏ? Ï?Ï?οÏ?Ï?Ï?ικέÏ? Ï?Ï?έÏ?ειÏ?.\n\nÎ?Ï?Ï?Ï?Ï? ο οδηγÏ?Ï? θα Ï?αÏ? βοηθήÏ?ει να Ï?Ï?θμίÏ?εÏ?ε Ï?ο Orbot και Ï?ο Tor Ï?Ï?η Ï?Ï?Ï?κεÏ?ή Ï?αÏ?.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">ΠÏ?οειδοÏ?οίηÏ?η</string>
-  <string name="wizard_warning_msg">Î?γκαθιÏ?Ï?Ï?νÏ?αÏ? αÏ?λά Ï?ο Orbot δεν θα καÏ?αÏ?Ï?ήÏ?ει ανÏ?νÏ?μη Ï?ην κινηÏ?ή Ï?αÏ? Ï?Ï?νδεÏ?η αÏ?Ï?Ï?μαÏ?α.\n\nΠÏ?έÏ?ει να Ï?Ï?θμίÏ?εÏ?ε Ï?Ï?Ï?Ï?ά Ï?ο Orbot, Ï?η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? και άλλεÏ? εÏ?αÏ?μογέÏ? για να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε με εÏ?ιÏ?Ï?Ï?ία Ï?ο Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Î?δειεÏ?</string>
-  <string name="wizard_permissions_root_msg1">Î?ν θέλεÏ?ε, μÏ?οÏ?εί να δÏ?Ï?εÏ?ε Ï?Ï?ο Orbot Ï?Ï?Ï?Ï?βαÏ?η \'Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η\' Ï?Ï?Ï?ε να ενεÏ?γοÏ?οιήÏ?εÏ?ε Ï?α Ï?Ï?οÏ?Ï?Ï?ημένα Ï?αÏ?ακÏ?ηÏ?ιÏ?Ï?ικά, Ï?Ï?Ï?Ï? Ï?ο Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Î?ν δεν θέλεÏ?ε κάÏ?ι Ï?έÏ?οιο, βεβαιÏ?θείÏ?ε Ï?Ï?ι Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Î? Ï?Ï?Ï?κεÏ?ή Ï?αÏ? δεν Ï?αίνεÏ?αι να έÏ?ει ξεκλείδÏ?Ï?ο λειÏ?οÏ?Ï?γικÏ? Ï?Ï?Ï?Ï?ημα ή να Ï?αÏ?έÏ?ει Ï?Ï?Ï?Ï?βαÏ?η root ή \"Superuser\".\n\nΠαÏ?ακαλοÏ?με καλÏ?Ï?εÏ?α δοκιμάÏ?Ï?ε Ï?η λειÏ?οÏ?Ï?γία \'Apps\' Ï?Ï?ην κÏ?Ï?ια οθÏ?νη.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Î?Ï?αÏ?μογέÏ? Ï?Ï?μβαÏ?έÏ? με Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Î?Ï?Ï?αλέÏ? chat app με Off-the-Record κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η</string>
-  <string name="wizard_tips_orweb">Orfox: ΠεÏ?ιηγηÏ?ήÏ? εÏ?αÏ?ξημένοÏ? αÏ?οÏ?Ï?ήÏ?οÏ? Ï?οÏ? λειÏ?οÏ?Ï?γεί μέÏ?Ï? Ï?οÏ? Tor</string>
-  <string name="wizard_tips_play">Î?Ï?εÏ? Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ? Guardian Project Ï?Ï?ο Google Play</string>
-  <string name="wizard_tips_fdroid">Î?Ï?είÏ?ε Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?οÏ? Guardian Project Ï?Ï?ο F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Î?Ï?είÏ?ε Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?οÏ? Guardian Project Ï?Ï?ο https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Î?ιαÏ?ανήÏ? μεÏ?ολάβηÏ?η διακομιÏ?Ï?ή</string>
-  <string name="wizard_transproxy_msg">Το Ï?Ï?οιÏ?είο αÏ?Ï?Ï? εÏ?ιÏ?Ï?έÏ?ει Ï?Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? να λειÏ?οÏ?Ï?γοÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor Ï?Ï?Ï?ίÏ? κάÏ?οια Ï?Ï?θμιÏ?η.</string>
-  <string name="wizard_transproxy_hint">(Î?Ï?ιλέξÏ?ε αÏ?Ï?Ï? Ï?ο Ï?εÏ?Ï?άγÏ?νο αν δεν καÏ?αλαβαίνεÏ?ε για Ï?ι Ï?Ï?άγμα μιλάμε)</string>
-  <string name="wizard_transproxy_none">Î?αμία</string>
-  <string name="pref_transparent_tethering_title">Î?ιαÏ?Ï?νδεÏ?η Tor</string>
-  <string name="pref_transparent_tethering_summary">Î?νεÏ?γοÏ?οίηÏ?η Ï?ηÏ? Î?ιαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή για Ï?Ï?Ï?κεÏ?έÏ? με WiFi και διαÏ?Ï?νδεÏ?η USB (αÏ?αιÏ?εί εÏ?ανεκκίνηÏ?η)</string>
-  <string name="button_grant_superuser">Î?ίÏ?ημα ΠÏ?Ï?Ï?βαÏ?ηÏ? Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η</string>
-  <string name="pref_select_apps">Î?Ï?ιλογή εÏ?αÏ?μογÏ?ν</string>
-  <string name="pref_select_apps_summary">Î?Ï?ιλέξÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?οÏ? θα διέλθοÏ?ν μέÏ?Ï? Tor</string>
-  <string name="pref_node_configuration">ΡÏ?θμιÏ?η κÏ?μβοÏ?</string>
+    <!--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="button_proxy_all">Î?λοι οι διακομιÏ?Ï?έÏ?</string>
-  <string name="button_proxy_none">Î?ανέναÏ? διακομιÏ?Ï?ήÏ?</string>
-  <string name="button_invert_selection">Î?νÏ?ιÏ?Ï?Ï?οÏ?ή Î?Ï?ιλογήÏ?</string>
-  <string name="pref_proxy_title">Î?ιακομιÏ?Ï?ήÏ? μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?ομένÏ?ν δεδομένÏ?ν</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Î?Ï?δικÏ?Ï? για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?Ï?μενÏ?ν δεδομένÏ?ν</string>
   <string name="pref_proxy_password_summary">Î?Ï?δικÏ?Ï? για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? (ΠÏ?οαιÏ?εÏ?ικÏ?)</string>
   <string name="pref_proxy_password_dialog">Î?ιÏ?άγεÏ?ε Ï?ον Î?Ï?δικÏ? για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ?</string>
-  <string name="status">Î?αÏ?άÏ?Ï?αÏ?η</string>
-  <string name="setting_up_full_transparent_proxying_">ΡÏ?θμιÏ?η </string>
-  <string name="setting_up_app_based_transparent_proxying_">ΡÏ?θμιÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή</string>
-  <string name="transparent_proxying_enabled">Î? διαÏ?ανήÏ? μεÏ?ολάβηÏ?η διακομιÏ?Ï?ή Î?Î?Î?ΡÎ?Î?ΠÎ?Î?Î?Î?Î?Î?Î?</string>
-  <string name="transproxy_enabled_for_tethering_">Το TransProxy ενεÏ?γοÏ?οιήθηκε για Ï?ην διαÏ?Ï?νδεÏ?η - Tethering</string>
-  <string name="warning_error_starting_transparent_proxying_">ΠΡÎ?Î?Î?Î?Î?ΠÎ?Î?Î?ΣÎ?: Ï?Ï?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή!</string>
-  <string name="transproxy_rules_cleared">Î?ι Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? TransProxy αÏ?ομακÏ?Ï?νθηκαν</string>
-  <string name="couldn_t_start_tor_process_">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?ηÏ? διεÏ?γαÏ?ίαÏ? Tor:</string>
-  <string name="privoxy_is_running_on_port_">Το Polipo εκÏ?ελείÏ?αι Ï?Ï?η θÏ?Ï?α:</string>
-  <string name="setting_up_port_based_transparent_proxying_">ΡÏ?θμιÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή καÏ?ά θÏ?Ï?α...</string>
-  <string name="bridge_error">ΣÏ?άλμα γέÏ?Ï?Ï?αÏ?</string>
-  <string name="bridge_requires_ip">Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε Ï?ο Ï?Ï?οιÏ?είο γέÏ?Ï?Ï?αÏ?, Ï?Ï?έÏ?ει να ειÏ?άγεÏ?ε Ï?ην διεÏ?θÏ?νÏ?η Î?Ρ Ï?οÏ?λάÏ?ιÏ?Ï?ον μιαÏ? γέÏ?Ï?Ï?αÏ?.</string>
-  <string name="send_email_for_bridges">Î?έÏ?Ï? ενÏ?Ï? λογαÏ?ιαÏ?μοÏ? gmai Ï?Ï?είλÏ?ε ένα μήνÏ?μα Ï?Ï?ην διεÏ?θÏ?νÏ?η bridges@xxxxxxxxxxxxxx με Ï?ην Ï?αÏ?η \"get bridges\" μÏ?νη Ï?ηÏ? Ï?Ï?ο Ï?Ï?μα Ï?ο μηνÏ?μαÏ?οÏ?.</string>
-  <string name="error">ΣÏ?άλμα</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">ΧÏ?ήÏ?η *μÏ?νον* αÏ?Ï?Ï?ν Ï?Ï?ν Ï?Ï?γκεκÏ?ιμένÏ?ν κÏ?μβÏ?ν</string>
   <string name="bridges">Î?έÏ?Ï?Ï?εÏ?</string>
   <string name="use_bridges">ΧÏ?ήÏ?η γεÏ?Ï?Ï?Ï?ν</string>
-  <string name="bridges_obfuscated">Î?Ï?Ï?Ï?έÏ? γέÏ?Ï?Ï?εÏ?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Î?νεÏ?γοÏ?οίηÏ?η εναλλακÏ?ικÏ?ν κÏ?μβÏ?ν ειÏ?Ï?δοÏ? Ï?Ï?ο δίκÏ?Ï?ο Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Î?νεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο αν οι Ï?Ï?θμιÏ?μένεÏ? γέÏ?Ï?Ï?εÏ? είναι κÏ?Ï?Ï?έÏ?</string>
-  <string name="ip_address_and_port_of_bridges">Î?ιεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α Ï?Ï?ν γεÏ?Ï?Ï?Ï?ν</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">ΠÏ?οÏ?ιÏ?έÏ? θÏ?Ï?εÏ?</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">ΠÏ?οÏ?ιÏ?έÏ? θÏ?Ï?εÏ? Ï?ίÏ?Ï? αÏ?Ï? Ï?εÏ?ιοÏ?ιÏ?Ï?ικÏ? Ï?οίÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ?</string>
   <string name="enter_ports">Î?ιÏ?άγεÏ?ε θÏ?Ï?εÏ?</string>
-  <string name="enable_hidden_services">Φιλοξενία κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
-  <string name="run_servers_accessible_via_the_tor_network">να εÏ?ιÏ?Ï?έÏ?εÏ?ε Ï?Ï?ον διακομιÏ?Ï?ή Ï?ηÏ? Ï?Ï?Ï?κεÏ?ήÏ? να είναι Ï?Ï?οÏ?βάÏ?ιμοÏ? μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">ειÏ?άγεÏ?ε Ï?ιÏ? θÏ?Ï?εÏ? κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν Ï?οÏ? localhost</string>
-  <string name="hidden_service_ports">Î?Ï?Ï?εÏ? κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ï?ο Ï?νομα Ï?Ï?οÏ?Ï?έλαÏ?ηÏ? για Ï?ιÏ? κÏ?Ï?Ï?έÏ? Ï?Ï?ηÏ?εÏ?ίεÏ? Ï?αÏ? (Ï?αÏ?άγεÏ?αι αÏ?Ï?Ï?μαÏ?α)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ενεÏ?γοÏ?οίηÏ?η καÏ?αγÏ?αÏ?Ï?ν αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? (για Ï?ην Ï?Ï?οβολή Ï?οÏ?Ï? αÏ?αιÏ?είÏ?αι Ï?Ï?ήÏ?η adb ή aLogCat)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ενεÏ?γοÏ?οίηÏ?η καÏ?αγÏ?αÏ?Ï?ν αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? (για Ï?ην Ï?Ï?οβολή Ï?οÏ?Ï? αÏ?αιÏ?είÏ?αι Ï?Ï?ήÏ?η adb ή aLogCat)</string>
   <string name="project_home">Î?Ï?Ï?οÏ?ελίδεÏ? Ï?οÏ? έÏ?γοÏ?:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Î? Î?δεια Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Î?ογιÏ?μικÏ? Ï?Ï?ίÏ?Ï?ν:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">ενεÏ?γοÏ?οιημένη κÏ?Ï?Ï?ή Ï?Ï?ηÏ?εÏ?ία:</string>
-  <string name="unable_to_read_hidden_service_name">αδÏ?ναμία ανάγνÏ?Ï?ηÏ? Ï?οÏ? ονÏ?μαÏ?οÏ? Ï?ηÏ? κÏ?Ï?Ï?ήÏ? Ï?Ï?ηÏ?εÏ?ίαÏ?</string>
+    <string name="unable_to_read_hidden_service_name">αδÏ?ναμία ανάγνÏ?Ï?ηÏ? Ï?οÏ? ονÏ?μαÏ?οÏ? Ï?ηÏ? κÏ?Ï?Ï?ήÏ? Ï?Ï?ηÏ?εÏ?ίαÏ?</string>
   <string name="unable_to_start_tor">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?οÏ? Tor:</string>
-  <string name="unable_to_reset_tor">Î?Ï?ανεκκινήÏ?Ï?ε Ï?η Ï?Ï?Ï?κεÏ?ή Ï?αÏ?, αδÏ?ναμία εÏ?αναÏ?οÏ?άÏ? Ï?οÏ? Tor!</string>
-  <string name="pref_use_sys_iptables_title">ΧÏ?ήÏ?η αÏ?Ï?ικοÏ? iptables</string>
-  <string name="pref_use_sys_iptables_summary">Ï?Ï?ήÏ?η Ï?οÏ? ενÏ?Ï?μαÏ?Ï?μένοÏ? iptables ανÏ?ί για εκείνÏ?ν Ï?οÏ? Ï?ακέÏ?οÏ? Orbot</string>
-  <string name="error_installing_binares">Τα αÏ?Ï?εία Tor δεν μÏ?Ï?Ï?εÏ?αν να εγκαÏ?αÏ?Ï?αθοÏ?ν ή να αναβαθμιÏ?Ï?οÏ?ν.</string>
-  <string name="pref_use_persistent_notifications">Î?α διαÏ?ηÏ?είÏ?αι Ï?άνÏ?οÏ?ε Ï?ο εικονίδιο Ï?Ï?ην γÏ?αμμή εÏ?γαλείÏ?ν Ï?Ï?αν Ï?ο Orbot Ï?Ï?νδέεÏ?αι</string>
+    <string name="pref_use_persistent_notifications">Î?α διαÏ?ηÏ?είÏ?αι Ï?άνÏ?οÏ?ε Ï?ο εικονίδιο Ï?Ï?ην γÏ?αμμή εÏ?γαλείÏ?ν Ï?Ï?αν Ï?ο Orbot Ï?Ï?νδέεÏ?αι</string>
   <string name="pref_use_persistent_notifications_title">Î?ιδοÏ?οιήÏ?ειÏ? διαÏ?κοÏ?Ï? Ï?Ï?νδεÏ?ηÏ?</string>
   <string name="pref_use_expanded_notifications">Î?μÏ?άνιÏ?η εκÏ?εÏ?αμένηÏ? ειδοÏ?οίηÏ?ηÏ? με Ï?η Ï?Ï?Ï?α εξÏ?δοÏ? Ï?οÏ? Tor και Ï?η διεÏ?θÏ?νÏ?η IP</string>
   <string name="pref_use_expanded_notifications_title">Î?Ï?εκÏ?αμένεÏ? Î?ιδοÏ?οιήÏ?ειÏ?</string>
-  <string name="notification_using_bridges">Î?ι γέÏ?Ï?Ï?εÏ? ενεÏ?γοÏ?οιήθηκαν!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Î?λÏ?Ï?Ï?α </string>
-  <string name="set_locale_summary">Î?Ï?ιλέξÏ?ε Ï?Ï?θμίÏ?ειÏ? Ï?οÏ?ικÏ?Ï?ηÏ?αÏ? και γλÏ?Ï?Ï?αÏ? για Ï?ο Orbot</string>
-  <string name="wizard_locale_title">Î?Ï?ιλέξÏ?ε γλÏ?Ï?Ï?α</string>
-  <string name="wizard_locale_msg">ΠαÏ?αμείνεÏ?ε Ï?Ï?ην αÏ?Ï?ική ή αλλάξÏ?ε Ï?ην Ï?Ï?έÏ?οÏ?Ï?α γλÏ?Ï?Ï?α</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">Î?Ï?οθήκεÏ?Ï?η Ï?Ï?θμίÏ?εÏ?ν</string>
-  <string name="no_internet_connection_tor">Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?νδεÏ?η Ï?Ï?ο διαδίκÏ?Ï?ο. Î? Tor είναι Ï?ε αναμονή...</string>
-  <string name="bandwidth_">Î?Ï?Ï?οÏ? ζÏ?νηÏ?:</string>
-  <string name="down">καÏ?έβαÏ?μα</string>
-  <string name="up">ανέβαÏ?μα</string>
-  <string name="pref_disable_network_title">ΧÏ?Ï?ίÏ? Î?Ï?Ï?Ï?μαÏ?η Î?ναÏ?Ï?ολή Î?ικÏ?Ï?οÏ?</string>
+    <string name="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="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">ΧÏ?ήÏ?η Ï?οÏ? ChatSecure</string>
-  <string name="permission_manage_tor_label">Î?ιαÏ?είÏ?ιÏ?η Tor</string>
-  <string name="permission_manage_tor_description">Î?ξοÏ?Ï?ιοδοÏ?ήÏ?Ï?ε Ï?ην εÏ?αÏ?μογή να ελέγÏ?ει Ï?ην Ï?Ï?ηÏ?εÏ?ία Ï?οÏ? Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Το Orbot λειÏ?οÏ?Ï?γεί καλÏ?Ï?εÏ?α με Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?εÏ?ιήγηÏ?ηÏ? Orfox. Î?α εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?α;</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Το Orbot λειÏ?οÏ?Ï?γεί καλÏ?Ï?εÏ?α με Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?εÏ?ιήγηÏ?ηÏ? Orfox. Î?α εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?α;</string>
   <string name="install_apps_">Î?γκαÏ?άÏ?Ï?αÏ?η Ï?οÏ? Ï?Ï?ογÏ?άμμαÏ?οÏ? Ï?εÏ?ιήγηÏ?ηÏ?;</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Î?εν Ï?Ï?άÏ?Ï?ει Ï?Ï?νδεÏ?η με δίκÏ?Ï?ο. Î? Tor μÏ?αίνει Ï?ε καÏ?άÏ?Ï?αÏ?η αναμονήÏ?...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Î? Ï?Ï?νδεÏ?η δικÏ?Ï?οÏ? είναι καλή. Î?ίνεÏ?αι αÏ?Ï?Ï?νιÏ?η Ï?οÏ? Tor...</string>
@@ -258,19 +128,7 @@
   <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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Τα δημÏ?Ï?ια Tor Î?Ρ Ï?αÏ?:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">ΠαÏ?ακαλοÏ?με αÏ?ενεÏ?γοÏ?οιήÏ?Ï?ε αÏ?Ï?ήν Ï?ην εÏ?αÏ?μογή Ï?Ï?ο Android-&gt;Settings-&gt;Apps αν ανÏ?ιμεÏ?Ï?Ï?ίζεÏ?ε Ï?Ï?οβλήμαÏ?α με Ï?ο Orbot:</string>
-  <string name="app_conflict">ΣÏ?γκÏ?οÏ?Ï?η εÏ?αÏ?μογÏ?ν</string>
-  <string name="pref_transproxy_refresh_title">Î?Ï?Ï?Ï?μαÏ?η ανανέÏ?Ï?η Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Î?Ï?ανεÏ?αÏ?μογή Ï?Ï?ν κανÏ?νÏ?ν Transproxy Ï?Ï?αν αλλάζει η καÏ?άÏ?Ï?αÏ?η δικÏ?Ï?οÏ?</string>
-  <string name="pref_transproxy_flush_title">Î?Î?Î?Î?Î?Î?ΣΤÎ?Î?Î? Î?ΦÎ?Î?ΡÎ?ΣÎ? Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Î?γγίξÏ?ε εδÏ? για να εκκαθαÏ?ίÏ?εÏ?ε Ï?λοÏ?Ï? Ï?οÏ?Ï? κανÏ?νεÏ? δικÏ?Ï?οÏ? διαÏ?ανοÏ?Ï? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? ΤΩΡÎ?</string>
-  <string name="transparent_proxy_rules_flushed_">Î?ι κανÏ?νεÏ? Ï?οÏ? διαÏ?ανοÏ?Ï? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? εκκαθαÏ?ίÏ?Ï?ηκαν!</string>
-  <string name="you_do_not_have_root_access_enabled">Î?εν έÏ?εÏ?ε ενεÏ?γοÏ?οιημένη Ï?ην Ï?Ï?Ï?Ï?βαÏ?η ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Î?Ï?Ï?Ï? Ï?Ï?ειαÏ?Ï?εί να Ï?Ï?αμαÏ?ήÏ?εÏ?ε και να ξεκινήÏ?εÏ?ε Ï?ο Orbot για να ενεÏ?γοÏ?οιηθοÏ?ν οι αλλαγέÏ? Ï?Ï?ιÏ? Ï?Ï?θμίÏ?ειÏ?.</string>
-  <string name="menu_vpn">Î?Ï?αÏ?μογέÏ?</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Î?νεÏ?γοÏ?οίηÏ?η</string>
   <string name="apps_mode">Î?ειÏ?οÏ?Ï?γία VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Î?Ï?οÏ?είÏ?ε να ενεÏ?γοÏ?οιήÏ?εÏ?ε εÏ?αÏ?μογέÏ? για Ï?Ï?ήÏ?η Ï?Ï?ο Tor μέÏ?Ï? Ï?οÏ? ενÏ?Ï?μαÏ?Ï?μένοÏ? Orbot VPN.</string>
-  <string name="send_email">ΣÏ?είλÏ?ε Email</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Î?Ï?αν έÏ?εÏ?ε μια διεÏ?θÏ?νÏ?η, ανÏ?ιγÏ?άÏ?Ï?ε Ï?ο &amp; εÏ?ικολλήÏ?Ï?ε Ï?ο Ï?Ï?ην Ï?Ï?οÏ?ίμηÏ?η \"Bridges\" Ï?Ï?η Ï?Ï?θμιÏ?η Ï?οÏ? Orbot και εÏ?ανεκκινήÏ?Ï?ε.</string>
   <string name="install_orweb">Î?γκαÏ?άÏ?Ï?αÏ?η Orfox</string>
-  <string name="standard_browser">ΤÏ?Ï?ικÏ?Ï? Browser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ΣÎ?Î?Î?Î?ΩΣÎ?: Î?Ï?νο Ï?Ï?Ï?οÏ?οιημένεÏ? γέÏ?Ï?Ï?εÏ? Tor λειÏ?οÏ?Ï?γοÏ?ν Ï?ε Ï?Ï?Ï?κεÏ?έÏ? Intel X86 / ATOM</string>
-  <string name="vpn_default_world">ΠαγκÏ?Ï?μια (Auto)</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="ports">Î?Ï?Ï?εÏ?</string>
-  <string name="local_port">ΤοÏ?ική θÏ?Ï?α</string>
+    <string name="local_port">ΤοÏ?ική θÏ?Ï?α</string>
   <string name="onion_port">Î?Ï?Ï?α Î?Ï?εμμÏ?διοÏ?</string>
   <string name="name">Î?νομα</string>
   <string name="done">Î?γινε!</string>
@@ -308,9 +162,7 @@
   <string name="backup_restored">Το ανÏ?ίγÏ?αÏ?ο αÏ?Ï?αλείαÏ? εÏ?αναÏ?έÏ?θηκε</string>
   <string name="filemanager_not_available">Î? διαÏ?ειÏ?ιÏ?Ï?ήÏ? αÏ?Ï?είÏ?ν δεν είναι διαθέÏ?ιμοÏ?.</string>
   <string name="please_grant_permissions_for_external_storage">ΠαÏ?ακαλοÏ?με να Ï?αÏ?αÏ?Ï?Ï?ήÏ?εÏ?ε δικαιÏ?μαÏ?α για εξÏ?Ï?εÏ?ική αÏ?οθήκεÏ?Ï?η</string>
-  <string name="permission_granted">Î? άδεια Ï?αÏ?αÏ?Ï?Ï?ήθηκε</string>
-  <string name="permission_denied">Î? άιÏ?ηÏ?η άδειαÏ? αÏ?οÏ?Ï?ίÏ?θηκε</string>
-  <string name="restore_backup">Î?Ï?αναÏ?οÏ?ά ανÏ?ιγÏ?άÏ?οÏ? αÏ?Ï?αλείαÏ?</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">ΠαÏ?ακαλείÏ?Ï?ε να ενεÏ?γοÏ?οιήÏ?εÏ?ε Ï?ην λειÏ?οÏ?Ï?γία VPN για αν ενεÏ?γοÏ?οιηθοÏ?ν εÏ?αÏ?μογέÏ? Ï?Ï?ήÏ?ηÏ? Ï?οÏ? Tor</string>
-  <string name="app_shortcuts">Î?νεÏ?γοÏ?οιημένεÏ? εÏ?αÏ?μογέÏ? με Ï?ο Τοr</string>
-  <string name="title_activity_bridge_wizard">Î?έÏ?Ï?Ï?α ΤοÏ? Î?δηγοÏ? Î?Ï?αÏ?Ï?ηÏ?ιÏ?Ï?ηÏ?αÏ?</string>
-  <string name="testing_bridges">Î?οκιμή Ï?Ï?νδεÏ?ηÏ? γέÏ?Ï?Ï?αÏ? με Ï?ο Tor....</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>
diff --git a/app/src/main/res/values-en-rGB/poestrings.xml b/app/src/main/res/values-en-rGB/poestrings.xml
index d09c7d6a..c80c7204 100644
--- a/app/src/main/res/values-en-rGB/poestrings.xml
+++ b/app/src/main/res/values-en-rGB/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Bridges are Tor relays that help circumvent censorship. You can try bridges if Tor is blocked by your ISP; each type of bridge uses a different method
-        to avoid censorship: if one type does not work, try using a different one.</string>
-
-    <string name="bridges_no">No Bridges: Directly Connect to Tor</string>
-    <string name="bridges_provided">Provided Bridges: </string>
-    <string name="bridges_custom">Custom Bridges</string>
-
-    <string name="bridges_config">Bridge Configuration</string>
-    <string name="action_done">Done</string>
 
     <string name="bridges_sometimes">Sometimes you need a bridge to get to Tor.</string>
     <string name="action_more">TELL ME MORE</string>
@@ -17,19 +8,6 @@
     <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="status_connected">Connected!</string>
-
-    <string name="loading_claim_1">Our diverse community is what makes Tor great!</string>
-    <string name="loading_claim_2">Everyday people use Tor to avoid being followed by marketing ads.</string>
-    <string name="loading_claim_3">When Facebook is blocked, people use Tor to connect to their friends and family.</string>
-    <string name="loading_claim_4">Activists use Tor to freely tweet their opinions and beliefs.</string>
-    <string name="loading_claim_5">Bloggers use Tor to rally people toward social reform.</string>
-    <string name="loading_claim_6">Journalists use Tor to securely investigate stories they are reporting on.</string>
-    <string name="loading_claim_7">Business people use Tor to keep their company strategies private.</string>
-    <string name="loading_claim_8">Workers use Tor to fight for justice without fear of losing their job.</string>
-
-    <string name="status_connecting">We\'re connecting you.\" = \"We\'re connecting you.</string>
-
     <string name="hello">Hello</string>
     <string name="welcome">Welcome to Tor on mobile.</string>
 
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 839ff9c2..75531ff4 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -2,84 +2,39 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot is a free proxy app that empowers other apps to use the Internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is startingâ?¦</string>
+    <string name="status_starting_up">Orbot is startingâ?¦</string>
   <string name="status_activated">Connected to the Tor network</string>
   <string name="status_disabled">Orbot is deactivated</string>
   <string name="status_shutting_down">TorService is shutting down</string>
   <string name="tor_process_starting">Starting Tor clientâ?¦</string>
   <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Browse</string>
-  <string name="menu_settings">Settings</string>
+    <string name="menu_settings">Settings</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">Apps...</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">About</string>
-  <string name="menu_promo_apps">Get appsâ?¦</string>
-  <string name="main_layout_download">Download</string>
+    <string name="main_layout_download">Download</string>
   <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
+    <string name="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="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor binaries successfully installed!</string>
-  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Application Error</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="status">Status</string>
-  <string name="error">Error</string>
+    <string name="error">Error</string>
   <string name="bridges">Bridges</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Language</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="get_bridges_email">Email</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>
diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml
index f66130f8..c00f5234 100644
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -1,85 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Å?alti kaj malÅ?alti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot Å?altiÄ?as...</string>
+    <string name="status_starting_up">Orbot Å?altiÄ?as...</string>
   <string name="status_activated">Konektita al Tor-reto</string>
   <string name="status_disabled">Orbot estas malaktivigita</string>
   <string name="tor_process_starting">Å?altiÄ?as Tor-kliento...</string>
   <string name="tor_process_complete">kompleta.</string>
-  <string name="tor_process_waiting">atendas.</string>
-  <string name="not_anonymous_yet">ATENTIGO: Via trafiko ankoraŭ ne estas anonima! Bonvolu agordi viajn aplikaĵojn por uzi HTTP-prokurilon 127.0.0.1:8118 aŭ SOCKS4A- aŭ SOCKS5-prokurilo 127.0.0.1:9050</string>
-  <string name="menu_home">Hejma tasto</string>
-  <string name="menu_browse">Foliumi</string>
-  <string name="menu_settings">Agordoj</string>
+    <string name="menu_settings">Agordoj</string>
   <string name="menu_log">Protokolo</string>
-  <string name="menu_info">Helpo</string>
-  <string name="menu_start">Starti</string>
+    <string name="menu_start">Starti</string>
   <string name="menu_stop">Halti</string>
   <string name="menu_about">Pri</string>
   <string name="main_layout_download">ElÅ?utado</string>
   <string name="main_layout_upload">AlÅ?utado</string>
-  <string name="button_help">Helpo</string>
-  <string name="button_close">Fermi</string>
-  <string name="button_about">Pri</string>
-  <string name="button_clear_log">ForviÅ?i protokolon</string>
-  <string name="menu_verify">Kontroli</string>
-  <string name="menu_exit">Eliri</string>
-  <string name="press_to_start">- longe puÅ?i por Å?alti -</string>
-  <string name="pref_trans_proxy_summary">Aŭtomata Tor-igo de Aplikaĵoj</string>
-  <string name="pref_transparent_all_title">Tor-igu Ä?ion</string>
-  <string name="pref_transparent_port_title">Listo de Pordoj</string>
-  <string name="pref_has_root">Peti Administrajn Rajtojn</string>
-  <string name="status_install_success">Binara kodo de Tor estas sukcese instalita!</string>
-  <string name="status_install_fail">Binaraj dosieroj de Tor ne povis esti instalitaj. Kontrolu protokolon kaj sciigu nin per tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Eraro de Aplikaĵo</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Pri Orbot</string>
-  <string name="btn_next">Sekva</string>
-  <string name="btn_back">MalantaÅ­e</string>
-  <string name="btn_finish">Fini</string>
-  <string name="btn_cancel">Rezigni</string>
+    <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>
-  <string name="wizard_permissions_root">Permeso estas AluÄ?ita</string>
-  <string name="wizard_permissions_stock">Permesoj de Orbot</string>
-  <string name="wizard_permissions_consent">Mi komprenas kaj volas daÅ­ri sen administraj rajtoj</string>
-  <string name="wizard_configure">Agordi Tor-igon</string>
-  <string name="wizard_configure_select_apps">Elekti Individualajn Aplikaĵojn por Tor</string>
-  <string name="wizard_tips_tricks">Aplikaĵoj permesitaj por Orbot</string>
-  <string name="wizard_tips_otrchat">ChatSecutre - Sekura tujmesaÄ?ilo por Android</string>
-  <string name="wizard_tips_proxy">Agordoj de prokurilo - Lernu kiel agordi aplikaĵojn por kunlabori kun Orbot</string>
-  <string name="wizard_tips_twitter">Agordi prokurilon por Twitter je adreso \"localhost\" kaj pordo 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Retperantâ??agordoj</string>
-  <string name="wizard_final">Orbot estas preparita!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_hs_group">Gastigado de kaÅ?ita servo</string>
-  <string name="pref_general_group">Ä?enerala</string>
+    <!--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-->
-  <string name="wizard_warning_title">Averto</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permesoj</string>
-  <string name="wizard_permissions_root_msg2">Se vi ne volas fari tion, bonvolu certiÄ?i ke eblas agordi aplikaĵojn por kunlabori kun Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplikaĵoj permesitaj por Orbot</string>
-  <string name="wizard_tips_play">Trovu Ä?iujn aplikaĵojn de Guardian Project Ä?e Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_hint">(Marku Ä?i tiun butonon se vi ne scias pri kio ni parolas)</string>
-  <string name="wizard_transproxy_none">Neniom</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="button_grant_superuser">Peti Administrajn Rajtojn</string>
-  <string name="pref_select_apps">Elekti aplikaĵojn</string>
-  <string name="pref_node_configuration">Agordo de Nodoj</string>
+    <!--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>
@@ -100,10 +49,8 @@
   <string name="pref_proxy_password_title">Pasvorto de la elira prokurilo</string>
   <string name="pref_proxy_password_summary">Pasvorto de la prokurilo (Malnepra)</string>
   <string name="pref_proxy_password_dialog">Entajpu pasvorton</string>
-  <string name="status">Stato</string>
-  <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariÄ?i:</string>
-  <string name="bridge_error">Eraro de Ponto</string>
-  <string name="error">Eraro</string>
+    <string name="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>
@@ -121,30 +68,12 @@
   <string name="reachable_ports">Atingeblaj pordoj</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Pordoj, kiuj atingeblas tra la restrikta fajromuro</string>
   <string name="enter_ports">Entajpu pordojn</string>
-  <string name="enable_hidden_services">Gastigado de KaÅ?itaj Servoj</string>
-  <string name="run_servers_accessible_via_the_tor_network">permesi al servilo sur Ä?i tiu aparato esti atingebla per Tor-reto</string>
-  <string name="enter_localhost_ports_for_hidden_services">entajpi localhost-pordojn de kaÅ?itaj servoj</string>
-  <string name="hidden_service_ports">Pordoj de KaÅ?itaj Servoj</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adreso de via kaÅ?ita servo (aÅ­tomate generata)</string>
-  <string name="project_home">RetpaÄ?aro(j) de la Projekto:</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
-  <string name="hidden_service_on">kaÅ?itaj servoj je:</string>
-  <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaÅ?ita servo</string>
+    <string name="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="pref_use_sys_iptables_title">Uzi defaÅ­ltajn Iptables</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Lingvo</string>
-  <string name="set_locale_summary">Elekti lokaĵaron kaj lingvon por Orbot</string>
-  <string name="wizard_locale_title">Elekti lingvon</string>
-  <string name="btn_save_settings">Konservi Agordojn</string>
-  <string name="bandwidth_">Kapacito:</string>
-  <string name="down">el</string>
-  <string name="up">al</string>
-  <string name="menu_use_chatsecure">Uzi ChatSecure</string>
-  <string name="menu_vpn">Aplikaĵoj</string>
-  <string name="activate">Aktivi</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>
diff --git a/app/src/main/res/values-es-rAR/poestrings.xml b/app/src/main/res/values-es-rAR/poestrings.xml
index fd14a251..53e6e635 100644
--- a/app/src/main/res/values-es-rAR/poestrings.xml
+++ b/app/src/main/res/values-es-rAR/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">los puentes son los relevadores de tor que ayudan a eludir la censura. Puede probar los puentes si su ISP bloquea  tor, cada tipo de puente utiliza un método diferente para evitar la censura: si un tipo no funciona, intente utilizar otro distinto. </string>
-
-    <string name="bridges_no">sin puentes: conecte directamente a tor</string>
-    <string name="bridges_provided">puentes proporcionados</string>
-    <string name="bridges_custom">puentes personalizados</string>
-
-    <string name="bridges_config">configuración de puente</string>
-    <string name="action_done">hecho</string>
 
     <string name="bridges_sometimes">aveces necesitas un puente para llegar a tor </string>
     <string name="action_more">dime mas</string>
@@ -16,19 +8,6 @@
     <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="status_connected">conectado!</string>
-
-    <string name="loading_claim_1">nuestra comunidad diversa es lo que hace que tor sea grandioso</string>
-    <string name="loading_claim_2">todos los días las personas usan tor para evitar ser seguidos por publicidades</string>
-    <string name="loading_claim_3">cuando facebook esta bloqueado, las personas utilizan tor para conectarse con sus amigos y familiares</string>
-    <string name="loading_claim_4">los activistas usan tor para twittear libremente sus opiniones y creencias. </string>
-    <string name="loading_claim_5">los blogger utilizan tor para reunir a las personas hacia la reforma social</string>
-    <string name="loading_claim_6">los periodistas usan tor para investigar de forma segura las historias sobre las que informan</string>
-    <string name="loading_claim_7">los empresarios usan tor para mantener privadas las estrategias de su compañia.</string>
-    <string name="loading_claim_8">los trabajadores usan tor para luchar por la justicia, sin temor a perder su trabajo</string>
-
-    <string name="status_connecting">te estamos conectando. =  te estamos conectando.</string>
-
     <string name="hello">hola</string>
     <string name="welcome">bienvenido a tor en el móvil</string>
 
diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml
index 54fa6102..a7bb0002 100644
--- a/app/src/main/res/values-es-rAR/strings.xml
+++ b/app/src/main/res/values-es-rAR/strings.xml
@@ -2,136 +2,46 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar y parar Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciándose...</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="tor_process_waiting">esperando.</string>
-  <string name="not_anonymous_yet">CIUDADO: ¡Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Inicio</string>
-  <string name="menu_browse">Navegar</string>
-  <string name="menu_settings">Configuración</string>
+    <string name="menu_settings">Configuración</string>
   <string name="menu_log">Registro</string>
-  <string name="menu_info">Ayuda</string>
-  <string name="menu_apps">aplicaciones</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Detener</string>
   <string name="menu_about">Acerca de</string>
-  <string name="menu_promo_apps">Obtener aplicaciones...</string>
-  <string name="main_layout_download">Descargar</string>
+    <string name="main_layout_download">Descargar</string>
   <string name="main_layout_upload">Subir</string>
-  <string name="button_help">Ayuda</string>
-  <string name="button_close">Cerrar</string>
-  <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Borrar Registros</string>
-  <string name="menu_verify">Comprobar</string>
-  <string name="menu_exit">Salir</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="press_to_start">- manten apretado para comenzar -</string>
-  <string name="pref_trans_proxy_group">Proxy Transparente (Requiere Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Transparente</string>
-  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
-  <string name="pref_transparent_all_title">Torear Todo</string>
-  <string name="pref_transparent_all_summary">trafico de proxy para todas las aplicaciones a traves de Tor</string>
-  <string name="pref_transparent_port_fallback_title">puerto de proxy no disponible</string>
-  <string name="pref_transparent_port_fallback_summary">CUIDADO: Elude puertos comunes (80,443, etc). *USE SOLO* si el modo \"TODO\" o \"APLIACION\" no funciona.</string>
-  <string name="pref_transparent_port_title">lista de puerto</string>
-  <string name="pref_transparent_port_summary">lista de puertos de proxy. *USE SOLO* si el modo \"TODO\" o \"APLICACIÃ?N\" no funciona </string>
-  <string name="pref_transparent_port_dialog">Ingresar puertos al proxy</string>
-  <string name="pref_has_root">solicitar acceso root</string>
-  <string name="pref_has_root_summary">solicitar acceso root para transparentar el proxy</string>
-  <string name="status_install_success">Tor binario  instalado correctamente</string>
-  <string name="status_install_fail">Los archivos binarios Tor no pudieron ser instalado. Compruebe el registro y notificar a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de la aplicación</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Finalizar</string>
-  <string name="btn_okay">Ok</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permiso concedido</string>
-  <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelente! hemos detectamos que tienes  permisos de root habilitados para Orbot.  Usaremos este poder sabiamente.</string>
-  <string name="wizard_permissions_msg_stock">Si bien no es necesario, Orbot puede convertirse en una herramienta más potente si tu dispositivo tiene acceso root. ¡Utiliza el botón de abajo para otorgar a Orbot superpoderes!</string>
-  <string name="wizard_permissions_no_root">Si no tienes acceso root o no tienes idea de lo que estamos hablando, solo asegúrate de usar aplicaciones que puedan trabajar con Orbot.</string>
-  <string name="wizard_permissions_consent">Lo entiendo y prefiero continuar sin Superusuario</string>
-  <string name="wizard_permission_enable_root">Permitir root para Orbot</string>
-  <string name="wizard_configure">configurar la Torificacion</string>
-  <string name="wizard_configure_msg">Orbot te da la opción de rutear todos los tráficos de las aplicaciones a traves de Tor o de elegir las aplicaciones individualmente.</string>
-  <string name="wizard_configure_all">Proxy para todas las aplicaciones a traves de Tor</string>
-  <string name="wizard_configure_select_apps">Seleccionar individualmente las aplicaciones para Tor</string>
-  <string name="wizard_tips_tricks">Aplicaciones habilitadas para orbot</string>
-  <string name="wizard_tips_msg">Las siguientes aplicaciones se desarrollaron para trabajar con Orbot. Haga click en cada botón para instalarlas ahora o las puedes encontrar mas tarde en Google Play en la pagina de GuardianProject.info o a traves de F-Droid.org</string>
-  <string name="wizard_tips_otrchat">Chat Seguro - Mensajeria instantánea segura para Android</string>
-  <string name="wizard_tips_proxy">Configuración de Proxy - Aprenda como configurar las aplicaciones para que funcionen con Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo aplicacion de motor de busqueda</string>
-  <string name="wizard_tips_twitter">Establecer proxy de Twitter para alojar \"localhost\" y el puerto 8118</string>
-  <string name="wizard_tips_story_maker">Creador de historias - realice una historia y desela a Tor para seguridad</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">configuración de proxy</string>
-  <string name="wizard_proxy_help_msg">Si la aplicación de Android que estas usando puede soportar el uso de HTTP o el proxy SCOKS, entonces podes configurarla para conectarte con Orbot y usar Tor.\n\n\n .La configuración host es  127.0.0.1 o \"localhost\", para HTTP, la configuración de puerto es 8118. Para SOCKS, el proxy es 9050. Deberías usar SOCKS4A o SOCKS5 si es posible. \n \n\n\n Puedes aprender mas acerca del proxy en Android a través de las preguntas frecuentes en: http://tinyurl.com/proxyandroid\n .</string>
-  <string name="wizard_final">Orbot está listo!</string>
-  <string name="wizard_final_msg">Millones de personas al rededor del mundo usan Tor por diferentes razones. \n\n periodistas y bloggers, defensores de los derechos humanos, agentes de ley, soldados, corporaciones, ciudadanos de regímenes represivos, y  ciudadanos normales... y ahora tu también estas listo!.</string>
-  <string name="wizard_exit_at_first_screen_toast">Por favor configura Orbot  antes de empezar a usarlo</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Estas conectado satisfactoriamente a la red Tor - pero esto NO significa que tu dispositivo esta seguro. Tu puedes usar el botón de Navegador para probar tu conexión. \n\n Visitanos en https://guardianproject.info/apps/orbot o mándanos un email para saber mas a help@xxxxxxxxxxxxxxxxxxxx.</string>
-  <string name="tor_check">Esto abrirá su navegador web a https://check.torproject.org para ver si Orbot probablemente está configurado y está conectado a Tor.</string>
-  <string name="pref_hs_group">Servicio de hosting oculto</string>
-  <string name="pref_general_group">General</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-->
-  <string name="wizard_title_msg">Orbot lleva Tor a Android! \n\n Tor te ayuda a defenderte contra el filtrado de contenido, análisis de tráfico y vigilancia de red que amenazan la privacidad, la información confidencial y las relaciones personales. \n\n Este asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Cuidado</string>
-  <string name="wizard_warning_msg">Simplemente instalando Orbot no se anonimizará tu trafico móvil. \n\n Debes configurar apropiadamente Orbot,  tu dispositivo y otras aplicaciones para usar satisfactoriamente Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente puedes tener acceso a Orbot \'Superusuario\' para activar funciones avanzadas, como Proxy transparente.</string>
-  <string name="wizard_permissions_root_msg2">Si no quieres hacer esto, por favor asegúrate de usar las aplicaciones hechas para usar Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar ruteado, proporcionar acceso root o tener acceso \"superusuario\". \n\n Por favor pruebe el modo \"aplicaciones\" en la pantalla principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSeguro: aplicación de chat seguro con el cifrado sin registro</string>
-  <string name="wizard_tips_orweb">Orfox: Navegar con privacidad que funciona con Tor</string>
-  <string name="wizard_tips_play">Encuentra todas las aplicaciones de Guardian Project en Google Play</string>
-  <string name="wizard_tips_fdroid">Encuentra todas las aplicaciones de Guardian Project en F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Encuentra todas las aplicaciones de Guardian Project en https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_msg">Esto permite que tus aplicaciones se ejecuten automáticamente a través de la red Tor sin ninguna configuración.</string>
-  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de lo que estamos hablando)</string>
-  <string name="wizard_transproxy_none">ninguno</string>
-  <string name="pref_transparent_tethering_title">Anclaje a red Tor</string>
-  <string name="pref_transparent_tethering_summary">Activar Tor Proxy transparente para dispositivos Wifi y USB conectados (requiere reiniciar)</string>
-  <string name="button_grant_superuser">Solicitar acceso Superusuario</string>
-  <string name="pref_select_apps">seleccionar aplicaciones</string>
-  <string name="pref_select_apps_summary">Elija aplicaciones para rutear a través de Tor</string>
-  <string name="pref_node_configuration">configuracion del nodo</string>
+    <!--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="button_proxy_all">proxy todo</string>
-  <string name="button_proxy_none">proxy nada</string>
-  <string name="button_invert_selection">invertir seleccion</string>
-  <string name="pref_proxy_title">red de proxy de salida (opcional)</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>
@@ -147,20 +57,8 @@
   <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="status">estado</string>
-  <string name="setting_up_full_transparent_proxying_">Configuración de proxy transparente completa ...</string>
-  <string name="setting_up_app_based_transparent_proxying_">configuracion de aplicaciones de proxy transparente</string>
-  <string name="transparent_proxying_enabled">proxy transparente habilitado</string>
-  <string name="transproxy_enabled_for_tethering_">transproxy habilitado para tethering</string>
-  <string name="warning_error_starting_transparent_proxying_">CUIDADO: error al iniciar proxy transparente</string>
-  <string name="transproxy_rules_cleared">Las reglas de transproxy se borran</string>
-  <string name="couldn_t_start_tor_process_">no se pudo iniciar Tor</string>
-  <string name="privoxy_is_running_on_port_">Polipo se esta ejecutando en el puerto</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configuración de proxy basados en puertos...</string>
-  <string name="bridge_error">Error de puente</string>
-  <string name="bridge_requires_ip">Para utilizar la función puente, debe introducir al menos una dirección IP de puente.</string>
-  <string name="send_email_for_bridges">Envia un email a bridges@xxxxxxxxxxxxxx con la linea \"get bridges\" por si mismo en el cuerpo del correo de una cuenta de gmail</string>
-  <string name="error">Error</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>
@@ -173,10 +71,8 @@
   <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="bridges_obfuscated">puentes ofuscados</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar entradas alternativas en la red de Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activar si los puentes configurados son puentes ofuscados</string>
-  <string name="ip_address_and_port_of_bridges">direccion IP y puerto de 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>
@@ -192,17 +88,10 @@
   <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_hidden_services">Servicio de hosting oculto</string>
-  <string name="run_servers_accessible_via_the_tor_network">Permitir que el servidor en el dispositivo sea accesible a través de la red Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ingrese puertos host locales para servicios ocultos</string>
-  <string name="hidden_service_ports">puertos de servicio ocultos</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable para su servicio oculto (generado automáticamente)</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="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="the_tor_license">La Licencia de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de terceros:</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>
@@ -212,19 +101,11 @@
   <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="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="wizard_locale_title">Elegir el lenguaje</string>
-  <string name="btn_save_settings">Guardar configuración</string>
-  <string name="bandwidth_">Ancho de banda:</string>
-  <string name="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_description">Habilitar esta aplicación para que controle el servicio de Tor</string>
-  <string name="pref_socks_title">Tor SOCKS</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="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml
index feb0062d..c8149515 100644
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@@ -2,13 +2,7 @@
 
 <resources>
 
-	<string-array name="bridge_options">
-	    <item>Obfs4 (Preferido)</item>
-	    <item>Túnel a través de Azure y Amazon</item>
-	    <item>Obtener nuevos puentes</item>
-	    <item></item>
-	</string-array>
-	<string-array name="array_hs_types">
+    <string-array name="array_hs_types">
 		<item>Usuarios</item>
 		<item>Aplicaciones</item>
 	</string-array>
diff --git a/app/src/main/res/values-es/poestrings.xml b/app/src/main/res/values-es/poestrings.xml
index edc5aa21..951cd44a 100644
--- a/app/src/main/res/values-es/poestrings.xml
+++ b/app/src/main/res/values-es/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Los puentes son repetidores Tor que ayudan a evitar la censura. Puede probar los puentes si Tor está bloqueado por su ISP, cada tipo de puente
-        usa un método diferente para evitar la censura, si un tipo no funciona, pruebe a usar uno distinto.</string>
-
-    <string name="bridges_no">No hay puentes: Conecte directamente a Tor</string>
-    <string name="bridges_provided">Puentes proporcionados:</string>
-    <string name="bridges_custom">Puentes personalizados</string>
-
-    <string name="bridges_config">Configuración de puente</string>
-    <string name="action_done">Hecho</string>
 
     <string name="bridges_sometimes">A veces necesita un puente para llegar a Tor</string>
     <string name="action_more">CUÃ?NTAME MÃ?S</string>
@@ -17,19 +8,6 @@
     <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="status_connected">¡Conectado!</string>
-
-    <string name="loading_claim_1">¡Nuestra comunidad diversa es lo que hace grande a Tor!</string>
-    <string name="loading_claim_2">Cada día la gente usa Tor para evitar ser seguido por la publicidad dirigida.</string>
-    <string name="loading_claim_3">Cuando Facebook está bloqueado, la gente usa Tor para conectar con sus amigos y familia.</string>
-    <string name="loading_claim_4">Los activistas usan Tor para twitear libremente sus opiniones y creencias.</string>
-    <string name="loading_claim_5">Los blogueros usan Tor para congregar a la gente hacia la reforma social.</string>
-    <string name="loading_claim_6">Los periodistas usan Tor para investigar de forma segura las historias sobre las que están informando.</string>
-    <string name="loading_claim_7">La gente de negocios usa Tor para mantener las estrategias de sus compañías en privado.</string>
-    <string name="loading_claim_8">Los trabajadores usan Tor para luchar por justicia sin miedo a perder su trabajo.</string>
-
-    <string name="status_connecting">Estamos conectándole.\" = \"Estamos conectándole.</string>
-
     <string name="hello">Hola</string>
     <string name="welcome">Bienvenido a Tor para móvil.</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bd0a8b83..1dc70d25 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2,126 +2,39 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">https://check.torproject.org/?lang=es</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar y detener Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciandose...</string>
+    <string name="status_starting_up">Orbot está iniciandose...</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">Orbot está desactivado</string>
   <string name="status_shutting_down">TorService se está cerrando</string>
   <string name="tor_process_starting">Iniciando cliente Tor...</string>
   <string name="tor_process_complete">completado.</string>
-  <string name="tor_process_waiting">en espera.</string>
-  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
-  <string name="menu_home">Principal</string>
-  <string name="menu_browse">Examinar</string>
-  <string name="menu_settings">Configuración</string>
+    <string name="menu_settings">Configuración</string>
   <string name="menu_log">Registro (log)</string>
-  <string name="menu_info">Ayuda</string>
-  <string name="menu_apps">Aplicaciones...</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Detener</string>
   <string name="menu_about">Acerca de</string>
-  <string name="menu_promo_apps">Obtener aplicaciones...</string>
-  <string name="main_layout_download">Descarga</string>
+    <string name="main_layout_download">Descarga</string>
   <string name="main_layout_upload">Subida</string>
-  <string name="button_help">Ayuda</string>
-  <string name="button_close">Cerrar</string>
-  <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Limpiar registro (log)</string>
-  <string name="menu_verify">Verificar</string>
-  <string name="menu_exit">Salir</string>
+    <string name="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="press_to_start">- mantega pulsado para iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
-  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
-  <string name="pref_trans_proxy_summary">Torificado automático de aplicaciones</string>
-  <string name="pref_transparent_all_title">Torificar todo</string>
-  <string name="pref_transparent_all_summary">Proxyfica vía Tor el tráfico de todas las aplicaciones sin configurarlas</string>
-  <string name="pref_transparent_port_fallback_title">Puertos a proxyficar para contingencias</string>
-  <string name="pref_transparent_port_fallback_summary">ADVERTENCIA: Evita puertos comunes (80, 443, etc). *USAR SÃ?LO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan.</string>
-  <string name="pref_transparent_port_title">Lista de puertos</string>
-  <string name="pref_transparent_port_summary">Lista de puertos a proxyficar. *USAR SÃ?LO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan</string>
-  <string name="pref_transparent_port_dialog">Introduzca los puertos a proxyficar</string>
-  <string name="pref_has_root">Solicitar permisos de root</string>
-  <string name="pref_has_root_summary">Solicita permisos de root para usar proxyficación transparente</string>
-  <string name="status_install_success">¡Los binarios de Tor se instalaron con éxito!</string>
-  <string name="status_install_fail">Los archivos binarios de Tor no pudieron ser instalados. Revise el registro (log) y notifique a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de la aplicación</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Finalizar</string>
-  <string name="btn_okay">Aceptar</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permiso concedido</string>
-  <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
-  <string name="wizard_permissions_msg_stock"> Aunque no es un requisito, Orbot puede convertirse en una herramienta más potente si accede a su dispositivo con permisos de root. ¡Utilice el botón inferior para conceder superpoderes a Orbot!</string>
-  <string name="wizard_permissions_no_root">Si no tiene acceso como root o no tiene idea de qué estamos hablando, tan solo asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o que permitan conexión por proxy HTTP o SOCKS).</string>
-  <string name="wizard_permissions_consent">Comprendo, y quiero continuar sin poderes administrativos</string>
-  <string name="wizard_permission_enable_root">Conceder permisos de root a Orbot</string>
-  <string name="wizard_configure">Configurar torificación</string>
-  <string name="wizard_configure_msg">Orbot le da la opción de dirigir el tráfico de todas las aplicaciones a través de Tor - o - de seleccionar sus aplicaciones a torificar individualmente.</string>
-  <string name="wizard_configure_all">Proxyficar todas la aplicaciones a través de Tor</string>
-  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individuales para Tor</string>
-  <string name="wizard_tips_tricks">Aplicaciones habilitadas para Orbot</string>
-  <string name="wizard_tips_msg">Las siguientes aplicaciones fueron desarrolladas para trabajar con Orbot. Haga clic en cada botón para instalarlas ahora, o puede encontrarlas más tarde en Google Play, en la web guardianproject.info o vía f-droid.org </string>
-  <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensajería instantánea segura para Android</string>
-  <string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
-  <string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ¡Elabore una historia y déjesela a Tor por seguridad!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Preferencias para proxy</string>
-  <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un proxy (interpuesto) HTTP o SOCKS, entonces puede configurarla para que conecte a Orbot y use Tor.\n\n\nLa configuración del servidor es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy está en el 9050. Debe utilizar la configuración para SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de proxyficación en Android a través de las preguntas frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">¡Orbot está listo!</string>
-  <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes... ¡y ahora usted también está listo!</string>
-  <string name="wizard_exit_at_first_screen_toast">¡Por favor, configure Orbot antes para poder comenzar a usarlo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto no significa que su dispositivo sea seguro. Puede usar el botón \'Navegador\' para probar su conexión. \n\nVisítenos en https://guardianproject.info/apps/orbot o envíe un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para conocer más.</string>
-  <string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
-  <string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</string>
-  <string name="pref_general_group">General</string>
+    <!--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-->
-  <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse contra el filtrado de contenido, el análisis de tráfico y la vigilancia de la red, que amenazan la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Advertencia</string>
-  <string name="wizard_warning_msg">Simplemente instalando Orbot no anonimizará automáticamente su tráfico móvil/celular.\n\nPara usar Tor con éxito tiene que configurar adecuadamente Orbot, su dispositivo, y otras aplicaciones.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
-  <string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
-  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado o proporcionar root o acceso de \"Superusuario\".\n\nEn su lugar, por favor, pruebe con el modo \'Aplicaciones\' en la pantalla principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplicación de chat segura con cifrado Off-The-Record (OTR)</string>
-  <string name="wizard_tips_orweb">Orfox: Navegador con privacidad mejorada que funciona a través de Tor</string>
-  <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
-  <string name="wizard_tips_fdroid">Encontrará todas las aplicaciones del Guardian Project en F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Encontrará todas las aplicaciones del Guardian Project en https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxyficación transparente</string>
-  <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
-  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
-  <string name="wizard_transproxy_none">Ninguno</string>
-  <string name="pref_transparent_tethering_title">Tor tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wifi, USB o Bluetooth) -- (requiere reinicio)</string>
-  <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
-  <string name="pref_select_apps">Seleccionar aplicaciones</string>
-  <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
-  <string name="pref_node_configuration">Configuración de nodos</string>
+    <!--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 
@@ -129,10 +42,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string>
   <string name="pref_allow_background_starts_title">Permitir inicios en segundo plano</string>
   <string name="pref_allow_background_starts_summary">Deja que cualquier aplicación le diga a Orbot que inicie Tor y servicios relacionados</string>
-  <string name="button_proxy_all">Proxyficar todo</string>
-  <string name="button_proxy_none">No proxyficar nada</string>
-  <string name="button_invert_selection">Invertir selección</string>
-  <string name="pref_proxy_title">Proxy de salida a la red (opcional)</string>
+    <string name="pref_proxy_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>
@@ -148,20 +58,8 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="pref_proxy_password_title">Contraseña en el proxy de salida</string>
   <string name="pref_proxy_password_summary">Contraseña en el proxy (opcional)</string>
   <string name="pref_proxy_password_dialog">Introduzca contraseña en el proxy</string>
-  <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
-  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
-  <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
-  <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
-  <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
-  <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo se está ejecutando en el puerto:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
-  <string name="bridge_error">Error de bridge (repetidor puente)</string>
-  <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
-  <string name="send_email_for_bridges">Envíe un correo a bridges@xxxxxxxxxxxxxx incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
-  <string name="error">Error</string>
+    <string name="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>
@@ -174,10 +72,8 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados</string>
   <string name="bridges">Bridges (repetidores puente) </string>
   <string name="use_bridges">Usar bridges</string>
-  <string name="bridges_obfuscated">Bridges ofuscados (contra análisis DPI del tráfico) </string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar entradas alternativas hacia el interior de la red Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilítelo si los bridges (repetidores puente) de su lista de configuración están ofuscados (encapsulando el tráfico SSL para evitar ser detectados) </string>
-  <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges</string>
+    <string name="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>
@@ -193,17 +89,10 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="reachable_ports">Puertos accesibles</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo (80 y 443 por defecto)</string>
   <string name="enter_ports">Introduzca puertos</string>
-  <string name="enable_hidden_services">Activar alojamiento de servicios ocultos (en la red Tor)</string>
-  <string name="run_servers_accessible_via_the_tor_network">Permite el acceso a servidores ocultos por dispositivo (IP oculta al usuario) accesibles a través de la red Tor (dominio .onion, sin DNS)</string>
-  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de sus servicios ocultos</string>
-  <string name="hidden_service_ports">Puertos de los servicios ocultos</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
   <string name="project_home">Página(s) principal(es) del proyecto:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Licencia de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de terceras partes</string>
+    <string name="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>
@@ -212,37 +101,18 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <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="hidden_service_on">Servicio oculto en:</string>
-  <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
+    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
   <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
-  <string name="unable_to_reset_tor">¡Reinicie su dispositivo, no se pudo reiniciar Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar el Iptables por defecto</string>
-  <string name="pref_use_sys_iptables_summary">Usa el binario de Iptables del sistema en lugar del incluído en el paquete de Orbot</string>
-  <string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</string>
-  <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
+    <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
   <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
   <string name="pref_use_expanded_notifications_title">Notificaciones expandidas</string>
-  <string name="notification_using_bridges">¡Bridges habilitados! </string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
-  <string name="wizard_locale_title">Escoja idioma</string>
-  <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
-  <string name="powered_by">impulsado por Tor</string>
-  <string name="btn_save_settings">Guardar configuración</string>
-  <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</string>
-  <string name="bandwidth_">Ancho de banda:</string>
-  <string name="down">bajada</string>
-  <string name="up">subida</string>
-  <string name="pref_disable_network_title">Sin suspensión-automática de la red</string>
+    <string name="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="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Administrar Tor</string>
-  <string name="permission_manage_tor_description">Habilita esta aplicación para controlar el servicio Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona mejor con el Navegador Orfox. ¿Instalarlo ahora?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona mejor con el Navegador Orfox. ¿Instalarlo ahora?</string>
   <string name="install_apps_">¿Instalar navegador?</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>
@@ -259,19 +129,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="pref_torrc_title">Configuración personalizada de torrc</string>
   <string name="pref_torrc_summary">S�LO EXPERTOS: Introduzca directamente las líneas de configuración en el fichero torrc</string>
   <string name="pref_torrc_dialog">torrc personalizado</string>
-  <string name="wizard_tips_martus">Martus Móvil - Aplicación de documentación de derechos humanos de Benetech</string>
-  <string name="your_tor_public_ips_">Las IPs públicas de su Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por favor, deshabilite esta aplicación en Android-&gt;Configuración-&gt;Aplicaciones si está teniendo problemas con Orbot:</string>
-  <string name="app_conflict">Conflicto de la aplicación</string>
-  <string name="pref_transproxy_refresh_title">Auto-refresco de transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Reaplica las reglas de transproxy cuando el estado de la red cambia</string>
-  <string name="pref_transproxy_flush_title">Transproxy FORZAR ELIMINACIÃ?N</string>
-  <string name="pref_transproxy_flush_summary">Pulse aquí para desechar AHORA todas las reglas de red de transproxy </string>
-  <string name="transparent_proxy_rules_flushed_">¡Reglas de proxy transparente desechadas!</string>
-  <string name="you_do_not_have_root_access_enabled">No tiene habilitado el acceso como ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Puede que tenga que detener e iniciar Orbot para que el cambio de configuración se habilite.</string>
-  <string name="menu_vpn">Aplicaciones</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -284,19 +142,15 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <string name="get_bridges_web">Página web</string>
   <string name="activate">Activar</string>
   <string name="apps_mode">Modo VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puede habilitar que las aplicaciones vayan a través de Tor usando la VPN integrada de Orbot.\n\nEsto no le hará anónimo, pero le ayudará a atravesar cortafuegos/firewalls.</string>
-  <string name="send_email">Enviar correo</string>
+    <string name="send_email">Enviar correo</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Puede obtener una dirección de bridge (repetidor puente) a través de correo electrónico, la web, o escaneando un código QR de bridge. Seleccione \'Correo\' o \'Web\' debajo para solicitar una dirección de bridge.\n\nUna vez tenga una dirección, copie y péguela en la opción \"Bridges\" de la configuración de Orbot, y reinicie.</string>
   <string name="install_orweb">Instalar Orfox</string>
-  <string name="standard_browser">Navegador estándar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Sólo los repetidores puente (bridges) estándar de Tor funcionan en dispositivos Intel X86/ATOM</string>
-  <string name="vpn_default_world">Global (Automático)</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="ports">Puertos</string>
-  <string name="local_port">Puerto local</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>
@@ -309,9 +163,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <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="permission_granted">Permiso concedido</string>
-  <string name="permission_denied">Permiso denegado</string>
-  <string name="restore_backup">Restaurar copia de seguridad</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>
@@ -344,10 +196,8 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de
   <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="please_enable_vpn">Por favor, active el modo VPN para posibilitar usar Tor a las aplicaciones</string>
-  <string name="app_shortcuts">Aplicaciones habilitadas-para-Tor</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Probando conexión de puente hacia Tor...</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>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index e9c7b46d..d986129a 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -2,110 +2,36 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">käivita ja peata Tor</string>
-  <string name="tor_proxy_service_process">torproxyteenus</string>
-  <string name="status_starting_up">Orbot käivitub...</string>
+    <string name="status_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="tor_process_waiting">ootel.</string>
-  <string name="not_anonymous_yet">HOIATUS: Teie liiklus pole veel anonüümne! Palun seadistage oma rakendused nii et need kasutaksid HTTP proxy\'t 127.0.0.1:8118 või SOCKS4A või SOCKS5 proxy\'t 127.0.0.1:9050</string>
-  <string name="menu_home">Kodu</string>
-  <string name="menu_browse">Sirvi</string>
-  <string name="menu_settings">Seaded</string>
+    <string name="menu_settings">Seaded</string>
   <string name="menu_log">Logi</string>
-  <string name="menu_info">Abi</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">Lähemalt</string>
   <string name="main_layout_download">Lae alla</string>
   <string name="main_layout_upload">Lae üles</string>
-  <string name="button_help">Abi</string>
-  <string name="button_close">Sulge</string>
-  <string name="button_about">Lähemalt</string>
-  <string name="button_clear_log">Nulli logi</string>
-  <string name="menu_verify">Kontrolli</string>
-  <string name="menu_exit">Välja</string>
-  <string name="press_to_start">- pikk vajutus alustamiseks -</string>
-  <string name="pref_trans_proxy_group">Läbipaistev proxy (Nõuab Root õigusi)</string>
-  <string name="pref_trans_proxy_title">Läbipaistev proxy</string>
-  <string name="pref_trans_proxy_summary">Rakenduste automaatne Torifitseerimine</string>
-  <string name="pref_transparent_all_title">Kõik läbi Tor\'i</string>
-  <string name="pref_transparent_all_summary">Proxy kõikide reakenduste liiklus läbi Tor\'i</string>
-  <string name="pref_transparent_port_fallback_title">Pordiproxy reserv</string>
-  <string name="pref_transparent_port_fallback_summary">HOIATUS: Väldib tavaporte (80, 443, jne). *KASUTAGE AINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta.</string>
-  <string name="pref_transparent_port_title">Portide loend</string>
-  <string name="pref_transparent_port_summary">Proxy portide loend. *KASUTAGE SINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta</string>
-  <string name="pref_transparent_port_dialog">Sisestage pordid mida proxy\'da</string>
-  <string name="pref_has_root">Nõua root juurdepääsu</string>
-  <string name="pref_has_root_summary">Nõua läbipaistva proxy jaoks root juurdepääsu</string>
-  <string name="status_install_success">Tor binaarid edukalt paigaldatud!</string>
-  <string name="status_install_fail">Tor binaarfailide paigaldamine ebaõnnestus. Palun kontrollige logi ja teavitage tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Rakenduse Viga</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Lähemalt Orbot\'ist</string>
-  <string name="btn_next">Edasi</string>
-  <string name="btn_back">Tagasi</string>
-  <string name="btn_finish">Lõpeta</string>
-  <string name="btn_okay">Hea küll</string>
+    <string name="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>
-  <string name="wizard_permissions_root">Luba Antud</string>
-  <string name="wizard_permissions_stock">Orbot õigused</string>
-  <string name="wizard_premissions_msg_root">Vinge! Leidsime et teie seadmes on Orbot\'ile lubatud root õigused. Lubame kasutada seda väge arukalt.</string>
-  <string name="wizard_permissions_msg_stock">Kuigi see pole vajalik, saab root juurdepääsuga seadmel kasutada Orbot\'i palju võimsama vahendina. Kasutage allpool olevat nuppu et lubada Orbot\'ile supervõimed!</string>
-  <string name="wizard_permissions_no_root">Kui teil pole root juurdepääsu või te ei tea millest jutt käib, siis kindlustage et kasutate ainult rakendusi mis on seadistatud Orbot\'iga koos töötama.</string>
-  <string name="wizard_permissions_consent">Saan aru ja jätkan ilma Superkasutajata</string>
-  <string name="wizard_permission_enable_root">Luba Orbotile Root õigused</string>
-  <string name="wizard_configure">Seadista Torifitseerimine</string>
-  <string name="wizard_configure_msg">Orbot võimaldab juhtida kõigi rakenduste liikluse läbi Tor\'i V�I valida need rakendused individuaalselt.</string>
-  <string name="wizard_configure_all">Proxy kõik rakendused läbi Tor\'i</string>
-  <string name="wizard_configure_select_apps">Valige Tor\'i jaoks individuaalsed rakendused</string>
-  <string name="wizard_tips_tricks">Orbot-lubatud rakendused</string>
-  <string name="wizard_tips_msg">Alltoodud rakendused arendati Orbot\'iga koos töötama. Koheseks paigaldamiseks vajutage igat allolevat nuppu või paigaldage need hiljem Google Play portaalist, GuardianProject.info veebilehelt või F-Droid.org kaudu.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Turvaline kiirsõnumiklient Androidile</string>
-  <string name="wizard_tips_proxy">Proxy seaded - �pi kuidas seadistada rakendusi töötama koos Orbot\'iga</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo otsingumootori rakendus</string>
-  <string name="wizard_tips_twitter">Seadistage Twitteri proxy server \"localhost\" ja port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxyseaded</string>
-  <string name="wizard_final">Orbot on valmis!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">See avab teie veebisivikus lehe https://check.torproject.org mille kaudu saate näha kas Orbot on ehk seadistatud ja olete ühenduses Tor\'iga.</string>
-  <string name="pref_hs_group">Peidetud Teenuste Majutus</string>
-  <string name="pref_general_group">Ã?ldist</string>
+    <!--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-->
-  <string name="wizard_warning_title">Hoiatus</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Load</string>
-  <string name="wizard_permissions_root_msg1">Võite Orbot\'ile lubada \'Superkasutaja\' juurdepääsu selleks et võimaldada rohkem võimalusi, nagu näiteks Läbipaistev Proxy.</string>
-  <string name="wizard_permissions_root_msg2">Kui te ei soovi seda teha, siis palun kindlustage et kasutate ainult rakendusi mis on seadistatud töötama koos Orbot\'iga</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot\'ile mõeldud rakendused</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Turvaline vestlusrakendus Off-the-Record krüptoga</string>
-  <string name="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Läbipaistev Proxy</string>
-  <string name="wizard_transproxy_msg">Saate kõik rakendused suunata iseeneslikult Tor kaudu, lisaseadistusteta.</string>
-  <string name="wizard_transproxy_hint">(Klikkige sellele kastile kui teil pole õrna aimugi millest jutt käib)</string>
-  <string name="wizard_transproxy_none">Puudub</string>
-  <string name="pref_transparent_tethering_title">Tor lõastamine</string>
-  <string name="pref_transparent_tethering_summary">Luba Tor Läbipaistev Proxy WiFi ja USB lõastatud seadmetele (vajab uuestilaadimist)</string>
-  <string name="button_grant_superuser">Nõua Superkasutaja Juurdepääsu</string>
-  <string name="pref_select_apps">Vali Rakendused</string>
-  <string name="pref_select_apps_summary">Vali läbi Tor suunatavad rakendused</string>
-  <string name="pref_node_configuration">Sõlme seadistamine</string>
+    <!--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>
@@ -126,19 +52,8 @@
   <string name="pref_proxy_password_title">Väljuva proxy salasõna</string>
   <string name="pref_proxy_password_summary">Proxy salasõna (Valikuline)</string>
   <string name="pref_proxy_password_dialog">Sisestage proxy salasõna</string>
-  <string name="status">Olek</string>
-  <string name="setting_up_full_transparent_proxying_">Täisläbipaistva proxy seadistamine...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Rakenduspõhise läbipaistva proxy seadistamine...</string>
-  <string name="transparent_proxying_enabled">Läbipaistev proxy LUBATUD</string>
-  <string name="transproxy_enabled_for_tethering_">LäbivProxy lõastamine lubatud!</string>
-  <string name="warning_error_starting_transparent_proxying_">Hoiatus: viga läbipaistva proxy käivitamisel!</string>
-  <string name="transproxy_rules_cleared">LäbivProxy seaded nullitud</string>
-  <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Pordipõhise läbipaistva proxy seadistamine...</string>
-  <string name="bridge_error">Silla viga</string>
-  <string name="bridge_requires_ip">Silla võimaluse kasutamiseks peate sisestama vähemalt ühe silla IP aadressi.</string>
-  <string name="send_email_for_bridges">Saatke e-kiri oma gmail kontolt aadressile bridges@xxxxxxxxxxxxxx mis sisaldab ainult ühte rida \"get bridges\".</string>
-  <string name="error">Viga</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>
@@ -151,9 +66,7 @@
   <string name="use_only_these_specified_nodes">Kasuta *ainult* neid märgitud sõlmi</string>
   <string name="bridges">Sillad</string>
   <string name="use_bridges">Kasuta sildu</string>
-  <string name="bridges_obfuscated">Varjatud sillad</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Luba siis kui seadistatud sillad on varjatud sillad</string>
-  <string name="ip_address_and_port_of_bridges">Sildade IP aadressid ja pordinumbrid</string>
+    <string name="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>
@@ -169,45 +82,21 @@
   <string name="reachable_ports">Juurdepääsetavad pordid</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Piirava poliitikaga tulemüüris avatud pordid</string>
   <string name="enter_ports">Sisestage pordid</string>
-  <string name="enable_hidden_services">Varjatud teenuste majutamine</string>
-  <string name="run_servers_accessible_via_the_tor_network">luba üle Tor võrgustiku juurdepääs seadmes töötavale serverile</string>
-  <string name="enter_localhost_ports_for_hidden_services">sisestage varjatud teenuste localhost pordid</string>
-  <string name="hidden_service_ports">Varjatud teenuste pordid</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">teie varjatud teenuste adresseeritav nimi (luuakse automaatselt)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">lubage väljastatav silumislogi (vaatamiseks peab kasutama kas adb või aLogCat utiliite) </string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">lubage väljastatav silumislogi (vaatamiseks peab kasutama kas adb või aLogCat utiliite) </string>
   <string name="project_home">Projekti kodu(d):</string>
-  <string name="the_tor_license">Tor litsents</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
+    <string name="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="hidden_service_on">varjatud teenused:</string>
-  <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
+    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
   <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
-  <string name="pref_use_sys_iptables_title">Kasuta iptables vaikeseadeid</string>
-  <string name="pref_use_sys_iptables_summary">kasuta Orbot\'iga kaasneva iptables binaari asemel süsteemset binaari</string>
-  <string name="error_installing_binares">Tor binaaride paigaldamine või uuendamine ebaõnnestus.</string>
-  <string name="pref_use_persistent_notifications">�hendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
+    <string name="pref_use_persistent_notifications">�hendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
   <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
-  <string name="notification_using_bridges">Sillad lubatud!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Valige Orbot lokaat ja keel</string>
-  <string name="wizard_locale_title">Valige keel</string>
-  <string name="wizard_locale_msg">Jätkake vaikeväärtusega või vahetage kehtiv keel</string>
-  <string name="btn_save_settings">Salvesta seaded</string>
-  <string name="bandwidth_">Ribalaius:</string>
-  <string name="down">alla</string>
-  <string name="up">üles</string>
-  <string name="pref_disable_network_title">Pole võrgu auto-und</string>
+    <string name="pref_disable_network_title">Pole võrgu auto-und</string>
   <string name="pref_disable_network_summary">Pane Tor magama kui Internetiühendus puudub</string>
   <string name="newnym">Lülitusite uuele Tor identiteedile!</string>
-  <string name="menu_use_chatsecure">Kasutage ChatSecure\'t</string>
-  <string name="permission_manage_tor_label">Hallake Tor\'i</string>
-  <string name="permission_manage_tor_description">Lubage sellel rakendusel hallata Tor teenust</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Interneti ühendus puudub. Panen Tori magama...</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="menu_vpn">Rakendused</string>
-  <string name="save">Salvesta</string>
+    <string name="save">Salvesta</string>
   <string name="name">Name</string>
   <string name="disable">Keela</string>
   <string name="enable">Luba</string>
diff --git a/app/src/main/res/values-eu/poestrings.xml b/app/src/main/res/values-eu/poestrings.xml
index adba1bd7..3b5d7d92 100644
--- a/app/src/main/res/values-eu/poestrings.xml
+++ b/app/src/main/res/values-eu/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Zubiak zentsura saihesten laguntzen duten Tor erreleak dira. Zubiak probatu ditzakezu zure internet hornitzaileak Tor blokeatzen badu; zubi mota bakoitzak metodo desberdin bat darabil zentsura ekiditeko: mota bat ez badabil, erabili mota desberdin bat.</string>
-
-    <string name="bridges_no">Zubiri ez: Konektatu zuzenean Tor sarera</string>
-    <string name="bridges_provided">Hornitutako zubiak:</string>
-    <string name="bridges_custom">Zubi pertsonalak</string>
-
-    <string name="bridges_config">Zubi-konfigurazioa</string>
-    <string name="action_done">Eginda</string>
 
     <string name="bridges_sometimes">Batzuetan zubi bat behar duzu Tor sarera heltzeko</string>
     <string name="action_more">KONTATU GEHIAGO</string>
@@ -16,19 +8,6 @@
     <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="status_connected">Konektatuta!</string>
-
-    <string name="loading_claim_1">Gure komunitatea da Tor zoragarri bihurtzen duena!</string>
-    <string name="loading_claim_2">Egunero jendeak Tor erabiltzen du iragarkien jarraipena saihesteko.</string>
-    <string name="loading_claim_3">Facebook blokeatuta dagoenean, jendeak Tor erabiltzen du bere lagun eta familiarekin konektatzeko.</string>
-    <string name="loading_claim_4">Aktibistek Tor erabiltzen dute iritziak eta sinesmenak askatasunez txiokatzeko.</string>
-    <string name="loading_claim_5">Blogariek Tor erabiltzen dute jendea gizartearen aldaketara animatzeko.</string>
-    <string name="loading_claim_6">Kazetariek Tor erabiltzen dute azalarazten ari diren istorioak seguru ikertzeko.</string>
-    <string name="loading_claim_7">Negozioetako jendeak Tor darabil enpresaren estrategia pribatuan mantentzeko.</string>
-    <string name="loading_claim_8">Langileek Tor erabiltzen dute justiziaren alde borrokatzeko lana galtzeko beldurrik gabe.</string>
-
-    <string name="status_connecting">Konektatzen zaitugu.\" = \"Konektatzen zaitugu.</string>
-
     <string name="hello">Kaixo</string>
     <string name="welcome">Ongi etorri mugikorreko Tor-era.</string>
 
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 7f2240c0..cd8b65f5 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -2,136 +2,46 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">hasi eta gelditu Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot abiarazten ari da...</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="tor_process_waiting">itxaroten.</string>
-  <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string>
-  <string name="menu_home">Hasiera</string>
-  <string name="menu_browse">Arakatu</string>
-  <string name="menu_settings">Ezarpenak</string>
+    <string name="menu_settings">Ezarpenak</string>
   <string name="menu_log">Egunkaria</string>
-  <string name="menu_info">Laguntza</string>
-  <string name="menu_apps">Aplikazioak...</string>
-  <string name="menu_start">Abiarazi</string>
+    <string name="menu_start">Abiarazi</string>
   <string name="menu_stop">Gelditu</string>
   <string name="menu_about">Honi buruz</string>
-  <string name="menu_promo_apps">Eskuratu aplikazioak...</string>
-  <string name="main_layout_download">Jaitsiera</string>
+    <string name="main_layout_download">Jaitsiera</string>
   <string name="main_layout_upload">Igoera</string>
-  <string name="button_help">Laguntza</string>
-  <string name="button_close">Itxi</string>
-  <string name="button_about">Honi buruz</string>
-  <string name="button_clear_log">Garbitu egunkaria</string>
-  <string name="menu_verify">Egiaztatu</string>
-  <string name="menu_exit">Irten</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="press_to_start">- sakatu luze hasteko -</string>
-  <string name="pref_trans_proxy_group">Proxyatze Gardena (Root behar du)</string>
-  <string name="pref_trans_proxy_title">Proxyatze Gardena</string>
-  <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze automatikoa</string>
-  <string name="pref_transparent_all_title">Tor-tu dena</string>
-  <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</string>
-  <string name="pref_transparent_port_fallback_title">Azken aukerako proxy atakak</string>
-  <string name="pref_transparent_port_fallback_summary">KONTUZ: Ohizko portuak sahiezten ditu (80, 443, etab.) *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil.</string>
-  <string name="pref_transparent_port_title">Ataken zerrenda</string>
-  <string name="pref_transparent_port_summary">Proxyak baimenduko dituen atakak. *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil</string>
-  <string name="pref_transparent_port_dialog">Sartu proxyatzeko atakak</string>
-  <string name="pref_has_root">Eskatu root sarbidea</string>
-  <string name="pref_has_root_summary">Eskatu root sarbidea proxyatze gardenarentzat</string>
-  <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string>
-  <string name="status_install_fail">Tor fitxategi bitarrak ezin izan dira instalatu. Mesedez ikusi egunkaria eta jakinarazi tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Aplikazio-errorea</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot-i buruz</string>
-  <string name="btn_next">Hurrengoa</string>
-  <string name="btn_back">Atzera</string>
-  <string name="btn_finish">Amaitu</string>
-  <string name="btn_okay">Ados</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Baimena emanda</string>
-  <string name="wizard_permissions_stock">Orbot baimenak</string>
-  <string name="wizard_premissions_msg_root">Bikain! Orbotentzako root baimenak gaituta dituzula antzeman dugu. Botere hau zentzuz erabiliko dugu.</string>
-  <string name="wizard_permissions_msg_stock">Beharrezkoa ez den arren, Orbot tresna ahaltsuagoa bihurtu daiteke zure gailuak root atzipena badu. Erabili beheko botoia Orboteri superbotereak emateko!</string>
-  <string name="wizard_permissions_no_root">Root sarbiderik ez baduzu edo zertaz ari garen ez badakizu, ziurtatu  Orbotekin lan egiteko prest dauden aplikazioak erabiltzen dituzula.</string>
-  <string name="wizard_permissions_consent">Ulertzen dut eta supererabiltzaile gabe jarraitu nahiko nuke</string>
-  <string name="wizard_permission_enable_root">Eman root baimena Orbot-i</string>
-  <string name="wizard_configure">Konfiguratu torifikazioa</string>
-  <string name="wizard_configure_msg">Orbot-ek zure aplikazio guztien trafikoa Tor bidez bideratzeko aukera ematen dizu EDO aplikazioak banan-banan hautatzeko.</string>
-  <string name="wizard_configure_all">Proxyatu aplikazio guztiak Tor bidez</string>
-  <string name="wizard_configure_select_apps">Hautatu banakako aplikazioak Torentzat</string>
-  <string name="wizard_tips_tricks">Orbot-gaitutako aplikazioak</string>
-  <string name="wizard_tips_msg">Azpiko aplikazioak Orbot-ekin lan egiteko garatu dira. Sakatu botoi bakoitza orain instalatzeko, edo bilatu geroago Google Play-n, GuardianProject.info webgunean edo F-Droid.org erabiliz.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
-  <string name="wizard_tips_proxy">Proxy ezarpenak - Ikasi zure aplikazioak Orbot-ekin funtziona dezaten nola konfiguratu</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo bilaketa motorraren aplikazioa</string>
-  <string name="wizard_tips_twitter">Twittereko proxyaren ostalarian \"localhost\" jarri eta atakan 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Osatu istorio bat eta utzi Tor-en segurtasunerako!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-aren ezarpenak</string>
-  <string name="wizard_proxy_help_msg">Erabiltzen duzun Androik aplikazioak HTTP edo SOCKS proxyak erabili ahal baditu, Orbot bidez konektatzeko eta Tor sarea erabiltzeko konfiguratu ahal duzu.\n\n\n Ostalariaren ezarpena 127.0.0.1 edo \"localhost\" da. HTTPrako ataka 8118 da. SOCKS-erako ataka 9050 da. SOCKS4A edo SOCKS5 erabili beharko zenuke ahal bada.\n \n\n\n Android-en proxya erabiltzeari buruz gehiago jakiteko begiratu: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot prest dago!</string>
-  <string name="wizard_final_msg">Munduan zehar milioika pertsonek Tor erabiltzen dute arrazoi ezberdinengatik.\n\nKazetariak eta blogariak, giza eskubideen defendatzaileak, legea betearazteko ofizialak, soldaduak, korporazioak,  erregimen errepresiboetako biztanleak, biztanle arruntak,... eta orain zu prest zaude, baita ere!</string>
-  <string name="wizard_exit_at_first_screen_toast">Mesedez konfiguratu Orbot erabiltzen hasi baino lehen!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ongi konektatu zara Tor sarera - baina honek EZ du esan nahi zure gailua segurua denik. Menuko \'Nabigatzailea\' botoia sakatu dezakezu zure konexioa egiaztatzeko. \n\n Ikusi https://guardianproject.info/apps/orbot edo idatzi e-mail bat help@xxxxxxxxxxxxxxxxxxxx kontura gehiago jakiteko.</string>
-  <string name="tor_check">Honek https://check.torproject.org web nabigatzailean irekiko du Orbot konfiguratuta eta Tor-era konektatuta zauden antzemateko.</string>
-  <string name="pref_hs_group">Ezkutuko zerbitzuak ostatatzea</string>
-  <string name="pref_general_group">Orokorra</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-->
-  <string name="wizard_title_msg">Orbot-ek Tor Android-era dakar!\n\n Tor-ek pribatutasuna, konfidentzialtasuna eta erlazio pertsonalak mehatxatzen dituzten eduki iragazki, trafiko analisi eta sare zaintzaz babesten laguntzen zaitu. \n\nLaguntzaile honek zure gailuan Orbot eta Tor konfiguratzen lagunduko zaitu.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Abisua</string>
-  <string name="wizard_warning_msg">Orbot instalatuz bakarrik ez duzu zure mobileko trafikoa anonimizatuko.\n\nOrbot, zure gailua eta beste aplikazioak konfiguratu behar dituzu Tor behar bezala erabiltzeko.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Baimenak</string>
-  <string name="wizard_permissions_root_msg1">Aukeran Orbot-i \'Supererabiltzaile\' sarbidea eman ahal diozu ezaugarri aurreratuak erabiltzeko, Proxy gardena adibidez.</string>
-  <string name="wizard_permissions_root_msg2">Ez baduzu hau egin nahi ziurtatu Orbot-ekin dabiltzan aplikazioak erabiltzen dituzula.</string>
-  <string name="wizard_permissions_no_root_msg">Ez dirudi zure gailua rooteatuta dagoenik edo \'Supererabiltzaile\' sarbidea ematen duenik.\n\nHonen ordez, probatu \'Aplikazioak\' modua pantaila nagusian.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-gaitutako aplikazioak</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Txat aplikazio segurua Off-the-Record zifratzearekin.</string>
-  <string name="wizard_tips_orweb">Orfox - Tor erabiliz pribatutasun-hobetua duen nabigatzailea</string>
-  <string name="wizard_tips_play">Bilatu Guardian Project aplikazio guztiak Google Play biltegian </string>
-  <string name="wizard_tips_fdroid">Bilatu Guardian Project aplikazio guztiak F-Droid biltegian</string>
-  <string name="wizard_tips_fdroid_org">Bilatu Guardian Project aplikazio guztiak https://f-droid.org helbidean</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxyatze gardena</string>
-  <string name="wizard_transproxy_msg">Honek zure aplikazioak automatikoki Tor saretik pasatzea ahalbidetzen du konfiguratu beharrik gabe.</string>
-  <string name="wizard_transproxy_hint">(Markatu kutxatila hau zertaz ari garen ulertzen ez baduzu)</string>
-  <string name="wizard_transproxy_none">Bat ere ez</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Gaitu proxy gardena Wifi eta USB bidez Tethering-atutako gailuentzat (berrabiaraztea beharrezkoa)</string>
-  <string name="button_grant_superuser">Eskatu supererabiltzaile sarbidea</string>
-  <string name="pref_select_apps">Hautatu aplikazioak</string>
-  <string name="pref_select_apps_summary">Hautatu Tor bidez bideratuko diren aplikazioak</string>
-  <string name="pref_node_configuration">Nodo konfigurazioa</string>
+    <!--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="button_proxy_all">Proxy-tik pasatu guztia</string>
-  <string name="button_proxy_none">Ez pasatu proxy-tik ezer</string>
-  <string name="button_invert_selection">Alderantzikatu hautaketa</string>
-  <string name="pref_proxy_title">Irteera sareko proxya (Aukerazkoa)</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>
@@ -147,20 +57,8 @@
   <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="status">Egoera</string>
-  <string name="setting_up_full_transparent_proxying_">Guztientzako proxy gardena martxan ezartzen...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Aplikazioetan oinarritutako proxy gardena ezartzen...</string>
-  <string name="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string>
-  <string name="transproxy_enabled_for_tethering_">Proxy gardena gaituta Tethering-ean!</string>
-  <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string>
-  <string name="transproxy_rules_cleared">Proxy gardeneko arauak garbituta</string>
-  <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
-  <string name="privoxy_is_running_on_port_">Polipo honako atakan exekutatzen ari da:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Atakatan oinarritutako proxy gardena ezartzen...</string>
-  <string name="bridge_error">Zubiaren errorea</string>
-  <string name="bridge_requires_ip">Zubi ezaugarria erabiltzeko gutxienez zubi baten IP helbidea sartu behar duzu.</string>
-  <string name="send_email_for_bridges">Gmail kontutik bridges@xxxxxxxxxxxxxx helbidera eposta bat bidali gorputzean \"get bridges\" lerroa duena.</string>
-  <string name="error">Errorea</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>
@@ -173,10 +71,8 @@
   <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="bridges_obfuscated">Nahasitako Zubiak</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gaitu ordezko sarrerak Tor sarera</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string>
-  <string name="ip_address_and_port_of_bridges">Zubien IP helbidea eta ataka</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>
@@ -192,17 +88,10 @@
   <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_hidden_services">Ezkutuko zerbitzuak ostatatzea</string>
-  <string name="run_servers_accessible_via_the_tor_network">gaitu gailuko zerbitzaria Tor saretik atzitu ahal izatea</string>
-  <string name="enter_localhost_ports_for_hidden_services">sartu localhost atakak ezkutuko zerbitzuentzat</string>
-  <string name="hidden_service_ports">Ezkutuko zerbitzuaren atakak</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">zure eskutuko zerbitzuaren izen atzigarria (automatikoki sortuta)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">gaitu arazketarako egunkariak (adb edo aLogCat erabili behar da ikusteko)</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="the_tor_license">Tor lizentzia</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Hirugarrengoen softwarea:</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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">ezkutuko zerbitzua hemen:</string>
-  <string name="unable_to_read_hidden_service_name">ezin izan da ezkutuko zerbitzuaren izena irakurri</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="unable_to_reset_tor">Berrabiarazi zure gailua, ezin izan da Tor berrezarri!</string>
-  <string name="pref_use_sys_iptables_title">Erabili lehenetsitako Iptables</string>
-  <string name="pref_use_sys_iptables_summary">erabili sistemako iptables bitarra Orbot-ekin datorrenaren ordez</string>
-  <string name="error_installing_binares">Ezin izan dira Tor bitarrak instalatu edo eguneratu.</string>
-  <string name="pref_use_persistent_notifications">Mantendu ikonoa tresna barran Orbot konektatuta dagoenean</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="notification_using_bridges">Zubiak gaituta!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Hizkuntza</string>
-  <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
-  <string name="wizard_locale_title">Hautatu hizkuntza</string>
-  <string name="wizard_locale_msg">Utzi lehenetsitakoa edo aldatu uneko hizkuntza</string>
-  <string name="powered_by">Tor-ek eskainita</string>
-  <string name="btn_save_settings">Gorde ezarpenak</string>
-  <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</string>
-  <string name="bandwidth_">Banda zabalera:</string>
-  <string name="down">behera</string>
-  <string name="up">gora</string>
-  <string name="pref_disable_network_title">Sareko lokartze automatikorik ez</string>
+    <string name="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="menu_verify_browser">Nabigatzailea</string>
-  <string name="menu_use_chatsecure">Erabili ChatSecure</string>
-  <string name="permission_manage_tor_label">Kudeatu Tor</string>
-  <string name="permission_manage_tor_description">Ahalbidetu aplikazio honek Tor zerbitzua kontrolatzea</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot hobeto dabil Orfox nabigatzailearekin. Instalatu orain?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot hobeto dabil Orfox nabigatzailearekin. Instalatu orain?</string>
   <string name="install_apps_">Instalatu nabigatzailea?</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>
@@ -258,19 +128,7 @@
   <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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Zure Tor IP publikoak:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Desgaitu aplikazio hau Android-&gt;Ezarpenak-&gt;Aplikazioak atalean Orbot-ekin arazoak badituzu:</string>
-  <string name="app_conflict">Aplikazioen arteko talka</string>
-  <string name="pref_transproxy_refresh_title">Proxy gardenaren freskatze automatikoa</string>
-  <string name="pref_transproxy_refresh_summary">Berraplikatu proxy gardenaren arauak sarearen egoera aldatzean</string>
-  <string name="pref_transproxy_flush_title">Proxy gardena BEHARTU KENTZEA</string>
-  <string name="pref_transproxy_flush_summary">Sakatu hemen proxy gardenaren sare arau guztiak ORAIN kentzeko</string>
-  <string name="transparent_proxy_rules_flushed_">Proxy gardenaren arauak kendu dira!</string>
-  <string name="you_do_not_have_root_access_enabled">Ez duzu ROOT sarbidea gaituta</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Agian Orbot gelditu eta berrabiarazi behar duzu ezarpenetan egindako aldaketak aplikatzeko.</string>
-  <string name="menu_vpn">Aplikazioak</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Aktibatu</string>
   <string name="apps_mode">VPN modua</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Aplikazioak Tor bidez pasatzea gaitu dezakezu Orbot-ek dakarren VPN-a erabilita.\n Honek ez zaitu anonimoa bihurtuko, baina suebakietatik pasatzen lagunduko zaitu.</string>
-  <string name="send_email">Bidali E-maila</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="install_orweb">Instalatu Orfox</string>
-  <string name="standard_browser">Nabigatzaile estandarra</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">OHARRA: Tor zubi estandarrak besterik ez dabiltza Intel X86/ATOM gailuetan</string>
-  <string name="vpn_default_world">Orokorra (Automatikoa)</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="ports">Atakak</string>
-  <string name="local_port">Ataka lokala</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Baimena emanda</string>
-  <string name="permission_denied">Baimena ukatua</string>
-  <string name="restore_backup">Berrezarri babeskopia</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Aktibatu VPN modua aplikazioek Tor erabiltzea ahalbidetzeko</string>
-  <string name="app_shortcuts">Tor-gaitutako aplikazioak</string>
-  <string name="title_activity_bridge_wizard">ZubiLaguntzailearenAktibitatea</string>
-  <string name="testing_bridges">Zubiaren Tor konexioa egiaztatzen...</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>
diff --git a/app/src/main/res/values-fa/poestrings.xml b/app/src/main/res/values-fa/poestrings.xml
index 83054ab8..12445012 100644
--- a/app/src/main/res/values-fa/poestrings.xml
+++ b/app/src/main/res/values-fa/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Ù¾Ù?â??Ù?اÛ? ارتباطÛ?Ø? بازپخشâ??Ú©Ù?Ù?دÙ? تÙ?ر Ù?ستÙ?د Ù? براÛ? عبÙ?ر از ساÙ?سÙ?ر بÙ? کاربراÙ? Ú©Ù?Ú© Ù?Û?â??Ú©Ù?Ù?د. اگر تÙ?ر تÙ?سط سرÙ?Û?سâ??دÙ?Ù?دÙ?â??Û? اÛ?Ù?ترÙ?ت Ø´Ù?ا Ù?سدÙ?د شدÙ? استØ? Ù?Û?â??تÙ?اÙ?Û?د Ù¾Ù?â??Ù?اÛ? ارتباطÛ? را اÙ?تحاÙ? Ú©Ù?Û?دØ? Ù?ر Ù?Ù?ع Ù¾Ù? ارتباطÛ? از Û?Ú© رÙ?Ø´ Ù?تÙ?اÙ?ت
-براÛ? جÙ?Ù?Ú¯Û?رÛ? از ساÙ?سÙ?ر استÙ?ادÙ? Ù?Û?â??Ú©Ù?د: اگر Û?Ú©Û? از رÙ?Ø´â??Ù?ا کار Ù?کردØ? دÛ?گرÛ? را اÙ?تحاÙ? Ú©Ù?Û?د.</string>
-
-    <string name="bridges_no">بدÙ?Ù? Ù¾Ù? ارتباطÛ?: بÙ? Ø·Ù?ر Ù?ستÙ?Û?Ù? بÙ? شبکÙ? تÙ?ر Ù?تصÙ? Ø´Ù?Û?د</string>
-    <string name="bridges_provided">Ù¾Ù?â??Ù?اÛ? ارتباطÛ? ارائÙ? شدÙ?:</string>
-    <string name="bridges_custom">Ù¾Ù?â??Ù?اÛ? ارتباطÛ? Ù?خصÙ?ص</string>
-
-    <string name="bridges_config">Ù¾Û?کربÙ?دÛ? Ù¾Ù? ارتباطÛ?</string>
-    <string name="action_done">اÙ?جاÙ? شد</string>
 
     <string name="bridges_sometimes">گاÙ?Û? اÙ?Ù?ات براÛ? اتصاÙ? بÙ? شبکÙ?â?? تÙ?ر Ù?Û?از بÙ? Û?Ú© Ù¾Ù? ارتباطÛ? دارÛ?د.</string>
     <string name="action_more">تÙ?ضÛ?Ø­ بÛ?شتر</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">اÛ?Ù? Ø´Ù?ا را بÛ? Ù?اÙ? Ù? Ù?شاÙ? Ù?Ù?Û?â??Ú©Ù?د اÙ?ا بÙ? Ø´Ù?ا در عبÙ?ر از Ù?اÛ?رÙ?اÙ?â??Ù?ا Ú©Ù?Ú© Ù?Û?â??Ú©Ù?د.</string>
     <string name="action_vpn_choose">اپâ??Ù?ا را اÙ?تخاب Ú©Ù?</string>
 
-    <string name="status_connected">Ù?صÙ? شد</string>
-
-    <string name="loading_claim_1">جاÙ?عÙ?â??Û? Ù?تÙ?Ù?ع Ù?ا Û?Ú©Û? از Ù?Û?Ú?Ú¯Û?â??Ù?اÛ? Ù?Ù?Ù? Ù? عاÙ?Û? Tor است!</string>
-    <string name="loading_claim_2">Ù?ردÙ? عادÛ? رÙ?زاÙ?Ù? از Tor استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د تا از ردÛ?ابÛ? شدÙ? تÙ?سط شرکتâ??Ù?اÛ? تبÙ?Û?غاتÛ? Ù? بازارÛ?ابÛ? جÙ?Ù?Ú¯Û?رÛ? Ú©Ù?Ù?د.</string>
-    <string name="loading_claim_3"> Ù?ردÙ? در صÙ?رت Ù?سدÙ?د شدÙ? Ù?Û?سâ??بÙ?Ú© از تÙ?راستÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د تا با دÙ?ستاÙ? Ù? خاÙ?Ù?ادÙ?â??Ù?اÛ?شاÙ? در ارتباط باشÙ?د.</string>
-    <string name="loading_claim_4">Ù?عاÙ?اÙ? از تÙ?ر استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د تا عÙ?اÛ?د Ù? باÙ?رÙ?اÛ? Ø®Ù?د را آزاداÙ?Ù? در تÙ?Û?Û?تر ابراز Ú©Ù?Ù?د.</string>
-    <string name="loading_claim_5">Ù?بÙ?اگâ??Ù?Ù?Û?ساÙ? از تÙ?ر براÛ? سÙ?Ù? دادÙ? Ù?ردÙ? بÙ? سÙ?Û? اصÙ?احات اجتÙ?اعÛ? استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د.</string>
-    <string name="loading_claim_6">رÙ?زÙ?اÙ?Ù?â??Ù?گاراÙ? از تÙ?ر براÛ? تحÙ?Û?Ù? کردÙ? Ù?بازگÙ?Û?Û? گزارشâ??Ù?اÛ? Ø®Ù?د در اÙ?Ù?Û?ت استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د.</string>
-    <string name="loading_claim_7">اÙ?راد اÙ?Ù? کسب Ù? کار از تÙ?ر براÛ? خصÙ?صÛ? Ù?Ú¯Ù? داشتÙ? استراتÚ?Û?â??Ù?اÛ? شرکت Ø®Ù?د استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د.</string>
-    <string name="loading_claim_8">کارگراÙ? از تÙ?ر براÛ? Ù?بارزÙ? در جÙ?ت رسÛ?دÙ? بÙ? عداÙ?ت استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?دØ? بدÙ?Ù? اÛ?Ù?Ú©Ù? Ù?گراÙ? از دست دادÙ? کارشاÙ? باشÙ?د.</string>
-
-    <string name="status_connecting">در حاÙ? اتصاÙ?.\" = \"در حاÙ? اتصاÙ?</string>
-
     <string name="hello">سÙ?اÙ?</string>
     <string name="welcome">بÙ? تÙ?ر بر رÙ?Û? تÙ?Ù?Ù? Ù?Ù?راÙ? Ø®Ù?Ø´ Ø¢Ù?دÛ?د.</string>
 
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index 6173ae0b..322f3c9f 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -2,137 +2,46 @@
 <resources>
   <string name="app_name">رÙ?بات Ù¾Û?ازÛ?</string>
   <string name="app_description">اربت Û?Ú© برÙ?اÙ?Ù? پرÙ?کسÛ? Ù?جاÙ?Û? است Ú©Ù? دÛ?گر برÙ?اÙ?Ù? Ù?ا را بÙ? استÙ?ادÙ? اÙ?Ù? از اÛ?Ù?ترÙ?ت تÙ?اÙ?Ù?Ù?د Ù?Û? Ú©Ù?د . اربÙ?ت از تÙ?ر براÛ? رÙ?زگذارÛ? کردÙ? تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت Ø´Ù?ا استÙ?ادÙ? Ù?Û? Ú©Ù?د Ù? بعد Ø¢Ù? Ù?ا را از طرÛ?Ù? کاÙ?Ù¾Û?Ù?ترÙ?اÛ? Ù?تÙ?اÙ?ت در Ù?Ù?اط Ù?ختÙ?Ù? جÙ?اÙ? Ù?Ø®Ù?Û? Ù?Û? Ú©Ù?د. تÙ?ر Û?Ú© برÙ?اÙ?Ù? Ù?جاÙ?Û? Ù? شبکÙ? باز است Ú©Ù? Ø´Ù?ا از Ø´Ù?ا در Ù?Ù?ابÙ? تحت Ù?ظر بÙ?دÙ? در شبکÙ?Ù¬â??  تÙ?دÛ?د آزادÛ? Ù?اÛ? شخصÛ?Ù¬ خصÙ?صÛ?Ù¬ Ù?عاÙ?Û?ت Ù?اÛ? کارÛ? Ù? رابطÙ? Ù?اÛ? شخصÛ? بطÙ?ر اÙ?Ù? Ù?حاÙ?ظت Ù?Û? Ú©Ù?د. </string>
-  <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
-  <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">شرÙ?ع Ù? پاÛ?اÙ? تÙ?ر</string>
-  <string name="tor_proxy_service_process">سرÙ?Ù?س پرÙ?کسÛ? تÙ?ر</string>
-  <string name="status_starting_up">اربÙ?ت درحاÙ? آغاز است...</string>
+    <string name="status_starting_up">اربÙ?ت درحاÙ? آغاز است...</string>
   <string name="status_activated">Ù?تصÙ? بÙ? شبکÙ? تÙ?ر</string>
   <string name="status_disabled">اربÙ?ت غÛ?رÙ?عاÙ? شدÙ? است.</string>
   <string name="status_shutting_down">سرÙ?Û?س تÙ?ر در حاÙ? خاÙ?Ù?Ø´ شدÙ? است</string>
   <string name="tor_process_starting">شرÙ?ع Ú©Ù?اÛ?Ù?ت تÙ?ر...</string>
   <string name="tor_process_complete">تÙ?اÙ?.</string>
-  <string name="tor_process_waiting">در حاÙ? اÙ?تظار.</string>
-  <string name="not_anonymous_yet">Ù?شدار: Ù?عاÙ?Û?ت Ø´Ù?ا Ù?Ù?Ù?ز \"Ú¯Ù?Ù?اÙ?\" Ù?Û?ست! Ù?Ø·Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا از HTTP پرÙ?کسÛ? 127.0.0.1:8118 Ù? Û?ا SOCKS4A Ù? Û?ا SOCKS5 پرÙ?کسÛ? 127.0.01:9050 استÙ?ادÙ? Ú©Ù?د.</string>
-  <string name="menu_home">خاÙ?Ù?</string>
-  <string name="menu_browse">Ù?رÙ?ر</string>
-  <string name="menu_settings">تÙ?ظÛ?Ù?ات</string>
+    <string name="menu_settings">تÙ?ظÛ?Ù?ات</string>
   <string name="menu_log">Ù?رÙ?د</string>
-  <string name="menu_info">Ú©Ù?Ú©</string>
-  <string name="menu_apps">اپÙ?Û?Ú©Û?Ø´Ù?â??Ù?ا...</string>
-  <string name="menu_start">آغاز</string>
+    <string name="menu_start">آغاز</string>
   <string name="menu_stop">اÛ?ست</string>
   <string name="menu_about">دربارÙ?</string>
-  <string name="menu_promo_apps">درÛ?اÙ?ت برÙ?اÙ?Ù?â??Ù?ا...</string>
-  <string name="main_layout_download">داÙ?Ù?Ù?د</string>
+    <string name="main_layout_download">داÙ?Ù?Ù?د</string>
   <string name="main_layout_upload">آپÙ?Ù?د</string>
-  <string name="button_help">Ú©Ù?Ú©</string>
-  <string name="button_close">بستÙ?</string>
-  <string name="button_about">دربارÙ?</string>
-  <string name="button_clear_log">پاکسازÛ? Ù?رد</string>
-  <string name="menu_verify">بررسÛ?</string>
-  <string name="menu_exit">خرÙ?ج</string>
+    <string name="button_about">دربارÙ?</string>
+    <string name="menu_exit">خرÙ?ج</string>
   <string name="menu_scan">اسکÙ? BridgeQR</string>
   <string name="menu_share_bridge">اشتراک BridgeQR</string>
-  <string name="press_to_start">- Ù?Ú¯Ù?دارÛ?د براÛ? شرÙ?ع -</string>
-  <string name="pref_trans_proxy_group">پرÙ?کسÛ?دÙ? Ø´Ù?اÙ? (Ù?Û?از بÙ? Root دارد)</string>
-  <string name="pref_trans_proxy_title">پرÙ?کسÛ? Ø´Ù?اÙ?</string>
-  <string name="pref_trans_proxy_summary">تÙ?ر-Ù?Ù?اÛ?Û? اتÙ?Ù?اتÛ?Ú© اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا</string>
-  <string name="pref_transparent_all_title">تÙ?ر Ù?Ù?Ù? Ú?Û?ز</string>
-  <string name="pref_transparent_all_summary">Ù?عاÙ?Û?ت Ù?Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? تÙ?ر پرÙ?کسÛ? Ú©Ù?Û?د.</string>
-  <string name="pref_transparent_port_fallback_title">Ù?طع پرÙ?کسÛ? Ù¾Ù?رت</string>
-  <string name="pref_transparent_port_fallback_summary">Ù?شدار: Ù¾Ù?رتÙ?اÛ? راÛ?ج دÙ?ر زدÙ? (80, 444, غÛ?رÙ?). *Ù?Ù?Ø· در شراÛ?Ø·Û? استÙ?ادÙ? Ú©Ù?Û?د* Ú©Ù? حاÙ?ت Ù?اÛ? \'Ù?Ù?Ù?\' Û?ا \'اپÙ?Û?Ú©Û?Ø´Ù?\' کار Ù?Ù?Û?Ú©Ù?د.</string>
-  <string name="pref_transparent_port_title">Ù?Ù?رست Ù¾Ù?رت</string>
-  <string name="pref_transparent_port_summary">Ù?Ù?رست پرتÙ?ا بÙ? پرÙ?کسÛ?.*Ù?Ù?Ø· در شراÛ?Ø·Û? استÙ?ادÙ? Ú©Ù?Û?د* Ú©Ù? حاÙ?ت Ù?اÛ? \'Ù?Ù?Ù?\' Û?ا \'اپÙ?Û?Ú©Û?Ø´Ù?\' کار Ù?Ù?Û?Ú©Ù?د.</string>
-  <string name="pref_transparent_port_dialog">Ù¾Ù?رت Ù?ا را  بÙ? پرÙ?کسÛ? Ù?ارد Ú©Ù?</string>
-  <string name="pref_has_root">درخÙ?است دسترسÛ? root</string>
-  <string name="pref_has_root_summary"> درخÙ?است دسترسÛ? رÙ?Ù? براÛ? پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ? </string>
-  <string name="status_install_success">باÛ?Ù?رÛ? Ù?اÛ? تÙ?ر با Ù?Ù?Ù?Ù?Û?ت Ù?صب شدÙ?د!</string>
-  <string name="status_install_fail">Ù?صب Ù?اÛ?Ù? Ù?اÛ? دÙ?تاÛ?Û? تÙ?ر Ù?Ù?Ú©Ù? Ù?بÙ?د. Ù?Ø·Ù?Ù? Ù?طعÙ? را Ù?ارسÛ? Ú©Ù?Û?د Ù? بÙ? tor-assistance@xxxxxxxxxxxxxx اطÙ?اع دÙ?Û?د.</string>
-  <string name="title_error">خطاÛ? اپÙ?Û?Ú©Û?Ø´Û?Ù?</string>
-  <string name="wizard_title">اÙ?ربÙ?ت</string>
-  <string name="wizard_btn_tell_me_more">دربارÙ? اÙ?ربÙ?ت</string>
-  <string name="btn_next">بعدÛ?</string>
-  <string name="btn_back">بازگشت</string>
-  <string name="btn_finish">پاÛ?اÙ?</string>
-  <string name="btn_okay">Ù?بÙ?Ù?</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Ù?جÙ?ز صادر گردÛ?د</string>
-  <string name="wizard_permissions_stock">Ù?جÙ?زÙ?اÛ? اÙ?ربÙ?ت</string>
-  <string name="wizard_premissions_msg_root">بسÛ?ار عاÙ?Û?! اÛ?Ù?Ø·Ù?ر Ú©Ù? Ù?عÙ?Ù?Ù? است Ø´Ù?ا داراÛ? Ù?جÙ?ز root براÛ? Ù?عاÙ? کردÙ? ربات Ù¾Û?ازÛ? Ù?ستÛ?د. اÛ?Ù? اÙ?کاÙ? را بخÙ?بÛ? Ù?Ù?رد استÙ?ادÙ? Ù?رار Ø®Ù?اÙ?Û?Ù? داد.</string>
-  <string name="wizard_permissions_msg_stock">Ù?رÚ?Ù?د ضرÙ?رت Ù?دارد اÙ?ا اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root باشد ربات Ù¾Û?ازÛ? با ظرÙ?Û?ت بسÛ?ار بÛ?شترÛ? عÙ?Ù? Ø®Ù?اÙ?د کرد. دکÙ?Ù? زÛ?ر را Ù?شار دÙ?Û?د تا ربات Ù¾Û?ازÛ? داراÛ? ظرÙ?Û?ت حداکثرÛ? بشÙ?د.</string>
-  <string name="wizard_permissions_no_root">اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root Ù?Û?ست Ù? Û?ا اصÙ?ا Ú?Û?زÛ? از اÛ?Ù? عبارت Ù?تÙ?جÙ? Ù?Ù?Û? Ø´Ù?Û?دØ? حتÙ?ا سعÛ? Ú©Ù?Û?د از اپÙ?Ú©Û?Ø´Ù? Ù?اÛ?Û? استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?Û?Ú?Ù? ربات Ù¾Û?ازÛ? تÙ?Û?Ù? شدÙ? اÙ?د.</string>
-  <string name="wizard_permissions_consent">Ù?تÙ?جÙ? Ù?ستÙ? Ù? ترجÛ?Ø­ Ù?Û? دÙ?Ù? بدÙ?Ù? root اداÙ?Ù? بدÙ?Ù?.</string>
-  <string name="wizard_permission_enable_root">Ù?اگذارÛ? دسترسÛ? root براÛ? ربات Ù¾Û?ازÛ?</string>
-  <string name="wizard_configure">تÙ?ظÛ?Ù?ات تبدÛ?Ù? بÙ? تÙ?ر</string>
-  <string name="wizard_configure_msg">ربات Ù¾Û?ازÛ? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? تÙ?اÙ? اپÙ?Û?Ú©Ø´Û?Ù? Ù?ا را از طرÛ?Ù? تÙ?ز  Ù?Ù?تÙ?Ù? Ú©Ù?Û?د Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?رد Ù?ظر Ø®Ù?د را شخصÙ? اÙ?تخاب Ú©Ù?Û?د.</string>
-  <string name="wizard_configure_all">تÙ?اÙ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? تÙ?ر Ù?Ù?تÙ?Ù? Ú©Ù?Û?د.</string>
-  <string name="wizard_configure_select_apps">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ù?Ù?Ù?رد براÛ? تÙ?ر اÙ?تخاب Ú©Ù?Û?د.</string>
-  <string name="wizard_tips_tricks">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? Ú©Ù? براÛ? ربات Ù¾Û?ازÛ? تÙ?ظÛ?Ù? شدÙ? اÙ?د</string>
-  <string name="wizard_tips_msg">تÙ?صÛ?Ù? Ù?Û? Ú©Ù?Û?Ù? داÙ?Ù?Ù?Ù?د Ù? Ù?عاÙ? Ú©Ù?Û?دØ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? را استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?ستÙ?Û?Ù? بÙ? اÙ?ربÙ?ت Ù?صÙ? Ù?Û? Ø´Ù?Ù?د. دکÙ?Ù? Ù?اÛ? زÛ?ر را Ù?شار دÙ?Û?د تا Ù?صب Ø´Ù?د.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - برÙ?اÙ?Ù? اÙ?Ù? ارساÙ? Ù¾Û?غاÙ? Ù?Ù?رÛ? براÛ? اÙ?درÙ?ئÛ?د</string>
-  <string name="wizard_tips_proxy">تÙ?ظÛ?Ù?ات پرÙ?کسÛ? - Û?ادگÛ?رÛ? تÙ?ظÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا براÛ? کار با اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_duckgo">اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?تÙ?ر جستجÙ?Û? داک داک Ú¯Ù?</string>
-  <string name="wizard_tips_twitter">تÙ?Û?Û?تر از \"http proxy \"localhost:8118 پشتÛ?باÙ?Û? Ù?Û? Ú©Ù?د</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ساختÙ? Û?Ú© داستاÙ? Ù? ترک Ø¢Ù? بÙ? Tor براÛ? اÙ?Ù?Û?ت!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">تÙ?ظÛ?Ù?ات پرÙ?کسÛ?</string>
-  <string name="wizard_proxy_help_msg">اگر برÙ?اÙ?Ù? Ø¢Ù?درÙ?Û?دÛ? Ú©Ù? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د Ù?Û? تÙ?اÙ?د از استÙ?ادÙ? HTTP Û?ا  SOCKS proxy ساپÙ?رت Ú©Ù?د٬ پس Ù?Û? تÙ?اÙ?Û?د Ø¢Ù? را براÛ? اتصاÙ? بÙ? اÙ?ربÙ?ت استÙ?ادÙ? از تÙ?ر تÙ?ظÛ?Ù? Ú©Ù?Û?د. .\n\n\n تÙ?ظÛ?Ù?ات Ù?است 127.0.0.1  Û?ا \"localhost\". براÛ? HTTP تÙ?ظÛ?Ù? Ù¾Ù?رت  8118 است. براÛ?  SOCKS Ù¬ پرÙ?کسÛ? 9050. اگر اÙ?کاÙ?Ø´ Ù?جÙ?د دارد از  SOCKS4A Û?ا SOCKS5 استÙ?ادÙ? Ú©Ù?Û?د. \n \n\n\n  Ù?Û? تÙ?اÙ?Û?د در Ù?Ù?رد پرÙ?کسÛ? در Ø¢Ù?درÙ?Û?د بÛ?شتر بÛ?اÙ?Ù?زÛ?د در
- http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">اÙ?ربÙ?ت Ø¢Ù?ادÙ? استÙ?ادÙ? Ù?Û?باشد!</string>
-  <string name="wizard_final_msg">بسÛ?ارÛ? از Ù?ردÙ? در سرتاسر جÙ?اÙ? از تÙ?ر بÙ? دÙ?اÛ?Ù? Ù?تÙ?اÙ?ت استÙ?ادÙ? Ù?Û? Ú©Ù?Ù?د.\n\n خبرÙ?گارÙ?ا Ù? بÙ?اگرÙ?ا٬ Ù?عاÙ?اÙ? Ø­Ù?Ù?Ù? بشر٬ سربازاÙ?Ù¬ Ù?اÙ?Ù?راÙ? اجراÛ? Ù?اÙ?Ù?Ù?Ù¬ Ø´Ù?رÙ?Ù?داÙ? رÚ?Û?Ù? Ù?اÛ? سرکÙ?بگر Ù? Ù?ردÙ? Ù?عÙ?Ù?Ù?Û?... Ù? حاÙ?ا تÙ? </string>
-  <string name="wizard_exit_at_first_screen_toast">Ù?Ø·Ù?ا اÙ?ربÙ?ت را  Ù¾Û?کربÙ?دÛ? Ú©Ù?Û?د Ù?بÙ? از اÛ?Ù?Ú©Ù? Ø´Ù?ا شرÙ?ع بÙ? استÙ?ادÙ? از Ø¢Ù? Ú©Ù?Û?د!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">با Ù?Ù?Ù?Ù?Û?ت بÙ? شبکÙ? تÙ?ر Ù?صÙ? شدÛ?د - اÙ?ا اÛ?Ù? بÙ? اÛ?Ù? Ù?عÙ?ا Ù?Û?ست Ú©Ù? دستگاÙ? Ø´Ù?ا اÙ?Ù? است. Ø´Ù?ا Ù?Û?â??تÙ?اÙ?Û?د از Ú©Ù?Û?د \"Ù?رÙ?رگر\" براÛ? تست اتصاÙ? Ø®Ù?د استÙ?ادÙ? Ú©Ù?Û?د. \n\n دربارÙ? Ù?ا در https://guardianproject.info/apps/orbot بخÙ?اÙ?Û?د Ù? Û?ا براÛ? کسب اطÙ?اعات بÛ?شتر بÙ? help@xxxxxxxxxxxxxxxxxxxx اÛ?Ù?Û?Ù? بزÙ?Û?د.</string>
-  <string name="tor_check">با اÛ?Ù? Ù?دÙ? Ù¾Û?Ø´Ù?رض Ù?رÙ?رگر Ù?ب Ø´Ù?ا بÙ? صÙ?Ø­Ù?   https://check.torproject.org باز Ù?Û? Ø´Ù?د تا Ø´Ù?ا Ù?شاÙ?دÙ? Ú©Ù?Û?د Ø¢Û?ا ربات Ù¾Û?ازÛ? تÙ?ظÛ?Ù? شدÙ? است Ù? Ø¢Û?ا Ø´Ù?ا بÙ? تÙ?ر Ù?صÙ? شدÙ? اÛ?د Û?ا Ù?Ù?.</string>
-  <string name="pref_hs_group">سرÙ?Ù?س Ù?اÛ? Ù?Ø®Ù?Û? Ù?است</string>
-  <string name="pref_general_group">Ú©Ù?Û?</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-->
-  <string name="wizard_title_msg">اربت٬ تÙ?ر را براÛ? Ø¢Ù?درÙ?Û?د Ù?Û? Ø¢Ù?رد تا از Ù?حتÙ?Û?ات Ù?Û?Ù?تر شدÙ?Ù¬ Ø¢Ù?اÙ?Û?ز تراÙ?Û?Ú© Ù? Ú©Ù?ترÙ? شبکÙ? Ú©Ù? خطرÛ? براÛ? حرÛ?Ù? خصÙ?صÛ? است Ù? اطÙ?اعات شخصÛ? Ù? رابطÙ? Ù?ا دÙ?اع Ú©Ù?د. \n\nT اÛ?Ù? جادÙ?گر براÛ? تÙ?ظÛ?Ù? اربت Ù? تÙ?ر در دستگاÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û? Ú©Ù?د. </string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ù?شدار</string>
-  <string name="wizard_warning_msg">Ù?صب کردÙ? اربت بÙ? Ø®Ù?دÛ? Ø®Ù?د تراÙ?Û?Ú© Ù?Ù?باÛ?Ù? Ø´Ù?ا را Ù?اشÙ?اس Ù?Ø®Ù?اÙ?د کرد.\n\n باÛ?د حتÙ?ا اربت را در دستگاÙ? Û?ا برÙ?اÙ?Ù? اÛ? Ú©Ù? از Ø¢Ù? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د براÛ? استÙ?ادÙ? از تÙ?ر تÙ?ظÛ?Ù? Ù?Ù?اÛ?Û?د.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">دسترسÛ?â??Ù?ا</string>
-  <string name="wizard_permissions_root_msg1">اگر بخÙ?اÙ?Û?د Ù?Û?تÙ?اÙ?Û?د بÙ? ربات Ù¾Û?ازÛ? اجازÙ? دسترسÛ?  سÙ?پر Û?Ù?زر بدÙ?Û?د تا Ù?Û?Ú?Ú¯Û?Ù?اÛ? Ù¾Û?شرÙ?تÙ?  Ù?اÙ?Ù?د پرÙ?کسÛ? Ø´Ù?اÙ? را Ù?عاÙ? Ú©Ù?د </string>
-  <string name="wizard_permissions_root_msg2">اگر Ù?Ù?Û?Ø®Ù?اÙ?Û?د اÛ?Ù? کار را اÙ?جاÙ? دÙ?Û?د Ø? Ù?Ø·Ù?ا Ù?Ø·Ù?ئÙ? Ø´Ù?Û?د Ú©Ù? از اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د Ú©Ù? با ربات Ù¾Û?ازÛ? کار Ù?Û? Ú©Ù?Ù?د</string>
-  <string name="wizard_permissions_no_root_msg">بÙ?ظر Ù?Û? رسد دستگاÙ? Ø´Ù?ا رÛ?Ø´Ù? Ù?دارد Û?ا رÛ?Ø´Ù? اÛ? ارائÙ? Ú©Ù?د Û?ا دسترسÛ? بÙ? کاربرÛ? Ù?دÛ?ر داشتÙ? باشد. \n\n Ù?Ø·Ù?ا حاÙ?ت Apps را در صÙ?Ø­Ù? اصÙ?Û? رÙ?Ø´Ù? Ù?Ù?اÛ?Û?د. </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">  اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? Ú©Ù? ربات Ù¾Û?ازÛ? رÙ?Û? Ø¢Ù?Ù?ا Ù?عاÙ? است</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: برÙ?اÙ?Ù? Ú¯Ù?تگÙ?Û? اÙ?Ù? Ù?حرÙ?اÙ?Ù? با Ù?ابÙ?Û?ت رÙ?زگزارÛ?</string>
-  <string name="wizard_tips_orweb">ارÙ?اکس: Ù?رÙ?رگرÛ? Ú©Ù? براÛ? Ø­Ù?ظ حرÛ?Ù? خصÙ?صÛ? Ø´Ù?ا از شبکÙ? تÙ?ر استÙ?ادÙ? Ù?Û?â??Ú©Ù?د</string>
-  <string name="wizard_tips_play">تÙ?اÙ?Ù? برÙ?اÙ?Ù? Ù?اÛ? Guardian Project را در Google Play Ù¾Ù?دا Ù?Ù?Ù?د.</string>
-  <string name="wizard_tips_fdroid">Û?اÙ?تÙ? Ù?Ù?Ù? برÙ?اÙ?Ù? Ù?اÛ? Guardian Project در F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Û?اÙ?تÙ? Ù?Ù?Ù? برÙ?اÙ?Ù? Ù?اÛ? Guardian Project در https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ?</string>
-  <string name="wizard_transproxy_msg">اÛ?Ù? بÙ? برÙ?اÙ?Ù? Ù?ا بÙ? Ø´Ù?ا اجازÙ? Ù?Û?دÙ?د Ú©Ù? بدÙ?Ù? Ù?Û?Ú? تÙ?ظÛ?Ù?Û?Ø? بصÙ?رت Ø®Ù?دکار از طرÛ?Ù? شبکÙ? تÙ?ر اجرا Ø´Ù?Ù?د</string>
-  <string name="wizard_transproxy_hint">(اگر Ù?Û?Ú? اÛ?دÙ?â??اÛ? Ù?دارÛ?د Ú©Ù? راجع بÙ? Ú?Ù? Ú?Û?زÛ? حرÙ? Ù?Û?زÙ?Û?Ù? اÛ?Ù? گزÛ?Ù?Ù? را اÙ?تخاب Ú©Ù?Û?د)</string>
-  <string name="wizard_transproxy_none">Ù?Û?Ù?Ú?</string>
-  <string name="pref_transparent_tethering_title"> تترÛ?Ù?Ú¯ از طرÛ?Ù? تÙ?ر</string>
-  <string name="pref_transparent_tethering_summary">پرÙ?کسÛ? Ø´Ù?اÙ? از طرÛ?Ù? تÙ?ر را براÛ? دستگاÙ? Ù?اÛ?Û? Ú©Ù? با Û?Ù? اس بÛ? Û?ا Ù?اÛ? Ù?اÛ? تتر شدÙ? اÙ?د Ù?جاز Ú©Ù?. (بÙ? رÛ? استارت Ù?Û?از دارÙ?د)</string>
-  <string name="button_grant_superuser">درخÙ?است دسترسÛ? براÛ? سÙ?پرÛ?Ù?زر</string>
-  <string name="pref_select_apps">اÙ?تخاب برÙ?اÙ?Ù? Ù?ا</string>
-  <string name="pref_select_apps_summary"> اÙ?تخاب اپÙ?Û?Ú©Û?Ø´Ù? براÛ? Ù?سÛ?رÛ?ابÛ? از طرÛ?Ù? تÙ?ر </string>
-  <string name="pref_node_configuration">تÙ?ظÛ?Ù?ات گرÙ?</string>
+    <!--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="button_proxy_all">Ù?Ù?Ù? پرÙ?کسÛ? Ù?ا</string>
-  <string name="button_proxy_none">Ù?Û?Ú? پرÙ?کسÛ?</string>
-  <string name="button_invert_selection">اÙ?تخاب برعکس Ø´Ù?د</string>
-  <string name="pref_proxy_title">پراکسÛ? شبکÙ? خرÙ?جÛ?</string>
+    <string name="pref_proxy_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>
@@ -148,20 +57,8 @@
   <string name="pref_proxy_password_title">Ú©Ù?Ù?Ù? عبÙ?ر پراکسÛ? خرÙ?جÛ?</string>
   <string name="pref_proxy_password_summary">رÙ?ز عبÙ?ر پرÙ?کسÛ?(اختÛ?ارÛ?)</string>
   <string name="pref_proxy_password_dialog">رÙ?ز عبÙ?ر پرÙ?کسÛ? را Ù?ارد Ù?Ù?اÛ?Û?د</string>
-  <string name="status">Ù?ضعÛ?ت</string>
-  <string name="setting_up_full_transparent_proxying_">Ù?صب پرÙ?کسÛ? کاÙ?Ù?Ù? Ø´Ù?اÙ?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ù?صب پرÙ?کسÛ? Ø´Ù?اÙ? Ù?بتÙ?Û? بر برÙ?اÙ?Ù?...</string>
-  <string name="transparent_proxying_enabled">پرÙ?کسÛ? Ø´Ù?اÙ? Ù?عاÙ? است</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy براÛ? Tethering Ù?عاÙ? شدÙ? است!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ù?شدار: خطا در Ù?Ù?گاÙ? راÙ? اÙ?دازÛ? پرÙ?کسÛ? Ø´Ù?اÙ?!</string>
-  <string name="transproxy_rules_cleared">Ù?Ù?اÙ?Û?Ù? TransProxy پاک شدÙ?د</string>
-  <string name="couldn_t_start_tor_process_"> تÙ?ر Ù?تÙ?است اجرا Ø´Ù?د:</string>
-  <string name="privoxy_is_running_on_port_">Polipo در حاÙ? اجرا است در Ù¾Ù?رت:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ù?صب پرÙ?کسÛ? Ø´Ù?اÙ? Ù?بتÙ?Û? بر Ù¾Ù?رت...</string>
-  <string name="bridge_error">خطاÛ? Bridge </string>
-  <string name="bridge_requires_ip">براÛ? استÙ?ادÙ? از Ù?Û?Ú?Ú¯Û? BridgeØ? باÛ?د حداÙ?Ù? آدرس IP Û?Ú© Ù¾Ù? را Ù?ارد Ú©Ù?Û?د.</string>
-  <string name="send_email_for_bridges">از Û?Ú© حساب کاربرÛ? جÛ?Ù?Û?Ù?Ø? اÛ?Ù?Û?Ù?Û? با Ù?تÙ? \"get bridges\" بÙ? آدرس bridges@xxxxxxxxxxxxxx بÙ?رستÛ?د.</string>
-  <string name="error">خطا</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>
@@ -174,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Ù?Ù?Ø· * از اÛ?Ù? گرÙ? Ù?اÛ? Ù?شخص شدÙ? استÙ?ادÙ? Ú©Ù?Û?د* </string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">از Ù¾Ù? Bridges Ú©Ù?</string>
-  <string name="bridges_obfuscated">Ù¾Ù? Ù?اÛ? Ú¯Û?ج Ú©Ù?Ù?دÙ?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ù?رÙ?دÛ?â??Ù?اÛ? جاÛ?گزÛ?Ù? بÙ? شبکÙ? تÙ?ر را Ù?عاÙ? Ú©Ù?</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">اگر Bridges تÙ?ظÛ?Ù? شدÙ? Ù¾Ù?Ù?اÛ? Ù?ربÙ?Ø· بÙ? پرÙ?کسÛ? Ú¯Û?ج Ú©Ù?Ù?دÙ? Ù?ستÙ?د اÛ?Ù? گزÛ?Ù?Ù? را Ù?عاÙ? Ú©Ù?Û?د</string>
-  <string name="ip_address_and_port_of_bridges">آدرس Ø¢Û? Ù¾Û? Ù? Ù¾Ù?رتÙ? Ù¾Ù? Ù?ا</string>
+    <string name="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>
@@ -193,17 +88,10 @@
   <string name="reachable_ports">Ù¾Ù?رتâ??Ù?اÛ? Ù?ابÙ? دسترس</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ù¾Ù?رتâ??Ù?اÛ? Ù?ابÙ? دسترس پشت Û?Ú© Ù?اÛ?رÙ?اÙ? Ù?حدÙ?دکÙ?Ù?دÙ?</string>
   <string name="enter_ports">Ù¾Ù?رتâ??Ù?ا را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="enable_hidden_services">سرÙ?Û?سâ??Ù?اÛ? Ù?Ø®Ù?Û? را Ù?عاÙ? Ú©Ù?</string>
-  <string name="run_servers_accessible_via_the_tor_network">اجازÙ? بدÙ? سرÙ?رÙ?اÛ? رÙ?Û? دستگاÙ? از طرÛ?Ù? شبکÙ? تÙ?ر Ù?ابÙ? دسترسÛ? باشÙ?د</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ù¾Ù?رت Ù?اÛ? Ù?Ù?کاÙ? Ù?است را براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? Ù?ارد Ú©Ù?Û?د</string>
-  <string name="hidden_service_ports">Ù¾Ù?رتâ??Ù?اÛ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ù?اÙ? Ù?شاÙ?Û? پذÛ?ر براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? Ø´Ù?ا (بصÙ?رت Ø®Ù?دکار تÙ?Ù?Û?د شدÙ? است)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکاÙ? زداÛ?Û? را بÙ? خرÙ?جÛ? Ù?عاÙ? Ú©Ù? (براÛ? Ù?Ù?اÛ?Ø´ باÛ?د از adb Û?ا aLogCat استÙ?ادÙ? Ú©Ù?Û?د)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکاÙ? زداÛ?Û? را بÙ? خرÙ?جÛ? Ù?عاÙ? Ú©Ù? (براÛ? Ù?Ù?اÛ?Ø´ باÛ?د از adb Û?ا aLogCat استÙ?ادÙ? Ú©Ù?Û?د)</string>
   <string name="project_home">صÙ?Ø­Ù? (Ù?اÛ?) اصÙ?Û? پرÙ?Ú?Ù?:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ú¯Ù?اÙ?Û? تÙ?ر</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software:</string>
+    <string name="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>
@@ -212,37 +100,18 @@
   <string name="hidden_service_request">اپÙ?Û?Ú©Û?Ø´Ù?Û? Ù?Û?â??Ø®Ù?اÙ?د Ù¾Ù?رت سرÙ?ر %1$s را بÙ? شبکÙ? تÙ?ر بگشاÛ?د. در صÙ?رتÛ? Ú©Ù? بÙ? اÛ?Ù? برÙ?اÙ?Ù? اطÙ?Û?Ù?اÙ? دارÛ?دØ? Ú?Ù?Û?Ù? کارÛ? اÙ?Ù? است.</string>
   <string name="found_existing_tor_process">Û?Ú© تÙ?ر درحاÙ? اجرا Ù¾Û?دا شد...</string>
   <string name="something_bad_happened">اتÙ?اÙ? بدÛ? اÙ?تاد. Ù?Ù?اÛ?ع ثبت شدÙ? را Ú?Ú© Ú©Ù?Û?د</string>
-  <string name="hidden_service_on">سرÙ?Û?س Ù?Ø®Ù?Û? رÙ?Û?:</string>
-  <string name="unable_to_read_hidden_service_name">Ù?اتÙ?اÙ? در Ø®Ù?اÙ?دÙ? Ù?اÙ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
+    <string name="unable_to_read_hidden_service_name">Ù?اتÙ?اÙ? در Ø®Ù?اÙ?دÙ? Ù?اÙ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
   <string name="unable_to_start_tor">Ù?اتÙ?اÙ? در راÙ? اÙ?دازÛ? تÙ?ر:</string>
-  <string name="unable_to_reset_tor">راÙ? اÙ?دازÛ? Ù?جدد دستگاÙ? Ø´Ù?ا Ø? Ù?ادر Ù?Û?ست بÙ? تÙ?ظÛ?Ù? Ù?جدد Tor !</string>
-  <string name="pref_use_sys_iptables_title">از Iptables Ù¾Û?Ø´ Ù?رض استÙ?ادÙ? Ú©Ù?</string>
-  <string name="pref_use_sys_iptables_summary">بÙ? جاÛ? Ú?Û?زÛ? Ú©Ù? با ربات Ù¾Û?ازÛ? اÙ?Ù?دÙ?Ø? از باÛ?Ù?رÛ? Ø¢Û? Ù¾Û? تÛ?بÙ?ز داخÙ?Û? استÙ?ادÙ? Ú©Ù?</string>
-  <string name="error_installing_binares">Ù?اÛ?Ù?Ù?اÛ? باÛ?Ù?رÛ? تÙ?ر Ù?ادر بÙ? Ù?صب Ù? Û?ا ارتÙ?ا Ù?بÙ?دÙ?د</string>
-  <string name="pref_use_persistent_notifications">Ù?Ù?تÛ? ربات Ù¾Û?ازÛ? Ù?تصÙ? استØ? Ù?Ù?Û?Ø´Ù? Ø¢Û?Ú©Ù?Ù? Ù?ربÙ?Ø· را در Ù?Ù?ار ابزار Ù?Ú¯Ù? دار.</string>
+    <string name="pref_use_persistent_notifications">Ù?Ù?تÛ? ربات Ù¾Û?ازÛ? Ù?تصÙ? استØ? Ù?Ù?Û?Ø´Ù? Ø¢Û?Ú©Ù?Ù? Ù?ربÙ?Ø· را در Ù?Ù?ار ابزار Ù?Ú¯Ù? دار.</string>
   <string name="pref_use_persistent_notifications_title">آگاÙ?سازÛ? Ù?Ù?Û?Ø´Ù? رÙ?Ø´Ù?</string>
   <string name="pref_use_expanded_notifications">Ù?Ù?اÛ?Ø´ اطÙ?اع رساÙ?Û? گستردÙ? با Ú©Ø´Ù?ر خرÙ?جÛ? Tor Ù? IP</string>
   <string name="pref_use_expanded_notifications_title">اطÙ?اعÛ?Ù? گستردÙ?</string>
-  <string name="notification_using_bridges">Bridges Ù?عاÙ? شدÙ?د!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">زباÙ?</string>
-  <string name="set_locale_summary">زباÙ? Ù?Ø­Ù?Û?  ربات Ù¾Û?ازÛ? را اÙ?تخاب Ú©Ù?Û?د</string>
-  <string name="wizard_locale_title">اÙ?تخاب زباÙ?</string>
-  <string name="wizard_locale_msg">زباÙ? Ú©Ù?Ù?Ù?Û? را تعÙ?Û?ض Ù? Û?ا بÙ? Ø´Ú©Ù? Ù¾Û?Ø´Ù?رض رÙ?اÛ?Ø´ Ú©Ù?Û?د</string>
-  <string name="powered_by">طراحÛ? شدÙ? تÙ?سط Tor</string>
-  <string name="btn_save_settings">ذخÛ?رÙ? تÙ?ظÛ?Ù?ات</string>
-  <string name="no_internet_connection_tor">ارتباط اÛ?Ù?ترÙ?تÛ? Ù?جÙ?د Ù?دارد; تÙ?ر Ø¢Ù?ادÙ? کار است... </string>
-  <string name="bandwidth_">Ù¾Ù?Ù?اÛ? باÙ?د:</string>
-  <string name="down">پائÛ?Ù?</string>
-  <string name="up">باÙ?ا</string>
-  <string name="pref_disable_network_title">خاÙ?Ù?Ø´ کردÙ? در صÙ?رت عدÙ? Ù?جÙ?د شبکÙ?</string>
+    <string name="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="menu_verify_browser">Ù?رÙ?رگر</string>
-  <string name="menu_use_chatsecure">استÙ?ادÙ? از ChatSecure</string>
-  <string name="permission_manage_tor_label">Ù?دÛ?رÛ?ت تÙ?ر</string>
-  <string name="permission_manage_tor_description">اÛ?Ù? برÙ?اÙ?Ù? بتÙ?اÙ?د سرÙ?Û?س تÙ?ر را Ù?دÛ?رÛ?ت Ú©Ù?د</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">اÙ?ربات بÙ?ترÛ?Ù? کاراÛ?Û? را با Ù?رÙ?رگر اÙ?رÙ?اکس دارد. اÙ?رÙ?اکس Ù?صب Ø´Ù?دØ?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">اÙ?ربات بÙ?ترÛ?Ù? کاراÛ?Û? را با Ù?رÙ?رگر اÙ?رÙ?اکس دارد. اÙ?رÙ?اکس Ù?صب Ø´Ù?دØ?</string>
   <string name="install_apps_">Ù?صب Ù?رÙ?رگرØ?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">ارتباط شبکÙ? اÛ? Ù?جÙ?د Ù?دارد. تÙ?ر بÙ? حاÙ?ت Ø®Ù?اب Ù?Û? رÙ?د</string>
   <string name="network_connectivity_is_good_waking_tor_up_">ارتباط شبکÙ? اÛ? Ø®Ù?ب است. تÙ?ر را بÛ?دار Ù?Ù?اÛ?Û?د...</string>
@@ -259,19 +128,7 @@
   <string name="pref_torrc_title">Ù¾Û?کربÙ?دÛ? سÙ?ارشÛ? Torrc</string>
   <string name="pref_torrc_summary">Ù?Ù?Ø· Ù?تخصصاÙ?:  enter direct torrc config lines</string>
   <string name="pref_torrc_dialog">سÙ?ارشÛ? Torrc</string>
-  <string name="wizard_tips_martus">Ù?Ù?باÛ?Ù? Ù?ارتÙ?س -  Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">IP Ù?اÛ? عÙ?Ù?Ù?Û? Tor Ø´Ù?ا:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ù?Ø·Ù?ا اÛ?Ù? برÙ?اÙ?Ù? را در Ø¢Ù?درÙ?Û?د از کار بÛ?Ù?دازÛ?د  Android-&gt;Settings-&gt;Apps اگر Ù?Ø´Ú©Ù?Û? با اربت دارÛ?د:  </string>
-  <string name="app_conflict">تعارض برÙ?اÙ?Ù?</string>
-  <string name="pref_transproxy_refresh_title">Ø®Ù?دکار تازÙ? کردÙ? Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">درخÙ?است Ù?جدÛ?د براÛ? Ù?Ù?اÙ?Û?Ù? Transproxy  Ù?Ù?تÛ? Ù?ضعÛ?ت شبکÙ? تغÛ?Û?ر کرد</string>
-  <string name="pref_transproxy_flush_title">حذÙ? اجبارÛ? Transproxy</string>
-  <string name="pref_transproxy_flush_summary">اÛ?Ù?جا را Ù?شار دÙ?Û?د براÛ? برÙ?Ù? رÛ?ختÙ? تÙ?اÙ? Ù?Ù?اÙ?Û?Ù?  transproxy</string>
-  <string name="transparent_proxy_rules_flushed_">Ù?Ù?اÙ?Û?Ù? Transparent proxy  برÙ?Ù? رÛ?ختÙ? شد! </string>
-  <string name="you_do_not_have_root_access_enabled">Ø´Ù?ا دسترسÛ? رÙ?ت را Ù?عاÙ? Ù?کردÛ?د. </string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_"> براÛ? اعÙ?اÙ? تÙ?ظÛ?Ù?ات جدÛ?د باÛ?د اÙ?ربات را خاÙ?Ù?Ø´ Ù? رÙ?Ø´Ù? Ú©Ù?Û?د.</string>
-  <string name="menu_vpn">برÙ?اÙ?Ù?â??Ù?ا</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -284,19 +141,15 @@
   <string name="get_bridges_web">Ù?ب</string>
   <string name="activate">Ù?عاÙ?</string>
   <string name="apps_mode">حاÙ?ت VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">با استÙ?ادÙ? از Ù?Û?â??Ù¾Û?â??اÙ? درÙ?Ù? اÙ?ربات Ù?Û?â??تÙ?اÙ?Û?د اپâ??Ù?ا را از شبکÙ? تÙ?ر عبÙ?ر دÙ?Û?د. \n\nاÛ?Ù? کار Ø´Ù?ا را Ù?اشÙ?اس Ù?Ù?Û?â??Ú©Ù?دØ? Ù?Ù?Û? بÙ? Ø´Ù?ا در گذر از Ù?اÛ?رÙ?اÙ?â??Ù?ا Ú©Ù?Ú© Ø®Ù?اÙ?د کرد.</string>
-  <string name="send_email">اÛ?Ù?Û?Ù? بÙ?رست</string>
+    <string name="send_email">اÛ?Ù?Û?Ù? بÙ?رست</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ù?Û? تÙ?اÙ?Û?د آدرس  bridge  را از طرÛ?Ù? اÛ?Ù?Û?Ù?Ù¬ Ù?ب Û?ا با اسکÙ? کردÙ?  bridge QR code بدست Ø¢Ù?رÛ?د. اÛ?Ù?Û?Ù? Û?ا Ù?ب پاÛ?Û?Ù? را براÛ? درخÙ?است آدرس bridge اÙ?تخاب Ú©Ù?Û?د.\n\n Ù?Ù?تÛ? آدرس را دارÛ?د Ø¢Ù? را Ú©Ù¾Û? Ú©Ù?Û?د Ù? برگرداÙ?Û?د در  اÙ?Ù?Ù?Û?ت Ù?اÛ?  Bridges در تÙ?ظÛ?Ù?ات اربت Ù? Ø¢Ù? را دÙ?بارÙ? راÙ? اÙ?دازÛ? Ú©Ù?Û?د.</string>
   <string name="install_orweb">Ù?صب Orfox</string>
-  <string name="standard_browser">Ù?رÙ?رگر استاÙ?دارد</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ù?کتÙ?:  Tor bridges استاÙ?دارد Ù?Ù?Ø· بر رÙ?Û? دستگاÙ? Ù?اÛ? Intel X86/ATOM  کار Ù?Û? Ú©Ù?د</string>
-  <string name="vpn_default_world">جÙ?اÙ?Û? (Ø®Ù?دکار)</string>
+    <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="ports">درگاÙ?â??Ù?ا</string>
-  <string name="local_port">درگاÙ? Ù?Ø­Ù?Û?</string>
+    <string name="local_port">درگاÙ? Ù?Ø­Ù?Û?</string>
   <string name="onion_port">درگاÙ? Ù¾Û?ازÛ?</string>
   <string name="name">Ù?اÙ?</string>
   <string name="done">اÙ?جاÙ? شد!</string>
@@ -309,9 +162,7 @@
   <string name="backup_restored">بکâ??آپ بازگرداÙ?دÙ? شد</string>
   <string name="filemanager_not_available">Filemanager Ù?Ù?جÙ?د Ù?Û?ست</string>
   <string name="please_grant_permissions_for_external_storage">Ù?Ø·Ù?ا بÙ?  اÙ?بارÙ? خارجÛ? اجازÙ? دسترسÛ? بدÙ?Û?د</string>
-  <string name="permission_granted">اجازÙ? دسترسÛ? دادÙ? شد</string>
-  <string name="permission_denied">اجازÙ? دسترسÛ? دادÙ? Ù?شد</string>
-  <string name="restore_backup">برگرداÙ?دÙ? بکâ??آپ</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>
@@ -344,10 +195,8 @@
   <string name="pref_connection_padding_summary">Ù?Ù?Û?Ø´Ù? Ù?اÛ?Ù?â??گذارÛ? ارتباط را Ù?عاÙ? Ù?Û?â??Ú©Ù?د تا با برخÛ? از حاÙ?تâ??Ù?اÛ? تحÙ?Û?Ù? تراÙ?Û?Ú© Ù?Ù?ابÙ?Ù? Ú©Ù?د. Ù¾Û?Ø´â??Ù?رض: Ø®Ù?دکار</string>
   <string name="pref_reduced_connection_padding">Ù¾Ù?Ù?اÛ? ارتباط کاÙ?Ø´ Ù¾Û?دا کرد</string>
   <string name="pref_reduced_connection_padding_summary">اتصاÙ? بازپخشâ??Ú©Ù?Ù?دÙ?â??Ù?اÛ? ارتباطÛ? را زÙ?دتر Ù?طع Ù?Û?â??Ú©Ù?د Ù? بستÙ?â??Ù?اÛ? Ù?اÛ?Ù?â??گذارÛ? Ú©Ù?ترÛ? ارساÙ? Ù?Û?â??Ú©Ù?د تا استÙ?ادÙ? دادÙ? Ù? Ù?صرÙ? باترÛ? را کاÙ?Ø´ دÙ?د</string>
-  <string name="please_enable_vpn">Ù?Ø·Ù?اÙ? براÛ? استÙ?ادÙ? اپâ??Ù?ا از تÙ?رØ? حاÙ?ت Ù?Û?â??Ù¾Û?â??اÙ? را Ù?عاÙ? Ú©Ù?Û?د</string>
-  <string name="app_shortcuts">اپâ??Ù?اÛ? Ù?عاÙ? شدÙ? تÙ?سط تÙ?ر</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">تست اتصاÙ? Ù¾Ù? بÙ? تÙ?رâ?¦</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>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 06c54138..383ced72 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2,123 +2,37 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">käynnistä ja pysäytä Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Orbot käynnistyy...</string>
   <string name="status_activated">Yhdistetty Tor-verkkoon</string>
   <string name="status_disabled">Orbot on poistettu käytöstä</string>
   <string name="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="tor_process_waiting">odottaa.</string>
-  <string name="not_anonymous_yet">VAROITUS: Verkkoliikenteesi ei ole vielä anonyymiä! Määritä ohjelmasi käyttämään HTTP-välityspalvelinta 127.0.0.1:8118 tai SOCKS4A- tai SOCKS5-välityspalvelinta 127.0.0.1:9050</string>
-  <string name="menu_home">Alkuun</string>
-  <string name="menu_browse">Selaa</string>
   <string name="menu_settings">Asetukset</string>
   <string name="menu_log">Loki</string>
-  <string name="menu_info">Ohje</string>
   <string name="menu_start">Aloita</string>
   <string name="menu_stop">Lopeta</string>
   <string name="menu_about">Tietoa</string>
-  <string name="menu_promo_apps">Hae sovelluksia...</string>
   <string name="main_layout_download">Lataa</string>
   <string name="main_layout_upload">Lähetä</string>
-  <string name="button_help">Apua</string>
-  <string name="button_close">Sulje</string>
   <string name="button_about">Tietoa</string>
-  <string name="button_clear_log">Tyhjennä loki</string>
-  <string name="menu_verify">Tarkista</string>
   <string name="menu_exit">Lopeta</string>
   <string name="menu_scan">Skannaa sillan QR-koodi</string>
   <string name="menu_share_bridge">Jaa sillan QR-koodi</string>
-  <string name="press_to_start">- paina pitkään käynnistääksesi -</string>
-  <string name="pref_trans_proxy_group">Läpinäkyvä välityspalvelimen käyttö (vaatii laitteen root-oikeudet)</string>
-  <string name="pref_trans_proxy_title">Läpinäkyvä välityspalvelimen käyttö</string>
-  <string name="pref_trans_proxy_summary">Ohjelmien automaattinen Torimointi</string>
-  <string name="pref_transparent_all_title">Kaikki Tor-verkon kautta</string>
-  <string name="pref_transparent_all_summary">Välitä kaikki ohjelmien liikenne Torin läpi</string>
-  <string name="pref_transparent_port_fallback_title">Välityspalvelinportin varoasetus</string>
-  <string name="pref_transparent_port_fallback_summary">VAROITUS: Kiertää yleisiä portteja (80, 443, jne). *K�YT� VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
-  <string name="pref_transparent_port_title">Porttiluettelo</string>
-  <string name="pref_transparent_port_summary">Välityspalvelimen kautta vietävien porttien luettelo. *K�YT� VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
-  <string name="pref_transparent_port_dialog">Kirjoita portit, jotka viedään välityspalvelimen kautta</string>
-  <string name="pref_has_root">Pyydä root-tason oikeuksia</string>
-  <string name="pref_has_root_summary">Pyydä root-tason oikeuksia läpinäkyvään tiedonvälitykseen</string>
-  <string name="status_install_success">Tor-binääritiedostojen asennus onnistui!</string>
-  <string name="status_install_fail">Tor-binääritiedostojen asennus epäonnistui. Tarkista loki ja ilmoita asiasta osoitteeseen tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Sovellusvirhe</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tietoja Orbotista</string>
-  <string name="btn_next">Seuraava</string>
-  <string name="btn_back">Takaisin</string>
-  <string name="btn_finish">Lopeta</string>
   <string name="btn_okay">Selvä</string>
   <string name="btn_cancel">Peru</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Joitakin Orbotin lisätietoja</string>
-  <string name="wizard_permissions_root">Lupa myönnetty</string>
-  <string name="wizard_permissions_stock">Orbot-oikeudet</string>
-  <string name="wizard_premissions_msg_root">Loistavaa! Olemme havainneet että olet antanut root-tason oikeudet Orbotille. Käytämme näiden oikeuksien suomia mahdollisuuksia harkiten.</string>
-  <string name="wizard_permissions_msg_stock">Vaikka root-tason oikeuksien antaminen Orbotille ei ole pakollista, tulee Orbotista tehokkaampi työkalu jos laitteellasi on root-tason oikeudet. Käytä alla olevaa painiketta antaaksesi Orbotille supervoimat!</string>
-  <string name="wizard_permissions_no_root">Jos sinulla ei ole root-tason oikeuksia tai et tiedä, mitä tarkoitamme, käytä vain Orbotille suunniteltuja ohjelmia.</string>
-  <string name="wizard_permissions_consent">Ymmärrän ja haluan jatkaa ilman Superuser-tason oikeuksia</string>
-  <string name="wizard_permission_enable_root">Anna root-tason oikeudet Orbotille</string>
-  <string name="wizard_configure">Konfiguroi Torimointi</string>
-  <string name="wizard_configure_msg">Orbot mahdollistaa kaiken sovellusliikenteen reitittämisen Tor-sovelluksen kautta TAI valita sovelluksesi yksilöllisesti.</string>
-  <string name="wizard_configure_all">Välitä kaikkien sovellusten tiedonsiirto Tor-verkon kautta</string>
-  <string name="wizard_configure_select_apps">Valitse Tor-verkkoa käyttävät sovellukset</string>
-  <string name="wizard_tips_tricks">Orbotia käyttävät sovellukset</string>
-  <string name="wizard_tips_msg">Alempana näkyvät sovellukset on suunniteltu toimimaan Orbotin kanssa. Paina jokaista painiketta, jos haluat asentaa ne nyt. Voit myös löytää ne myöhemmin Googlen Play-kaupasta, GuardianProject.info:n nettisivulta tai F-Droid.org:in kautta.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Turvallinen pikaviestisovellus Androidille</string>
-  <string name="wizard_tips_proxy">Välityspalvelinasetukset - Opi konfiguroimaan sovellukset toimimaan Orbotin kanssa</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo-hakukonesovellus</string>
-  <string name="wizard_tips_twitter">Aseta Twitter-välityspalvelinisännäksi \"localhost\" ja portiksi 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Tee tarina ja jätä se torin turvallisuuteen!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Välityspalvelinasetukset</string>
-  <string name="wizard_proxy_help_msg">Jos käyttämäsi Android-sovellus tukee HTTP- tai SOCKS-välityspalvelimen käyttöä, voit määrittää sen yhdistämään Orbotiin ja käyttämään Toria.\n\n\n Isäntänimi on 127.0.0.1 tai \"localhost\". HTTP-portti on 8118. SOCKS-portti on 9050. SOCKS4A- tai SOCKS5-yhteyskäytäntöä tulisi käyttää, mikäli mahdollista.\n \n\n\n Voit lukea lisää välityspalvelinten käytöstä Androidilla usein kysytyistä kysymyksistä osoitteessa: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot on valmis!</string>
-  <string name="wizard_final_msg">Miljoonat ihmiset ympäri maailman käyttävät Toria eri syistä.\n\nJornalistit ja bloggaajat, ihmisoikeuksien puolustajat, poliisit, sotilaat, yritykset, sorrettujen valtioiden kansalaiset, ja tavalliset kansalaiset... ja nyt sinäkin olet valmis siihen!</string>
-  <string name="wizard_exit_at_first_screen_toast">Määritä Orbot ennen kuin alat käyttää sitä!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Olet onnistuneesti yhdistänyt Tor-verkkoon - mutta tämä EI tarkoita, että laitteesi on turvallinen. Voit käyttää valikon \'Selain\'-valintaa testataksesi yhteyksesi. \n\nVieraile osoitteessa https://guardianproject.info/apps/orbot tai lähetä sähköpostia osoitteeseen help@xxxxxxxxxxxxxxxxxxxx kuullaksesi lisää.</string>
-  <string name="tor_check">Tämä avaa selaimesi osoitteeseen https://check.torproject.org nähdäkseen, onko Orbot varmaan konfiguroitu ja onko sinut yhdistetty Tor-sovellukseen.</string>
-  <string name="pref_hs_group">Piilopalvelun isännöinti</string>
   <string name="pref_general_group">Yleiset</string>
   <string name="pref_start_boot_title">Aloita Orbot käynnistettäessä</string>
   <string name="pref_start_boot_summary">Käynnistä Orbot ja yhdistä Toriin automaattisesti, kun Anroid-laitteesi käynnistyy</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot tuo Torin Androidille!\n\nTor auttaa sinua suojautumaan sisältösuodattimilta sekä verkkoliikenteen seurannalta ja valvonnalta, jotka uhkaavat yksityisyyttä, salaista tietoa ja henkilökohtaisia suhteita.\n\nTämä ohjattu luomisohjelma auttaa sinua määrittämään Orbotin ja Torin laitteellasi.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Varoitus</string>
-  <string name="wizard_warning_msg">Pelkkä Orbotin asentaminen ei automaattisesti tee verkkoliikenteestäsi anonyymiä. Sinun täytyy määrittää Orbot kunnolla, jotta laitteesi ja muut sovellukset käyttävät Toria onnistuneesti.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Käyttöoikeudet</string>
-  <string name="wizard_permissions_root_msg1">Voit antaa Orbotille Superuser-oikeudet mahdollistaaksesi joitakin lisäominaisuuksia, kuten läpinäkyvän tiedonvälityksen.</string>
-  <string name="wizard_permissions_root_msg2">Jos et halua tehdä tätä, varmista, että käytät Orbotin kanssa toimivaksi suunniteltuja sovelluksia.</string>
-  <string name="wizard_permissions_no_root_msg">Laitteessasi ei ole käytössä root-käyttäjäoikeuksia tai se ei tarjoa root- tai \'Superuser\'-oikeuksia.\n\nKokeile \'Sovellukset\'-tilaa päänäytöltä.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotia käyttävät sovellukset</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Turvallinen pikaviestisovellus Off-the-Record - yhteyskäytäntösalauksella</string>
-  <string name="wizard_tips_orweb">Orfox: Tietosuojaa parantava selain, joka toimii Torin läpi</string>
-  <string name="wizard_tips_play">Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta</string>
-  <string name="wizard_tips_fdroid">Löydä kaikki Guardian Projectin sovellukset F-Droidista</string>
-  <string name="wizard_tips_fdroid_org">Löydä kaikki Guardian Projectin sovellukset osoitteesta https://f-droid.org</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Läpinäkyvä tiedonvälitys</string>
-  <string name="wizard_transproxy_msg">Tämä sallii sovellustesi tietoliikenteen menemisen automaattisesti Torin läpi</string>
-  <string name="wizard_transproxy_hint">(Rastita tämä ruutu, jos et tiedä, mitä tarkoitamme)</string>
-  <string name="wizard_transproxy_none">Ei mikään</string>
-  <string name="pref_transparent_tethering_title">Tor-välityspalvelimena oleminen</string>
-  <string name="pref_transparent_tethering_summary">Salli Torin läpinäkyvä tiedonvälitys Wifille ja USB-välityspalvelimena oleville laitteille (vaatii uudelleenkäynnistyksen)</string>
-  <string name="button_grant_superuser">Pyydä Superuser-oikeuksia</string>
-  <string name="pref_select_apps">Valitse sovellukset</string>
-  <string name="pref_select_apps_summary">Valitse Torin läpi reititettävät sovellukset</string>
   <string name="pref_node_configuration">Tor-solmukohdan konfigurointi</string>
   <string name="pref_node_configuration_summary">Nämä ovat lisäasetuksia, jotka voivat vähentää anonyymiyttäsi</string>
   <string name="pref_entrance_node">Tor-sisääntulosolmu</string>
@@ -126,9 +40,6 @@
   <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="button_proxy_all">Välitä kaikki</string>
-  <string name="button_proxy_none">�lä välitä mitään</string>
-  <string name="button_invert_selection">Käännä valinta</string>
   <string name="pref_proxy_title">Lähtevän liikenteen välityspalvelin (valinnainen)</string>
   <string name="pref_proxy_type_title">Lähtevän liikenteen välityspalvelimen tyyppi</string>
   <string name="pref_proxy_type_summary">Välityspalvelimen yhteyskäytäntö: HTTP, HTTPS, Socks4, Socks5</string>
@@ -145,19 +56,7 @@
   <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="status">Tila</string>
-  <string name="setting_up_full_transparent_proxying_">Täyttä läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Sovelluspohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
-  <string name="transparent_proxying_enabled">Läpinäkyvä tiedonvälitys K�YT�SS�</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy on otettu käyttöön Tor-välityspalvelimimena olemista varten!</string>
-  <string name="warning_error_starting_transparent_proxying_">VAROITUS: virhe aloittaessa läpinäkyvää tiedonvälitystä!</string>
-  <string name="transproxy_rules_cleared">TransProxyn säännöt tyhjennetty</string>
   <string name="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</string>
-  <string name="privoxy_is_running_on_port_">Polipo on käynnissä portissa:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Porttipohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
-  <string name="bridge_error">Siltavirhe</string>
-  <string name="bridge_requires_ip">Jos haluat käyttää siltaominaisuutta, kirjoita vähintään yhden sillan IP-osoite.</string>
-  <string name="send_email_for_bridges">Lähetä sähköpostia osoitteeseen bridges@xxxxxxxxxxxxxx gmail-osoitteesta siten, että viestin ainoa rivi on \"get bridges\".</string>
   <string name="error">Virhe</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">ReachableAccess-asetuksesi aiheuttivat virheen!</string>
   <string name="your_relay_settings_caused_an_exception_">Releasetuksesi aiheuttivat virheen!</string>
@@ -171,8 +70,6 @@
   <string name="use_only_these_specified_nodes">Käytä *vain* näitä solmuja</string>
   <string name="bridges">Sillat</string>
   <string name="use_bridges">Käytä siltoja</string>
-  <string name="bridges_obfuscated">Hämärät sillat</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ota käyttöön hämärien siltojen konfigurointi</string>
   <string name="ip_address_and_port_of_bridges">Siltojen IP-osoitteet ja portit</string>
   <string name="enter_bridge_addresses">Kirjoita siltaosoitteet</string>
   <string name="relays">Releet</string>
@@ -189,52 +86,26 @@
   <string name="reachable_ports">Saavutettavissa olevat portit</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Rajoitetun palomuurin takaa saavutettavat portit</string>
   <string name="enter_ports">Kirjoita portit</string>
-  <string name="enable_hidden_services">Piilopalvelun isännöinti</string>
-  <string name="run_servers_accessible_via_the_tor_network">salli laitteensisäisen palvelimen käyttö osana Tor-verkkoa</string>
-  <string name="enter_localhost_ports_for_hidden_services">kirjoita sisäiset portit piilopalveluille</string>
-  <string name="hidden_service_ports">Piilopalveluiden portit</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">piilopalvelusi nimiosoite (tuotetaan automaattisesti)</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="the_tor_license">Tor-lisenssi</string>
-  <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">3:n osapuolen ohjelmisto:</string>
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
   <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
   <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-  <string name="hidden_service_on">piilopalvelun sijainti:</string>
   <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
   <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
-  <string name="unable_to_reset_tor">Toria ei voitu nollata, käynnistä laitteesi uudelleen!</string>
-  <string name="pref_use_sys_iptables_title">Käytä Ip-oletustauluja</string>
-  <string name="pref_use_sys_iptables_summary">käytä sisäänrakennettua ip-taulubinääriä Orbotin mukana tulleen sijasta</string>
-  <string name="error_installing_binares">Tor-binääritiedostojen asentaminen tai päivitys epäonnistui.</string>
   <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
   <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
   <string name="pref_use_expanded_notifications">Näytä laajennettu ilmoitus (Torin ulostulon maa ja IP)</string>
   <string name="pref_use_expanded_notifications_title">Laajennetut ilmoitukset</string>
-  <string name="notification_using_bridges">Sillat käytössä!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">Kieli</string>
-  <string name="set_locale_summary">Valitse maa-asetus ja kieli Orbit-sovellukselle</string>
-  <string name="wizard_locale_title">Valitse kieli</string>
-  <string name="wizard_locale_msg">Jätä oletusarvoon tai vaihda nykyiseen kieleen</string>
-  <string name="powered_by">perustuu Toriin</string>
-  <string name="btn_save_settings">Tallenna asetukset</string>
   <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</string>
-  <string name="bandwidth_">Kaistanleveys:</string>
-  <string name="down">alas</string>
-  <string name="up">ylös</string>
   <string name="pref_disable_network_title">Ei verkon automaattilepotilaa</string>
   <string name="pref_disable_network_summary">Laita Tor nukkumaan, kun internet-yhteyttä ei ole saatavilla</string>
   <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string>
-  <string name="menu_verify_browser">Selain</string>
-  <string name="menu_use_chatsecure">Käytä ChatSecurea</string>
-  <string name="permission_manage_tor_label">Hallinnoi Toria</string>
-  <string name="permission_manage_tor_description">Anna tämän sovelluksen ohjata Tor-palvelua</string>
   <string name="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>
@@ -250,18 +121,6 @@
   <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string>
   <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string>
   <string name="pref_torrc_dialog">Mukautettu torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetechin ihmisoikeuksien dokumentaatiosovellus</string>
-  <string name="your_tor_public_ips_">Julkiset Tor-IP:si:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Poista tämä sovellus käytöstä kohdassa Android-&gt;Asetukset-&gt;Sovellukset, jos Orbotin kanssa on ongelmia:</string>
-  <string name="app_conflict">Sovellusristiriita</string>
-  <string name="pref_transproxy_refresh_title">Transproxyn automaattinen päivitys</string>
-  <string name="pref_transproxy_refresh_summary">Uudista Transproxy-säännöt, kun verkon tila muuttuu</string>
-  <string name="pref_transproxy_flush_title">Transproxyn PAKOTETTU POISTO</string>
-  <string name="pref_transproxy_flush_summary">Kosketa tätä tyhjentääksesi transproxyn verkkosäännöt V�LITT�M�STI</string>
-  <string name="transparent_proxy_rules_flushed_">Läpinäkyvän välityspalvelimen säännöt tyhjennetty!</string>
-  <string name="you_do_not_have_root_access_enabled">Sinulla ei ole ROOT-oikeuksia käytössä</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Saatat joutua pysäyttämään ja käynnistämään Orbotin, jotta asetusten muutos tulee käyttöön.</string>
-  <string name="menu_vpn">Sovellukset</string>
   <string name="kbps">kilobittiä per sekunti</string>
   <string name="mbps">megabittiä per sekunti</string>
   <string name="kb">kt</string>
@@ -276,8 +135,6 @@
   <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 &amp; liitä se \"Sillat\" -kohtaan Orbotin asetuksissa ja käynnistä uudelleen.</string>
   <string name="install_orweb">Asenna Orfox</string>
-  <string name="standard_browser">Normaali selain</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HUOMAA: Vain standardit Tor-sillat toimivat Intel X86/ATOM -laitteilla.</string>
   <string name="hidden_services">Piilopalvelut</string>
   <string name="title_activity_hidden_services">Piilopalvelut</string>
   <string name="menu_hidden_services">Piilopalvelut</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 1851e1e1..ed9be382 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -2,134 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis dâ??utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers dâ??ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et lâ??analyse du trafic des gouvernements.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">démarrer et arrêter Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot démarre...</string>
+    <string name="status_starting_up">Orbot démarre...</string>
   <string name="status_activated">Connecté au réseau Tor</string>
   <string name="status_disabled">Orbot est désactivé</string>
   <string name="status_shutting_down">TorService est en cours dâ??extinction</string>
   <string name="tor_process_starting">Démarrage du client Tor...</string>
   <string name="tor_process_complete">terminé.</string>
-  <string name="tor_process_waiting">attente.</string>
-  <string name="not_anonymous_yet">AVERTISSEMENT : votre trafic nâ??est pas encore anonymeâ??! Veuillez configurer vos applications pour quâ??elles utilisent le mandataire HTTP 127.0.0.1 : 8118 ou le serveur mandataire SOCKS4A ou SOCKS5 à 127.0.0.1 : 9050</string>
-  <string name="menu_home">Accueil</string>
-  <string name="menu_browse">Parcourir</string>
-  <string name="menu_settings">Paramètres</string>
+    <string name="menu_settings">Paramètres</string>
   <string name="menu_log">Journal</string>
-  <string name="menu_info">Aide</string>
-  <string name="menu_start">Démarrer</string>
+    <string name="menu_start">Démarrer</string>
   <string name="menu_stop">Arrêter</string>
   <string name="menu_about">Ã? propos</string>
-  <string name="menu_promo_apps">Obtenir des applis...</string>
-  <string name="main_layout_download">Télchargement</string>
+    <string name="main_layout_download">Télchargement</string>
   <string name="main_layout_upload">Téléversement</string>
-  <string name="button_help">Aide</string>
-  <string name="button_close">Fermer</string>
-  <string name="button_about">Ã? propos</string>
-  <string name="button_clear_log">Effacer le journal</string>
-  <string name="menu_verify">Vérifier</string>
-  <string name="menu_exit">Quitter </string>
+    <string name="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="press_to_start">- appuyer longuement pour démarrer -</string>
-  <string name="pref_trans_proxy_group">Relais transparent (root exigé)</string>
-  <string name="pref_trans_proxy_title">Relais transparent</string>
-  <string name="pref_trans_proxy_summary">Torifaction automatique des applis</string>
-  <string name="pref_transparent_all_title">Tout passer par Tor</string>
-  <string name="pref_transparent_all_summary">Relayer le trafic de toutes les applis par Tor</string>
-  <string name="pref_transparent_port_fallback_title">Repli pour le relais de port</string>
-  <string name="pref_transparent_port_fallback_summary">AVERTISSEMENT : contourne les ports habituels (80, 443, etc). *Ã? Nâ??UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
-  <string name="pref_transparent_port_title">Liste des ports</string>
-  <string name="pref_transparent_port_summary">Liste des ports à relayer. *Ã? Nâ??UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
-  <string name="pref_transparent_port_dialog">Saisir les ports à relayer</string>
-  <string name="pref_has_root">Demander lâ??accès Root</string>
-  <string name="pref_has_root_summary">Demander lâ??accès Root pour un relais transparent</string>
-  <string name="status_install_success">Lâ??exécutable de Tor a été installé avec succèsâ??!</string>
-  <string name="status_install_fail">Le fichier exécutable de Tor nâ??a pu pas être installé. Veuillez vérifier le journal et le signaler à tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erreur dâ??application</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ã? propos dâ??Orbot</string>
-  <string name="btn_next">Suivant</string>
-  <string name="btn_back">Précédent</string>
-  <string name="btn_finish">Fin</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_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_permissions_root">Permission accordée</string>
-  <string name="wizard_permissions_stock">Permissions dâ??Orbot</string>
-  <string name="wizard_premissions_msg_root">Excellentâ??! Nous avons détecté les permissions root sont activées pour Orbot. Nous utiliserons ce pouvoir avec discernement.</string>
-  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas exigé, Orbot peut devenir un outil plus puissant si votre appareil à lâ??accès root. Utilisez le bouton ci-dessous pour accorder à Orbot des superpouvoirsâ??!</string>
-  <string name="wizard_permissions_no_root">Si vous nâ??avez pas lâ??accès root ou nâ??avez aucune idée de quoi lâ??on parle, assurez-vous dâ??utiliser des applis conçues pour fonctionner avec Orbot.</string>
-  <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans superpouvoir</string>
-  <string name="wizard_permission_enable_root">Accorder les droits Root à Orbot</string>
-  <string name="wizard_configure">Configurer la torification</string>
-  <string name="wizard_configure_msg">Orbot vous donne lâ??option de faire passer tout le trafic applicatif par Tor OU de choisir les applications individuellement.</string>
-  <string name="wizard_configure_all">Relayer toutes les applis par Tor</string>
-  <string name="wizard_configure_select_apps">Choisir des applis pour Tor</string>
-  <string name="wizard_tips_tricks">Applis concues pour Orbot</string>
-  <string name="wizard_tips_msg">Les applis ci-dessous ont été développées pour fonctionner avec Orbot. Cliquez sur chaque bouton pour les installer maintenant, ou trouvez plus tard dans Google Play Store, sur le site Web GuardianProject.info ou avec F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client sécurisé de messagerie instantanée pour Android</string>
-  <string name="wizard_tips_proxy">Paramètres du relais - Apprendre à configurer des applis pour quâ??elles fonctionnent avec Orbot</string>
-  <string name="wizard_tips_duckgo">Appli du moteur de recherche DuckDuckgo</string>
-  <string name="wizard_tips_twitter">Configurer le mandataire Twitter sur lâ??hôte « localhost:8118 » et le port 8118</string>
-  <string name="wizard_tips_story_maker">Faiseur dâ??histoires â?? Rédigez une histoire et laissez Tor sâ??occuper de la sécuritéâ??!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Paramètres du mandataire</string>
-  <string name="wizard_proxy_help_msg">Si lâ??appli Android que vous utilisez peut prendre en charge un mandataire HTTP ou SOCKS, vous pouvez alors la configurer pour se connecter à Orbot et utiliser Tor.\n\n\n Le paramètre de lâ??hôte est 127.0.0.1 or « localhost ». Pour HTTP, le paramètre de port est 8118. Pour SOCKS, le mandataire est 9050. Vous devriez utiliser SOCKS4A ou SOCKS5 si possible.\n \n\n\n Vous pouvez en apprendre davantage sur lâ??utilisation dâ??un serveur mandataire sur Android dans la FAQ sur : http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot est prêtâ??!</string>
-  <string name="wizard_final_msg">Des millions de personnes de par le monde utilisent Tor pour une grande variété de raisons.\n\nDes journalistes et des blogueurs, des défenseurs des droits humains, des officiers des forces de lâ??ordre, des soldats, des sociétés, des citoyens de régimes répressifs, et de simples citoyens... et maintenant vous êtes aussi prêt à lâ??utiliserâ??!</string>
-  <string name="wizard_exit_at_first_screen_toast">Veuillez configurer Orbot avant de pouvoir commencer à lâ??utiliserâ??!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Vous vous êtes connecté au réseau Tor avec succès - mais cela NE SIGNIFIE PAS que votre appareil est sécurisé. Vous pouvez utiliser le bouton « Navigateur » pour tester votre connexion. \n\n Visitez https://guardianproject.info/apps/orbot ou envoyez un courriel à help@xxxxxxxxxxxxxxxxxxxx pour en savoir davantage.</string>
-  <string name="tor_check">Ceci ouvrira votre navigateur Web sur https://check.torproject.org afin de déterminer si Orbot est convenablement configuré et si vous êtes connecté à Tor.</string>
-  <string name="pref_hs_group">Hébergement de services cachés</string>
-  <string name="pref_general_group">Général</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot, câ??est Tor sur Androidâ??!\n\nTor vous aide à vous défendre contre le filtrage du contenu, lâ??analyse du trafic et la surveillance du réseau qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCet assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Avertissement</string>
-  <string name="wizard_warning_msg">La simple installation dâ??Orbot nâ??anonymisera pas automatiquement votre trafic mobile.\n\nVous devez configurer Orbot adéquatement, ainsi que votre appareil et les autres applis pour utiliser Tor avec succès.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">Vous pouvez accorder à Orbot un accès « superutilisateur » pour activer des options avancées, comme le relais transparent.</string>
-  <string name="wizard_permissions_root_msg2">Si vous ne voulez pas le faire, veuillez vous assurer dâ??utiliser des applis conçues pour fonctionner avec Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Votre appareil ne semble pas être rooté ou ne pas fournir lâ??accès root ou super-utilisateur.\n\nVeuillez plutôt essayer le mode « Applis » de lâ??écran principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Applis conçues pour Orbot</string>
-  <string name="wizard_tips_gibberbot">Chatsecure : appli sécurisée de clavardage avec chiffrement confidentiel </string>
-  <string name="wizard_tips_orweb">Orfox : navigateur à confidentialité améliorée fonctionnant sur Tor</string>
-  <string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string>
-  <string name="wizard_tips_fdroid">Trouver toutes les applis du Projet Guardian sur F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Trouver toutes les applis du Projet Guardian sur https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Relais transparent</string>
-  <string name="wizard_transproxy_msg">Ceci permet à vos applis dâ??utiliser automatiquement le réseau Tor sans aucune configuration.</string>
-  <string name="wizard_transproxy_hint">(Cochez cette case si vous nâ??avez aucune idée de ce dont nous parlons)</string>
-  <string name="wizard_transproxy_none">Aucun</string>
-  <string name="pref_transparent_tethering_title">Fonction modem avec Tor</string>
-  <string name="pref_transparent_tethering_summary">Activer le relais transparent pour les périphériques utilisant la fonction modem soit par Wi-Fi ou par USB (redémarrage nécessaire)</string>
-  <string name="button_grant_superuser">Demander lâ??accès superutilisateur</string>
-  <string name="pref_select_apps">Choisir les applis</string>
-  <string name="pref_select_apps_summary">Choisir les applis à acheminer par Tor</string>
-  <string name="pref_node_configuration">Configuration de nÅ?ud </string>
+    <!--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="button_proxy_all">Tout relayer</string>
-  <string name="button_proxy_none">Ne rien relayer</string>
-  <string name="button_invert_selection">Inverser la sélection</string>
-  <string name="pref_proxy_title">Mandataire pour le réseau sortant (facultatif)</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>
@@ -145,20 +56,8 @@
   <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="status">Ã?tat</string>
-  <string name="setting_up_full_transparent_proxying_">Configuration du relais entièrement transparent...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configuration dâ??un relais transparent par appli...</string>
-  <string name="transparent_proxying_enabled">Relais transparent ACTIVÃ?</string>
-  <string name="transproxy_enabled_for_tethering_">Relais transparent activé pour pour la fonction modemâ??!</string>
-  <string name="warning_error_starting_transparent_proxying_">AVERTISSEMENT : erreur lors du démarrage du relais transparentâ??!</string>
-  <string name="transproxy_rules_cleared">Règles du relais transparent effacées</string>
-  <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
-  <string name="privoxy_is_running_on_port_">Polipo tourne sur le port : </string>
-  <string name="setting_up_port_based_transparent_proxying_">Configuration du relais transparent par port...</string>
-  <string name="bridge_error">Erreur de pont</string>
-  <string name="bridge_requires_ip">Afin de pouvoir utiliser la fonction pont, vous devez au moins saisir lâ??adresse IP dâ??un pont.</string>
-  <string name="send_email_for_bridges">Envoyez un courriel à bridges@xxxxxxxxxxxxxx avec la ligne « get bridges », seule, dans le corps du courriel à partir dâ??un compte Gmail. </string>
-  <string name="error">Erreur</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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Utiliser *uniquement * ces nÅ?uds spécifiés</string>
   <string name="bridges">Ponts</string>
   <string name="use_bridges">Utiliser des ponts</string>
-  <string name="bridges_obfuscated">Ponts brouillés</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts brouillés</string>
-  <string name="ip_address_and_port_of_bridges">Adresse IP et port 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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Ports accessibles</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ports accessibles derrière un pare-feu restrictif</string>
   <string name="enter_ports">Saisir les ports</string>
-  <string name="enable_hidden_services">Hébergement de services cachés</string>
-  <string name="run_servers_accessible_via_the_tor_network">permettre aux serveurs sur lâ??appareil dâ??être accessibles par le réseau Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">saisir les ports de lâ??hôte local pour les services cachés</string>
-  <string name="hidden_service_ports">Ports des services cachés</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
   <string name="project_home">Page(s) dâ??accueil du projet :</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">La licence de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Logiciels tiers :</string>
+    <string name="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="hidden_service_on">service caché sur :</string>
-  <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
+    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
   <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
-  <string name="unable_to_reset_tor">Redémarrez votre appareil, impossible de réinitialiser Torâ??!</string>
-  <string name="pref_use_sys_iptables_title">Utiliser les Iptables par défaut</string>
-  <string name="pref_use_sys_iptables_summary">Utiliser le binaire iptables intégré à la place du binaire intégré avec Orbot</string>
-  <string name="error_installing_binares">Les fichiers binaires de Tor nâ??ont pas pu être installés ou mis à niveau.</string>
-  <string name="pref_use_persistent_notifications">Toujours conserver lâ??icône dans la barre des tâches quand Orbot est connecté.</string>
+    <string name="pref_use_persistent_notifications">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="notification_using_bridges">Les ponts sont activésâ??!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Langue</string>
-  <string name="set_locale_summary">Choisir les paramètres régionaux pour Orbot</string>
-  <string name="wizard_locale_title">Choisir la langue</string>
-  <string name="wizard_locale_msg">Laisser à la valeur par défaut ou changer la langue actuelle</string>
-  <string name="powered_by">propulsé par Tor</string>
-  <string name="btn_save_settings">Enregistrer les paramètres</string>
-  <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</string>
-  <string name="bandwidth_">Bande passante :</string>
-  <string name="down">aval</string>
-  <string name="up">amont</string>
-  <string name="pref_disable_network_title">Pas de mise en veille automatique du réseau</string>
+    <string name="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="menu_verify_browser">Navigateur</string>
-  <string name="menu_use_chatsecure">Utiliser ChatSecure</string>
-  <string name="permission_manage_tor_label">Gérer Tor</string>
-  <string name="permission_manage_tor_description">Autoriser cette appli à contrôler le service Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Pas de connectivité réseau. Mise au repos de 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>
@@ -250,19 +121,7 @@
   <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
   <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string>
   <string name="pref_torrc_dialog">Personnaliser Torrc </string>
-  <string name="wizard_tips_martus">Martus mobile - Appli de documentation pour les droits humains de  Benetech</string>
-  <string name="your_tor_public_ips_">Vos IP publiques Tor :</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Veuillez désactiver cette appli dans Android-&gt;Paramètres-&gt;Applications si vous éprouvez des problèmes avec Orbot :</string>
-  <string name="app_conflict">Conflit dâ??applis</string>
-  <string name="pref_transproxy_refresh_title">Rafraîchissement automatique de Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Appliquer de nouveau les règles de Transproxy lors des changements dâ??état du réseau</string>
-  <string name="pref_transproxy_flush_title">Transproxy ENLEVER DE FORCE</string>
-  <string name="pref_transproxy_flush_summary">Toquer ici pour vider toutes les règles réseau de transproxy MAINTENANT</string>
-  <string name="transparent_proxy_rules_flushed_">Les règles du mandataire transparent ont été vidéesâ??!</string>
-  <string name="you_do_not_have_root_access_enabled">Lâ??accès ROOT nâ??est pas activé</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Vous pourriez avoir à arrêter et démarrer Orbot pour que les changements de paramètres soient activés.</string>
-  <string name="menu_vpn">Applis</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">Ko</string>
   <string name="mb">Mo</string>
@@ -276,9 +135,7 @@
   <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 &amp; collez-la dans le champ « Ponts » des paramètres dâ??Orbot et redémarrez.</string>
   <string name="install_orweb">Installer Orfox</string>
-  <string name="standard_browser">Navigateur standard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Note : seuls les ponts Tor standards fonctionnent sur les appareils Intel X86/ATOM</string>
-  <string name="save">Enregistrer</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/src/main/res/values-fr/poestrings.xml b/app/src/main/res/values-fr/poestrings.xml
index aee1696c..05d0d213 100644
--- a/app/src/main/res/values-fr/poestrings.xml
+++ b/app/src/main/res/values-fr/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Les ponts sont des relais Tor qui aident à contourner la censure. Vous pouvez essayer des ponts si Tor est bloqué par votre FAIâ??; chaque type de pont utilise un moyen différent pour éviter la censure : si un type ne fonctionne pas, en essayer un autre.</string>
-
-    <string name="bridges_no">Aucun pont : se connecter directement à Tor</string>
-    <string name="bridges_provided">Ponts fournis :</string>
-    <string name="bridges_custom">Ponts personnalisés</string>
-
-    <string name="bridges_config">Configuration des ponts</string>
-    <string name="action_done">Terminé</string>
 
     <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>
@@ -16,19 +8,6 @@
     <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="status_connected">Vous êtes connectéâ??!</string>
-
-    <string name="loading_claim_1">Notre communauté riche de diversité est la force de Torâ??!</string>
-    <string name="loading_claim_2">Les internautes utilisent Tor tous les jours pour éviter dâ??être suivis à la trace par les publicités de commercialisation.</string>
-    <string name="loading_claim_3">Quand Facebook est bloqué, les internautes utilisent Tor pour se connecter à leurs amis et à leur famille.</string>
-    <string name="loading_claim_4">Les activistes utilisent Tor pour twitter leurs opinions et leurs croyances en toute liberté.</string>
-    <string name="loading_claim_5">Les blogueurs utilisent Tor pour rallier les gens vers une réforme sociale.</string>
-    <string name="loading_claim_6">Les journalistes utilisent Tor pour enquêter en toute sécurité sur les histoires quâ??ils couvrent.</string>
-    <string name="loading_claim_7">Les gens dâ??affaires utilisent Tor pour assurer la confidentialité de leurs stratégies dâ??entreprise.</string>
-    <string name="loading_claim_8">Les travailleurs utilisent Tor pour lutter pour la justice sans craindre de perdre leur emploi.</string>
-
-    <string name="status_connecting">Nous vous connectons.</string>
-
     <string name="hello">Bonjour</string>
     <string name="welcome">Bienvenue sur Tor pour appareil mobile.</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6c99890d..0bb9151e 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis dâ??utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers dâ??ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et lâ??analyse du trafic des gouvernements.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">démarrer et arrêter Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot démarre...</string>
+    <string name="status_starting_up">Orbot démarre...</string>
   <string name="status_activated">Connecté au réseau Tor</string>
   <string name="status_disabled">Orbot est désactivé</string>
   <string name="status_shutting_down">TorService est en cours dâ??extinction</string>
   <string name="tor_process_starting">Démarrage du client Tor...</string>
   <string name="tor_process_complete">terminé.</string>
-  <string name="tor_process_waiting">attente.</string>
-  <string name="not_anonymous_yet">AVERTISSEMENT : votre trafic nâ??est pas encore anonymeâ??! Veuillez configurer vos applications pour quâ??elles utilisent le mandataire HTTP 127.0.0.1:8118 ou le serveur mandataire SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
-  <string name="menu_home">Accueil</string>
-  <string name="menu_browse">Parcourir</string>
-  <string name="menu_settings">Paramètres</string>
+    <string name="menu_settings">Paramètres</string>
   <string name="menu_log">Journal</string>
-  <string name="menu_info">Aide</string>
-  <string name="menu_apps">Applis...</string>
-  <string name="menu_start">Démarrer</string>
+    <string name="menu_start">Démarrer</string>
   <string name="menu_stop">Arrêter</string>
   <string name="menu_about">Ã? propos</string>
-  <string name="menu_promo_apps">Obtenir des applis...</string>
-  <string name="main_layout_download">Télchargement</string>
+    <string name="main_layout_download">Télchargement</string>
   <string name="main_layout_upload">Téléversement</string>
-  <string name="button_help">Aide</string>
-  <string name="button_close">Fermer</string>
-  <string name="button_about">Ã? propos</string>
-  <string name="button_clear_log">Effacer le journal</string>
-  <string name="menu_verify">Vérifier</string>
-  <string name="menu_exit">Quitter </string>
+    <string name="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="press_to_start">- appuyer longuement pour démarrer -</string>
-  <string name="pref_trans_proxy_group">Relais transparent (racine exigée)</string>
-  <string name="pref_trans_proxy_title">Relais transparent</string>
-  <string name="pref_trans_proxy_summary">Torifaction automatique des applis</string>
-  <string name="pref_transparent_all_title">Tout passer par Tor</string>
-  <string name="pref_transparent_all_summary">Relayer le trafic de toutes les applis par Tor</string>
-  <string name="pref_transparent_port_fallback_title">Repli pour le relais de port</string>
-  <string name="pref_transparent_port_fallback_summary">AVERTISSEMENT : contourne les ports habituels (80, 443, etc). *Ã? Nâ??UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
-  <string name="pref_transparent_port_title">Liste des ports</string>
-  <string name="pref_transparent_port_summary">Liste des ports à relayer. *Ã? Nâ??UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
-  <string name="pref_transparent_port_dialog">Saisir les ports à relayer</string>
-  <string name="pref_has_root">Demander lâ??accès racine</string>
-  <string name="pref_has_root_summary">Demander lâ??accès racine pour un relais transparent</string>
-  <string name="status_install_success">Lâ??exécutable de Tor a été installé avec succèsâ??!</string>
-  <string name="status_install_fail">Le fichier exécutable de Tor nâ??a pu pas être installé. Veuillez vérifier le journal et le signaler à tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erreur dâ??application</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ã? propos dâ??Orbot</string>
-  <string name="btn_next">Suivant</string>
-  <string name="btn_back">Précédent</string>
-  <string name="btn_finish">Fin</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permission accordée</string>
-  <string name="wizard_permissions_stock">Permissions dâ??Orbot</string>
-  <string name="wizard_premissions_msg_root">Excellentâ??! Nous avons détecté les permissions racine sont activées pour Orbot. Nous utiliserons ce pouvoir avec discernement.</string>
-  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas exigé, Orbot peut devenir un outil plus puissant si votre appareil à lâ??accès racine. Utilisez le bouton ci-dessous pour accorder à Orbot des superpouvoirsâ??!</string>
-  <string name="wizard_permissions_no_root">Si vous nâ??avez pas lâ??accès racine ou nâ??avez aucune idée de quoi lâ??on parle, assurez-vous dâ??utiliser des applis conçues pour fonctionner avec Orbot.</string>
-  <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans superpouvoir</string>
-  <string name="wizard_permission_enable_root">Accorder les droits racine à Orbot</string>
-  <string name="wizard_configure">Configurer la torification</string>
-  <string name="wizard_configure_msg">Orbot vous donne lâ??option de faire passer tout le trafic applicatif par Tor OU de choisir les applications individuellement.</string>
-  <string name="wizard_configure_all">Relayer toutes les applis par Tor</string>
-  <string name="wizard_configure_select_apps">Choisir des applis pour Tor</string>
-  <string name="wizard_tips_tricks">Applis concues pour Orbot</string>
-  <string name="wizard_tips_msg">Les applis ci-dessous ont été développées pour fonctionner avec Orbot. Cliquez sur chaque bouton pour les installer maintenant, ou trouvez plus tard dans Google Play Store, sur le site Web GuardianProject.info ou avec F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client sécurisé de messagerie instantanée pour Android</string>
-  <string name="wizard_tips_proxy">Paramètres du relais - Apprendre à configurer des applis pour quâ??elles fonctionnent avec Orbot</string>
-  <string name="wizard_tips_duckgo">Appli du moteur de recherche DuckDuckgo</string>
-  <string name="wizard_tips_twitter">Configurer le mandataire Twitter sur lâ??hôte « localhost:8118 » et le port 8118</string>
-  <string name="wizard_tips_story_maker">Faiseur dâ??histoires â?? Rédigez une histoire et laissez Tor sâ??occuper de la sécuritéâ??!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Paramètres du mandataire</string>
-  <string name="wizard_proxy_help_msg">Si lâ??appli Android que vous utilisez peut prendre en charge un mandataire HTTP ou SOCKS, vous pouvez alors la configurer pour se connecter à Orbot et utiliser Tor.\n\n\n Le paramètre de lâ??hôte est 127.0.0.1 or « localhost ». Pour HTTP, le paramètre de port est 8118. Pour SOCKS, le mandataire est 9050. Vous devriez utiliser SOCKS4A ou SOCKS5 si possible.\n \n\n\n Vous pouvez en apprendre davantage sur lâ??utilisation dâ??un serveur mandataire sur Android dans la FAQ sur : http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot est prêtâ??!</string>
-  <string name="wizard_final_msg">Des millions de personnes de par le monde utilisent Tor pour une grande variété de raisons.\n\nDes journalistes et des blogueurs, des défenseurs des droits humains, des officiers des forces de lâ??ordre, des soldats, des sociétés, des citoyens de régimes répressifs, et de simples citoyens... et maintenant vous êtes aussi prêt à lâ??utiliserâ??!</string>
-  <string name="wizard_exit_at_first_screen_toast">Veuillez configurer Orbot avant de pouvoir commencer à lâ??utiliserâ??!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Vous vous êtes connecté au réseau Tor avec succès, mais cela NE SIGNIFIE PAS que votre appareil est sécurisé. Vous pouvez utiliser le bouton « Navigateur » pour tester votre connexion. \n\n Visitez https://guardianproject.info/apps/orbot ou envoyez un courriel à help@xxxxxxxxxxxxxxxxxxxx pour en savoir davantage.</string>
-  <string name="tor_check">Ceci ouvrira votre navigateur Web sur https://check.torproject.org afin de déterminer si Orbot est convenablement configuré et si vous êtes connecté à Tor.</string>
-  <string name="pref_hs_group">Hébergement de services cachés</string>
-  <string name="pref_general_group">Général</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot, câ??est Tor sur Androidâ??!\n\nTor vous aide à vous défendre contre le filtrage du contenu, lâ??analyse du trafic et la surveillance du réseau qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCet assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Avertissement</string>
-  <string name="wizard_warning_msg">La simple installation dâ??Orbot nâ??anonymisera pas automatiquement votre trafic mobile.\n\nVous devez configurer Orbot adéquatement, ainsi que votre appareil et les autres applis pour utiliser Tor avec succès.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">Vous pouvez accorder à Orbot un accès « superutilisateur » pour activer des options avancées, comme le relais transparent.</string>
-  <string name="wizard_permissions_root_msg2">Si vous ne voulez pas le faire, veuillez vous assurer dâ??utiliser des applis conçues pour fonctionner avec Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Votre appareil ne semble pas être raciné ou ne pas fournir lâ??accès racine ou superutilisateur.\n\nVeuillez plutôt essayer le mode « Applis » de lâ??écran principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Applis conçues pour Orbot</string>
-  <string name="wizard_tips_gibberbot">Chatsecure : appli sécurisée de clavardage avec chiffrement confidentiel </string>
-  <string name="wizard_tips_orweb">Orfox : navigateur à confidentialité améliorée fonctionnant sur Tor</string>
-  <string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string>
-  <string name="wizard_tips_fdroid">Trouver toutes les applis du Projet Guardian sur F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Trouvez toutes les applis du Projet Guardian sur https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Relais transparent</string>
-  <string name="wizard_transproxy_msg">Ceci permet à vos applis dâ??utiliser automatiquement le réseau Tor sans aucune configuration.</string>
-  <string name="wizard_transproxy_hint">(Cochez cette case si vous nâ??avez aucune idée de ce dont nous parlons)</string>
-  <string name="wizard_transproxy_none">Aucun</string>
-  <string name="pref_transparent_tethering_title">Fonction modem avec Tor</string>
-  <string name="pref_transparent_tethering_summary">Activer le relais transparent pour les périphériques utilisant la fonction modem soit par Wi-Fi ou par USB (redémarrage nécessaire)</string>
-  <string name="button_grant_superuser">Demander lâ??accès superutilisateur</string>
-  <string name="pref_select_apps">Choisir les applis</string>
-  <string name="pref_select_apps_summary">Choisir les applis à acheminer par Tor</string>
-  <string name="pref_node_configuration">Configuration de nÅ?ud </string>
+    <!--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="button_proxy_all">Tout relayer</string>
-  <string name="button_proxy_none">Ne rien relayer</string>
-  <string name="button_invert_selection">Inverser la sélection</string>
-  <string name="pref_proxy_title">Mandataire pour le réseau sortant (facultatif)</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>
@@ -147,20 +57,8 @@
   <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="status">Ã?tat</string>
-  <string name="setting_up_full_transparent_proxying_">Configuration du relais entièrement transparent...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configuration dâ??un relais transparent par appli...</string>
-  <string name="transparent_proxying_enabled">Relais transparent ACTIVÃ?</string>
-  <string name="transproxy_enabled_for_tethering_">Relais transparent activé pour pour la fonction modemâ??!</string>
-  <string name="warning_error_starting_transparent_proxying_">AVERTISSEMENT : erreur lors du démarrage du relais transparentâ??!</string>
-  <string name="transproxy_rules_cleared">Règles du relais transparent effacées</string>
-  <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
-  <string name="privoxy_is_running_on_port_">Polipo tourne sur le port : </string>
-  <string name="setting_up_port_based_transparent_proxying_">Configuration du relais transparent par port...</string>
-  <string name="bridge_error">Erreur de pont</string>
-  <string name="bridge_requires_ip">Afin de pouvoir utiliser la fonction pont, vous devez au moins saisir lâ??adresse IP dâ??un pont.</string>
-  <string name="send_email_for_bridges">Envoyez un courriel à bridges@xxxxxxxxxxxxxx avec la ligne « get bridges », seule, dans le corps du courriel à partir dâ??un compte Gmail. </string>
-  <string name="error">Erreur</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Utiliser *uniquement * ces nÅ?uds spécifiés</string>
   <string name="bridges">Ponts</string>
   <string name="use_bridges">Utiliser des ponts</string>
-  <string name="bridges_obfuscated">Ponts brouillés</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="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts brouillés</string>
-  <string name="ip_address_and_port_of_bridges">Adresse IP et port 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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Ports accessibles</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ports accessibles derrière un pare-feu restrictif</string>
   <string name="enter_ports">Saisir les ports</string>
-  <string name="enable_hidden_services">Hébergement de services cachés</string>
-  <string name="run_servers_accessible_via_the_tor_network">permettre aux serveurs sur lâ??appareil dâ??être accessibles par le réseau Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">saisir les ports de lâ??hôte local pour les services cachés</string>
-  <string name="hidden_service_ports">Ports des services cachés</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
   <string name="project_home">Page(s) dâ??accueil du projet :</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">La licence de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Logiciels tiers :</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">service caché sur :</string>
-  <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
+    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
   <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
-  <string name="unable_to_reset_tor">Redémarrez votre appareil, impossible de réinitialiser Torâ??!</string>
-  <string name="pref_use_sys_iptables_title">Utiliser les Iptables par défaut</string>
-  <string name="pref_use_sys_iptables_summary">Utiliser le binaire iptables intégré à la place du binaire intégré avec Orbot</string>
-  <string name="error_installing_binares">Les fichiers binaires de Tor nâ??ont pas pu être installés ou mis à niveau.</string>
-  <string name="pref_use_persistent_notifications">Toujours conserver lâ??icône dans la barre des tâches quand Orbot est connecté.</string>
+    <string name="pref_use_persistent_notifications">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="notification_using_bridges">Les ponts sont activésâ??!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Langue</string>
-  <string name="set_locale_summary">Choisir les paramètres régionaux pour Orbot</string>
-  <string name="wizard_locale_title">Choisir la langue</string>
-  <string name="wizard_locale_msg">Laisser à la valeur par défaut ou changer la langue actuelle</string>
-  <string name="powered_by">propulsé par Tor</string>
-  <string name="btn_save_settings">Enregistrer les paramètres</string>
-  <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</string>
-  <string name="bandwidth_">Bande passante :</string>
-  <string name="down">aval</string>
-  <string name="up">amont</string>
-  <string name="pref_disable_network_title">Pas de mise en veille automatique du réseau</string>
+    <string name="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="menu_verify_browser">Navigateur</string>
-  <string name="menu_use_chatsecure">Utiliser ChatSecure</string>
-  <string name="permission_manage_tor_label">Gérer Tor</string>
-  <string name="permission_manage_tor_description">Autoriser cette appli à contrôler le service Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot fonctionne de manière optimale avec le navigateur Orfox. Souhaitez-vous lâ??installer maintenantâ???</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot fonctionne de manière optimale avec le navigateur Orfox. Souhaitez-vous lâ??installer maintenantâ???</string>
   <string name="install_apps_">Installer le navigateurâ???</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>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Configuration personnalisée de Torrc</string>
   <string name="pref_torrc_summary">EXPERTS SEULEMENT : saisissez les lignes de configuration de torrc direct</string>
   <string name="pref_torrc_dialog">Personnaliser Torrc </string>
-  <string name="wizard_tips_martus">Martus mobile - Appli de documentation pour les droits humains de  Benetech</string>
-  <string name="your_tor_public_ips_">Vos IP publiques Tor :</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Veuillez désactiver cette appli dans Android-&gt;Paramètres-&gt;Applications si vous éprouvez des problèmes avec Orbot :</string>
-  <string name="app_conflict">Conflit dâ??applis</string>
-  <string name="pref_transproxy_refresh_title">Rafraîchissement automatique de Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Appliquer de nouveau les règles de Transproxy lors des changements dâ??état du réseau</string>
-  <string name="pref_transproxy_flush_title">Transproxy ENLEVER DE FORCE</string>
-  <string name="pref_transproxy_flush_summary">Toquer ici pour vider toutes les règles réseau de transproxy MAINTENANT</string>
-  <string name="transparent_proxy_rules_flushed_">Les règles du mandataire transparent ont été vidéesâ??!</string>
-  <string name="you_do_not_have_root_access_enabled">Lâ??accès RACINE nâ??est pas activé</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Vous pourriez avoir à arrêter et démarrer Orbot pour que les changements de paramètres soient activés.</string>
-  <string name="menu_vpn">Applis</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">Ko</string>
   <string name="mb">Mo</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Activer</string>
   <string name="apps_mode">Mode RPV</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Vous pouvez permettre aux applis de passer par le réseau Tor en utilisant le RPV intégré dâ??Orbot.\n\nCette fonction ne vous rendra pas anonyme, mais elle aide à traverser les pare-feu.</string>
-  <string name="send_email">Envoyer un courriel</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 &amp; collez-la dans le champ « Ponts » des paramètres dâ??Orbot et redémarrez.</string>
   <string name="install_orweb">Installer Orfox</string>
-  <string name="standard_browser">Navigateur standard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Note : seuls les ponts Tor standards fonctionnent sur les appareils Intel X86/ATOM</string>
-  <string name="vpn_default_world">Mondial (Auto)</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="ports">Ports</string>
-  <string name="local_port">Port local</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Le droit a été accordé</string>
-  <string name="permission_denied">Le droit a été refusé</string>
-  <string name="restore_backup">Restaurer la sauvegarde</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Veuillez activer le mode RPV pour permettre aux applis dâ??utiliser Tor</string>
-  <string name="app_shortcuts">Applis pouvant utiliser Tor</string>
-  <string name="title_activity_bridge_wizard">Activité de lâ??assistant de pont</string>
-  <string name="testing_bridges">Test de la connexion-pont vers Torâ?¦</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>
diff --git a/app/src/main/res/values-gl/poestrings.xml b/app/src/main/res/values-gl/poestrings.xml
index cd26c7e5..82719775 100644
--- a/app/src/main/res/values-gl/poestrings.xml
+++ b/app/src/main/res/values-gl/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Pontes son repetidores de Tor que axudan a esquivar a censura. Pode probar pontes si Tor é bloqueada polo seu ISP; cada tipo de ponte utiliza un método diferente
-   para evitar a censura: si un non funciona, probe a utilizar un diferente.</string>
-
-    <string name="bridges_no">Sen pontes: Conexión directa a Tor</string>
-    <string name="bridges_provided">Pontes proporcionadas:</string>
-    <string name="bridges_custom">Pontes personalizadas</string>
-
-    <string name="bridges_config">Axustes da ponte</string>
-    <string name="action_done">Feito</string>
 
     <string name="bridges_sometimes">A veces precisa unha ponte para chegar a Tor.</string>
     <string name="action_more">CÃ?NTAME MÃ?IS</string>
@@ -17,19 +8,6 @@
     <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="status_connected">Conectada!</string>
-
-    <string name="loading_claim_1">A nosa comunidade tan diversa é o que fai Tor grande!</string>
-    <string name="loading_claim_2">A xente común utiliza Tor para evitar o seguimento por parte dos anunciantes.</string>
-    <string name="loading_claim_3">Cando Facebook está bloqueada, a xente utiliza Tor para conectar con amigas e familia.</string>
-    <string name="loading_claim_4">As activistas utilizan Tor para chiar con libertade as súas opinións e crenzas.</string>
-    <string name="loading_claim_5">As blogueiras utilizan Tor para concienciar a xente a prol das reformas sociais.</string>
-    <string name="loading_claim_6">As xornalistas utilizan Tor para investigar historias de xeito seguro e informar.</string>
-    <string name="loading_claim_7">A xente dos negocios utiliza Tor para manter a intimidade das estratexias da empresa.</string>
-    <string name="loading_claim_8">As traballadoras utilizan Tor para loitar pola xustiza sen temor a perder o traballo.</string>
-
-    <string name="status_connecting">Estamos a conectala.\" = \"Estamos a conectala.</string>
-
     <string name="hello">Ola</string>
     <string name="welcome">Ben vida a Tor no móbil.</string>
 
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 4570acc5..a2781bfe 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -2,137 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e deter Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está a se iniciar...</string>
+    <string name="status_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="tor_process_waiting">á espera.</string>
-  <string name="not_anonymous_yet">AVISO: o teu tráfico aínda non é anónimo! Por favor, configura os teus aplicativos para uxar o proxy HTTP 127.0.0.1:8118 ou SOCKS4A ou o proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Inicio</string>
-  <string name="menu_browse">Examinar</string>
-  <string name="menu_settings">Axustes</string>
+    <string name="menu_settings">Axustes</string>
   <string name="menu_log">Rexistro (log)</string>
-  <string name="menu_info">Axuda</string>
-  <string name="menu_apps">Apps...</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Deter</string>
   <string name="menu_about">Sobre</string>
-  <string name="menu_promo_apps">Obter apps...</string>
-  <string name="main_layout_download">Descargar</string>
+    <string name="main_layout_download">Descargar</string>
   <string name="main_layout_upload">Cargar</string>
-  <string name="button_help">Axuda</string>
-  <string name="button_close">Pechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar rexistro</string>
-  <string name="menu_verify">Comprobar</string>
-  <string name="menu_exit">Saír </string>
+    <string name="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="press_to_start">- toque longo para comezar-</string>
-  <string name="pref_trans_proxy_group">Proxyficación transparente (cómpre ser root)</string>
-  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
-  <string name="pref_trans_proxy_summary">Torificación Automática dos Aplicativos</string>
-  <string name="pref_transparent_all_title">Tor para todo</string>
-  <string name="pref_transparent_all_summary">Pasar todo o tráfico dos aplicativos por Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porto de Reserva do Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">ATENCI�N: Evita os portos comúns (80, 443, etc). * USAR S�* se os modos  \'Todo\' ou \'Aplicación\' non funcionan.</string>
-  <string name="pref_transparent_port_title">Lista de Portos</string>
-  <string name="pref_transparent_port_summary">Lista de portos a pasar. *USAR S�* se os modos \'Todo\' ou \'Aplicación\' non funcionan</string>
-  <string name="pref_transparent_port_dialog">Introduza os portos a pasar</string>
-  <string name="pref_has_root">Requerir Acceso de Superusuario</string>
-  <string name="pref_has_root_summary">Requerir acceso de root para proxy transparente</string>
-  <string name="status_install_success">Se instalaron con éxito os binarios de Tor!</string>
-  <string name="status_install_fail">Non se puideron instalar os ficheiros binarios de Tor. Por favor, comprobe o rexistro e notifíqueo a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erro de Aplicativo</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
-  <string name="btn_next">Seguinte</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Rematar</string>
-  <string name="btn_okay">Aceptar</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permiso Concedido</string>
-  <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelente! Detectamos que ten permisos de root habilitados para Orbot. Empregaremos este poder sabiamente.</string>
-  <string name="wizard_permissions_msg_stock">Aínda que non é necesario, Orbot pode ser unha ferramenta máis poderosa se o seu dispositivo ten acceso de root. Use o botón de abaixo para dar superpoderes a Orbot!</string>
-  <string name="wizard_permissions_no_root">Se non ten acceso de root ou non tén nin idea de  qué lle estamos a falar, asegúrese de usar aplicativos que funcionen con Orbot.</string>
-  <string name="wizard_permissions_consent">Entendo e gostaríame continuar sen Superusuario</string>
-  <string name="wizard_permission_enable_root">Conceder Root a Orbot</string>
-  <string name="wizard_configure">Configurar Torificación</string>
-  <string name="wizard_configure_msg">Orbot dá-lle a opción de enrutar todo o tráfico dos aplicativos a través de Tor OU elexir ditos aplicativos individualmente.</string>
-  <string name="wizard_configure_all">Enviar Todos os Aplicativos Por Tor</string>
-  <string name="wizard_configure_select_apps">Elixir Aplicativos Individuais por Tor</string>
-  <string name="wizard_tips_tricks">Aplicativos habilitados para Tor</string>
-  <string name="wizard_tips_msg">Os aplicativos de abaixo foron programados para funcionar con Orbot. Prema en cada botón para instalar agora, ou os pode atopar despóis en Google Play, no sitio web GuardianProject.info ou en F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensaxería instantánea segura para Android</string>
-  <string name="wizard_tips_proxy">Axustes do Proxy - Aprenda cómo configurar aplicativos para que funcionen con Orbot</string>
-  <string name="wizard_tips_duckgo">Aplicativo do Motor de Búsquedas DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Axustar o host para proxy de Twitter a \"localhost\" e porto 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Conte unha historia e deixea en tor por seguridade!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Axustes do proxy</string>
-  <string name="wizard_proxy_help_msg">Se o aplicativo de Android que está a utilizar admite o uso de un proxy HTTP ou SOCKS, entón pode configuralo para que se conecte a Orbot e utilizar Tor.\n\n\n Os axustes do proxy son 127.0.0.1 ou \"localhost\" como servidor. No proxy HTTP o porto é o 8118. Para SOCKS en 9050. Debería utilizar SOCKS4A OU SOCKS5 se fose posible.\n \n\n\n Vostede pode aprender máis sobre cómo utilizar un proxy en Android nas nosas PMF en:
-http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot está listo!</string>
-  <string name="wizard_final_msg">Millóns de personas utilizan Tor en todo o mundo por múltiples razóns.\n\nXornalistas e blogueiras, defensoras dos dereitos humanos, fiscáis, soldados, empresas, cidadáns baixo reximes opresivos, e cidadáns normais... e agora vostede tamén pode!</string>
-  <string name="wizard_exit_at_first_screen_toast">Por favor, configure Orbot antes de comezar a utilizalo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Vostede conectouse correctamente a rede Tor - mais esto NON significa que o seu dispositivo é seguro. Pode utilizar o bótón \'Navegador\' para comprobar a súa conexión. \n\nVisítenos en https://guardianproject.info/apps/orbot ou envíenos un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para saber máis.</string>
-  <string name="tor_check">Isto abrirá no seu navegador https://check.torproject.org para ver se Obrbot está configurado probablemente e se está conectado a Tor.</string>
-  <string name="pref_hs_group">Aloxamento Oculto de Servizo</string>
-  <string name="pref_general_group">Xeral</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot leva Tor a Android!\n\nTor axúdalle a defenderse ante o filtrado de contidos, a análise de tráfico e a vixiancia da rede que ameazan a intimidade, a información confidencial e as relacións personais.\n\nEste asistente axudaralle a configurar Orbot e Tor no seu dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Aviso</string>
-  <string name="wizard_warning_msg">Só con instalar Orbot non fará anónimo de xeito automático todo o seu tráfico móbil.\n\nDebe axustar correctamente Orbot, o seu dispositivo e outras aplicacións para utilizar con éxito Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente pode darlle a Orbot acceso de \'Superusuario\' para habilitar características avanzadas, como o Proxy Transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se non quere facer isto, por favor asegúrese de usar aplicativos feitos para traballar con Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Semella non ter acceso \'Superusuaria\' ao seu dispositivo ou estar rooteado.\n\nPor favor, probe o modo \'Apps\' na pantalla principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicativos Habilitados para Orbot</string>
-  <string name="wizard_tips_gibberbot">CahtSecure: Aplicativo de chat seguro con Off-the-Record Encryption (OTR)</string>
-  <string name="wizard_tips_orweb">Orfox: navegador orientado a intimidade que funciona a través de Tor</string>
-  <string name="wizard_tips_play">Atope todos os aplicativos de Guardian Project apps en Google Play</string>
-  <string name="wizard_tips_fdroid">Atopa todas as aplicacións de The Guardian Project en F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Atopa todas as aplicacións de The Guardian Project en https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_msg">Isto permite que os seus aplicativos funcionen a través de rede Tor sen ningunha configuración.</string>
-  <string name="wizard_transproxy_hint">(Marque esta caixa se non ten nin idea do que lle estamos a falar)</string>
-  <string name="wizard_transproxy_none">Ningunha</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente Tor para dispositivos enlazados por Wifi ou USB (require reiniciar)</string>
-  <string name="button_grant_superuser">Pedir Acceso de Superusuario</string>
-  <string name="pref_select_apps">Seleccionar Aplicativos</string>
-  <string name="pref_select_apps_summary">Elixir Aplicativos a Enrutar a Través de Tor</string>
-  <string name="pref_node_configuration">Configuración de Nodo</string>
+    <!--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="button_proxy_all">Proxy para todo</string>
-  <string name="button_proxy_none">Sen Proxy</string>
-  <string name="button_invert_selection">Invertir selección</string>
-  <string name="pref_proxy_title">Proxy para a Rede de Saída (Opcional)</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>
@@ -148,20 +57,8 @@ http://tinyurl.com/proxyandroid\n </string>
   <string name="pref_proxy_password_title">Contrasinal do Proxy de Saída</string>
   <string name="pref_proxy_password_summary">Contrasinal do Proxy (Opcional)</string>
   <string name="pref_proxy_password_dialog">Introduza Contrasinal do Proxy</string>
-  <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Preparando proxy transparente completo...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Preparando proxy transparente baseado en aplicativo...</string>
-  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Enlazamento!</string>
-  <string name="warning_error_starting_transparent_proxying_">ATENCIÃ?N: erro arrancando o proxy transparente!</string>
-  <string name="transproxy_rules_cleared">Regras TransProxy limpadas</string>
-  <string name="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo está a funcionar no porto:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Preparando proxy transparente baseado en porto...</string>
-  <string name="bridge_error">Erro de Ponte</string>
-  <string name="bridge_requires_ip">Para usar a característica de ponte, debe introducir cando menos unha dirección IP de ponte.</string>
-  <string name="send_email_for_bridges">Envíe un email a bridges@xxxxxxxxxxxxxx só coa liña \"get bridges\" no corpo do correo dende unha conta de gmail.</string>
-  <string name="error">Erro</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>
@@ -174,10 +71,8 @@ http://tinyurl.com/proxyandroid\n </string>
   <string name="use_only_these_specified_nodes">Usar *só* este nodos específicos</string>
   <string name="bridges">Pontes</string>
   <string name="use_bridges">Usar Pontes</string>
-  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activar entradas alternativas a rede Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se oas pontes configuradas son pontes ofuscadas</string>
-  <string name="ip_address_and_port_of_bridges">Dirección IP e porto das pontes</string>
+    <string name="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>
@@ -193,17 +88,10 @@ http://tinyurl.com/proxyandroid\n </string>
   <string name="reachable_ports">Portos Alcanzábeis</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Portos alcanzábeis detrás dun firewall restritivo</string>
   <string name="enter_ports">Inserir portos</string>
-  <string name="enable_hidden_services">Aloxamento de Servizo Oculto</string>
-  <string name="run_servers_accessible_via_the_tor_network">permitir ao servidor no dispositivo estar accesible na rede Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">introduza os portos localis para servizos ocultos</string>
-  <string name="hidden_service_ports">Portos de Servicios Ocultos</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nome para referirse ao seu servizo oculto (xenerado automáticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar rexistro de depuración na saída (debe usar adb ou aLogCat para ver)</string>
+    <string name="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="the_tor_license">A Licencia de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de Terceiros:</string>
+    <string name="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>
@@ -212,37 +100,18 @@ http://tinyurl.com/proxyandroid\n </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="hidden_service_on">servizo oculto en:</string>
-  <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
+    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
   <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
-  <string name="unable_to_reset_tor">Reinicie o dispositivo, no se puido restablecer Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar iptables por Defecto</string>
-  <string name="pref_use_sys_iptables_summary">usar o binario de iptables instalado en lugar do empaquetado con Orbot</string>
-  <string name="error_installing_binares">Non se puideron instalar ou actualizar os binarios de Tor</string>
-  <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
+    <string name="pref_use_persistent_notifications">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="notification_using_bridges">Pontes habilitadas!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Elixir locale e idioma para Orbot</string>
-  <string name="wizard_locale_title">Escoller idioma</string>
-  <string name="wizard_locale_msg">Deixar por defecto ou cambiar ao idioma actual</string>
-  <string name="powered_by">grazas a Tor</string>
-  <string name="btn_save_settings">Gardar os axustes</string>
-  <string name="no_internet_connection_tor">Sen conexión a internet; Tor está a espera...</string>
-  <string name="bandwidth_">Ancho de Banda:</string>
-  <string name="down">caído</string>
-  <string name="up">levantado</string>
-  <string name="pref_disable_network_title">Auto-Parado Sen Rede</string>
+    <string name="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="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Xestionar Tor</string>
-  <string name="permission_manage_tor_description">Hablitar este aplicativo para controlar o servicio Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona mellor co navegador Orfox. Instalar agora?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona mellor co navegador Orfox. Instalar agora?</string>
   <string name="install_apps_">Instalar navegador?</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>
@@ -259,19 +128,7 @@ http://tinyurl.com/proxyandroid\n </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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">As súas IPs públicas Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por favor, desactive esta aplicación en Android-&gt;Axustes-&gt;Apps si ten problemas con Orbot:</string>
-  <string name="app_conflict">Conflito de App</string>
-  <string name="pref_transproxy_refresh_title">Auto-actualización do Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Voltar a aplicar as regras Transproxy cando mude o estado da rede</string>
-  <string name="pref_transproxy_flush_title">FORZAR ELIMINACIÃ?N do Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Toque aquí para eliminar AGORA todas as regras da rede transproxy</string>
-  <string name="transparent_proxy_rules_flushed_">Regras do proxy transparente eliminadas!</string>
-  <string name="you_do_not_have_root_access_enabled">Non ten acceso ROOT activado</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Podería ter que deter e iniciar Orbot para activar os cambios nos axustes.</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -284,19 +141,15 @@ http://tinyurl.com/proxyandroid\n </string>
   <string name="get_bridges_web">Web</string>
   <string name="activate">Activar</string>
   <string name="apps_mode">Modo VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Pode activar que as aplicacións pasen a través de Tor utilizando o servizo VPN que Tor inclúe.\n\nEsto non fará que sexa anónima, pero axudaralle a pasar os cortalumes.</string>
-  <string name="send_email">Enviar correo</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="install_orweb">Instalar Orfox</string>
-  <string name="standard_browser">Navegador estándar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Só funcionan as pontes Tor estándar nos dispositivos X86/ATOM</string>
-  <string name="vpn_default_world">Global (Auto)</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="ports">Portos</string>
-  <string name="local_port">Porto local</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>
@@ -309,9 +162,7 @@ http://tinyurl.com/proxyandroid\n </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="permission_granted">Permiso concedido</string>
-  <string name="permission_denied">Permiso denegado</string>
-  <string name="restore_backup">Restaurar respaldo</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>
@@ -344,10 +195,8 @@ http://tinyurl.com/proxyandroid\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="please_enable_vpn">Por favor, active o modo VPN para facer que as apps utilicen Tor</string>
-  <string name="app_shortcuts">Apps con Tor activado</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Probando a conexión ponte a Tor...</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>
diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml
index bfb4b94f..67ff81c9 100644
--- a/app/src/main/res/values-gu-rIN/strings.xml
+++ b/app/src/main/res/values-gu-rIN/strings.xml
@@ -2,13 +2,11 @@
 <resources>
   <string name="btn_cancel">રદ �ર�</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">પ�ર���સ� ��ઠવણ��</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index e1566469..f04f4533 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -2,26 +2,17 @@
 <resources>
   <string name="menu_settings">સ��િ���સ</string>
   <string name="menu_log">ન��ધણ�</string>
-  <string name="menu_info">મદદ</string>
-  <string name="button_help">મદદ</string>
-  <string name="button_close">બ�ધ �ર�</string>
-  <string name="btn_next">પ��</string>
-  <string name="btn_back">પહ�લાન��</string>
-  <string name="btn_okay">બરાબર</string>
+    <string name="btn_okay">બરાબર</string>
   <string name="btn_cancel">રદ� �ર�</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">પ�ર���સ� ��ઠવણ��</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">��� નહિ</string>
-  <string name="default_bridges"></string>
-  <string name="menu_vpn">�પ�સ</string>
-  <string name="activate">સ��રિય</string>
+    <string name="activate">સ��રિય</string>
   <string name="save">સ���રહ�</string>
   <string name="name">નામ</string>
   <string name="disable">નિષ���રિય �ર�</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index f322afb3..790a1186 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -2,146 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ×?×?×? ×?×?ש×?×? ×?×?× ×?×? ש×? ×?פ×?×?Ö¾×?×?×? ×?×?עצ×?×? ×?×?ש×?×?×?×? ×?×?ר×?×? ×?×?שת×?ש ×?×?×?× ×?רנ×? ×?×?תר ×?×?×?×?×?. Orbot ×?שת×?ש ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?רנ×? ש×?×? ×?×?×? ×?סת×?ר ×?×?ת×? ×?×?×?צע×?ת ×?קפצ×? ×?ר×? ס×?רת ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?× ×?×?ת ×?רשת פת×?×?×? ×?×¢×?×?רת ×?×? ×?×?ת×?×?× ×? ×?פנ×? צ×?ר×? ש×? ×?עק×? ×?רשת ×?×?×?×?×?×? ×¢×? ×?×?ר×?ת ×?×?ש×?ת ×?פר×?×?×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?ש×?×?×?ת, ×?×?×?×?×?×? ×?×?×?× ×? ×?×?×?×?ר ×?ש×? × ×?ת×?×? תע×?×?ר×?.</string>
-  <string name="internal_web_url">http://orbot</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">×?ת×?×? ×?עצ×?ר ×?ת Tor</string>
-  <string name="tor_proxy_service_process">ש×?ר×?ת ×?פ×?×?Ö¾×?×?×? ש×? Tor</string>
-  <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
+    <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
   <string name="status_activated">×?×?×?×?ר ×?רשת Tor</string>
   <string name="status_disabled">Orbot ×?×?×?×?</string>
   <string name="status_shutting_down">ש×?ר×?ת Tor ×?ת×?×?×?</string>
   <string name="tor_process_starting">×?ת×?×?×? ×?ק×?×? Tor...</string>
   <string name="tor_process_complete">×?×?ש×?×?.</string>
-  <string name="tor_process_waiting">×?×?ת×?×?.</string>
-  <string name="not_anonymous_yet">×?×?×?ר×?: ×?תע×?×?ר×? ש×?×? ×?×?× ×? ×?×?×?×?× ×?ת ×¢×?×?×?! ×?× ×? ×?×?×?ר ×?ת ×?×?×?ש×?×?×?×? ש×?×? ×?×?שת×?ש ×?×?פ×?×?Ö¾×?×?×? HTTP ש×? 127.0.0.1:8118 ×?×? SOCKS4A ×?×? ×?פ×?×?Ö¾×?×?×? SOCKS5 ש×? 127.0.0.1:9050</string>
-  <string name="menu_home">×?×?ת</string>
-  <string name="menu_browse">×?פ×?×£</string>
-  <string name="menu_settings">×?×?×?ר×?ת</string>
+    <string name="menu_settings">×?×?×?ר×?ת</string>
   <string name="menu_log">×?×?×?×?</string>
-  <string name="menu_info">×¢×?ר×?</string>
-  <string name="menu_apps">×?×?ש×?×?×?×?...</string>
-  <string name="menu_start">×?ת×?×?</string>
+    <string name="menu_start">×?ת×?×?</string>
   <string name="menu_stop">עצ×?ר</string>
   <string name="menu_about">×?×?×?×?ת</string>
-  <string name="menu_promo_apps">×?ש×? ×?×?ש×?×?×?×?...</string>
-  <string name="main_layout_download">×?×?ר×?×?</string>
+    <string name="main_layout_download">×?×?ר×?×?</string>
   <string name="main_layout_upload">×?×¢×?×?×?</string>
-  <string name="button_help">×¢×?ר×?</string>
-  <string name="button_close">ס×?×?ר</string>
-  <string name="button_about">×?×?×?×?ת</string>
-  <string name="button_clear_log">נק×? ×?×?×?×?</string>
-  <string name="menu_verify">×?×?×?ק</string>
-  <string name="menu_exit">×?צ×?×?×?</string>
+    <string name="button_about">×?×?×?×?ת</string>
+    <string name="menu_exit">×?צ×?×?×?</string>
   <string name="menu_scan">סר×?ק BridgeQR</string>
   <string name="menu_share_bridge">שתף BridgeQR</string>
-  <string name="press_to_start">-× ×?×?×¢×? ×?ר×?×?×? ×?×?ת×?×?×?-</string>
-  <string name="pref_trans_proxy_group">×?פ×?×?Ö¾×?×?×? שק×?×£ (×?×?רש ש×?רש)</string>
-  <string name="pref_trans_proxy_title">×?פ×?×?Ö¾×?×?×? שק×?×£</string>
-  <string name="pref_trans_proxy_summary">×¢×?×?×?×? ×?×?×?×?×?×?×?ת ×¢×? ×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_all_title">×?×?×? ×?ר×? Tor</string>
-  <string name="pref_transparent_all_summary">×?×?פ×? ×?×?×? ש×? תע×?×?ר×? ×¢×?×?ר ×?×? ×?×?×?ש×?×?×?×? ×?ר×? Tor</string>
-  <string name="pref_transparent_port_fallback_title">נס×?×?ת ×?פ×?×?Ö¾×?×?×? ש×? פת×?×?ת</string>
-  <string name="pref_transparent_port_fallback_summary">×?×?×?ר×?: ×¢×?קף פת×?×?ת נפ×?צ×?ת (80, 443 ×?×?×?\'). *×?שת×?ש רק* ×?×? ×?×?צ×?×?×? \'×?×?×?\' ×?×? \'×?×?ש×?×?\' ×?×?× ×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_title">רש×?×?ת פת×?×?ת</string>
-  <string name="pref_transparent_port_summary">רש×?×?ת פת×?×?ת ×¢×?×?ר ×?פ×?×?Ö¾×?×?×?. *×?שת×?ש רק* ×?×? ×?×?צ×?×?×? \'×?×?×?\' ×?×? \'×?×?ש×?×?\' ×?×?× ×? ×¢×?×?×?×?×?</string>
-  <string name="pref_transparent_port_dialog">×?×?נס פת×?×?ת ×?×? ×?פ×?×?Ö¾×?×?×?</string>
-  <string name="pref_has_root">×?ר×?ש×? ×?×?שת ש×?רש</string>
-  <string name="pref_has_root_summary">×?קש ×?×?שת ש×?רש ×¢×?×?ר ×?פ×?×?Ö¾×?×?×? שק×?×£</string>
-  <string name="status_install_success">ק×?צ×?×? ×?ר×? ×?רצ×? ש×? Tor ×?×?תקנ×? ×?×?צ×?×?×?!</string>
-  <string name="status_install_fail">×?ק×?צ×?×? ×?ר×? ×?×?רצ×? ש×? Tor ×?×? × ×?תנ×? ×?×?תקנ×?. ×?×?קש×? ×?×?×?ק ×?ת ×?×?×?×? ×?×?×?×?×¢ ×? 
-tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ש×?×?×?ת ×?פ×?×?קצ×?×?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">×?×?×?×?ת Orbot</string>
-  <string name="btn_next">×?×?×?</string>
-  <string name="btn_back">×?ק×?×?×?</string>
-  <string name="btn_finish">ס×?×?×?</string>
-  <string name="btn_okay">×?×?ש×?ר</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">× ×?תנ×? ×?רש×?×?</string>
-  <string name="wizard_permissions_stock">×?רש×?×?ת Orbot</string>
-  <string name="wizard_premissions_msg_root">×?צ×?×?×?! ×?×?×?×?× ×? ×?×? ×?ש ×?×? ×?רש×?×?ת ש×?רש ×?×?×?פשר×?ת ×?ש×?×?×? Orbot. ×?× ×?× ×? נשת×?ש ×?×?×?×? ×?×?×? ×?×?×?×?×?×?.</string>
-  <string name="wizard_permissions_msg_stock">×?×?×?×? ש×?×? ×?×? × ×?רש, Orbot ×?×?×?×?×? ×?×?פ×?×? ×?×?×?×?ת ×?×?×? ×?×?ק ×?×?תר ×?×? ×?×?×?ש×?ר ש×?×? ×?ש ×?×?ש×? ×¢×?×?×?× ×?. תשת×?ש ×?×?פת×?ר ×?×?×?×? ×?×?×? ×?ק×?×? ×?×?×?×?ת ×¢×? ש×? Orbot !</string>
-  <string name="wizard_permissions_no_root">×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×?×?×?× ×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?, רק ת×?×?×?×? שתשת×?ש ×?×?פ×?×?קצ×?×?ת שנ×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot.</string>
-  <string name="wizard_permissions_consent">×?×?נת×? ×?×?× ×? ×?×¢×?×?×£ ×?×?×?ש×?×? ×?×?×? Superuser</string>
-  <string name="wizard_permission_enable_root">×?פשר ×?×?שת ש×?רש ×¢×?×?ר Orbot</string>
-  <string name="wizard_configure">×?×?×?ר ×¢×?×?×?×? ×?×?×?צע×?ת Tor</string>
-  <string name="wizard_configure_msg">Orbot × ×?תנת ×?×? ×?פשר×?ת ×?×?×?×?×? ×?ת ×?×? תע×?×?רת ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor ×?×? ×?×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?נפר×?.</string>
-  <string name="wizard_configure_all">×?×?פ×? ×?×?×? ×?×?×? ×?×?×?ש×?×?×?×? ×?ר×? Tor</string>
-  <string name="wizard_configure_select_apps">×?×?ר ×?פ×?×?קצ×?×?ת ×?ס×?×?×?×?ת ×¢×?×?ר Tor</string>
-  <string name="wizard_tips_tricks">Orbot ×?ת×?פשר ×¢×? ×?×?×? ×?פ×?×?קצ×?×?ת</string>
-  <string name="wizard_tips_msg">×?×?פ×?×?קצ×?×?ת ×?ת×?ת פ×?ת×?×? ×?×¢×?×?×?×? ×¢×? Orbot. ×?×?×¥ ×¢×? ×?×? ×?פת×?ר ×?×?תקנ×? ×?×?×?×?×?ת, ×?×? ש×?ת×? ×?×?×?×? ×?×?צ×?×? ×?×?ת×? ×?×?ר ×?×? ×? Google Play, ×?×?תר GuardianProject.info ×?×?
-×?ר×?  F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ת×?×?נת ×?סר×?×? ×?×?×?×?×?×? ×?×?×?×?×?×?ת ×?×?× ×?ר×?×?×?×?</string>
-  <string name="wizard_tips_proxy">×?×?×?ר×?ת ×?פ×?×?Ö¾×?×?×? - ×?×?×? ×?×?×? ×?×?×?×?×?ר ×?×?ש×?×?×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ×?פ×?×?קצ×?×?ת ×?× ×?×¢ ×?×?פ×?ש</string>
-  <string name="wizard_tips_twitter">ק×?×¢ ×?פ×?×?Ö¾×?×?×? ש×? ×?×?×?×?×?ר ×?×? ×?×?ר×? \"localhost\" ×?פת×?×? ×?×? 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ×?ער×? ש×?×¢×?ר×?×? ×?×¢×?ת×?× ×?×?×? ×¢×? ש×?×?×?ש ×?-Tor ×?×?×?× ×? ×¢×? ×¢×?×?×?ת×?.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">×?×?×?ר×?ת ×?פ×?×?Ö¾×?×?×?</string>
-  <string name="wizard_proxy_help_msg">×?×? ×?×?ש×?×? ×?×?× ×?ר×?×?×?×? ש×?ת×? ×?שת×?ש ×?×?×?×? ×?ת×?×?×? ×?ש×?×?×?ש ×?×?פ×?×?Ö¾×?×?×? ש×? HTTP ×?×? SOCKS, ×?×? ×?ת×? ×?×?×?×? ×?×?×?×?×?ר ×?×?ת×? ×?×?ת×?×?ר ×?×? Orbot ×?×?×?שת×?ש ×?-Tor.\n\n\n ×?×?×?ר×?ת ×?×?×?ר×? ×?×? 127.0.0.1 ×?×? \"localhost\". ×¢×?×?ר HTTP, ×?×?×?רת ×?פת×?×? ×?×?×? 8118. ×¢×?×?ר SOCKS ×?פ×?×?Ö¾×?×?×?×? ×?×?×? 9050. ×¢×?×?×? ×?×?שת×?ש ×?-SOCKS4A ×?×? ×?-SOCKS5 ×?×? ×?פשר. \n \n\n\n ×?ת×? ×?×?×?×? ×?×?×?×?×? ×¢×?×? ×?×?×?×?ת ×?פ×?×?Ö¾×?×?×? ×¢×? ×?נר×?×?×?×? ×?ר×? ש×?×?×?ת נפ×?צ×?ת ×?×?ת×?×?ת: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot ×?×?×?×?!</string>
-  <string name="wizard_final_msg">×?×?×?×?×?× ×? ×?נש×?×? ×?ר×?×?×? ×?×¢×?×?×? ×?שת×?ש×?×? ×?Tor ×?ס×?×?×?ת ר×?×?ת.\n\n ×¢×?ת×?× ×?×?×? ×?×?×?×?×?ר×?×?, פע×?×?×? ×?×?×?×?×?ת ×?×?×?, ש×?×?ר×?×?, ×?×?×?×?×?×?, ת×?×?×?×?×?×?, ×?×?ר×?×? ×?×?ש×?ר×?×? ×?×?×?×?×?×?×? ×?×?×? ×?×?ר×?×?×? פש×?×?×?×?... ×?×¢×?ש×?×? ×?×? ×?ת×?!</string>
-  <string name="wizard_exit_at_first_screen_toast">×?× ×? ×?×?×?ר ×?ת Orbot ×?פנ×? שת×?×?×? ×?×?ת×?×?×? ×?×?שת×?ש ×?×?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">×?×?×?רת ×?×? Tor ×?×?צ×?×?×?- ×?×?×? ×?×? ×?×? ×?×?×?ר ש×?×?×?ש×?ר ש×?×? ×?×?×?×?×?×?. ×?ת×? ×?×?×?×? ×?×?שת×?ש ×?×?פת×?ר \'×?פ×?פ×?\' ×?ש×?×?×? ×?×?×?×?ק ×?ת ×?×?×?×?×?ר ש×?×?.
-
-×?קר ×?×?תנ×? ×?- https://guardianproject.info/apps/orbot ×?×? ש×?×? ×?×?×?×? ×?×? help@xxxxxxxxxxxxxxxxxxxx ×?ש×?×?×? ×?×?×?×?×? ×¢×?×?</string>
-  <string name="tor_check">×?×?ר ×?×? ×?×?×?×?×? ×?ת ×?פ×?פ×? ×?רשת ש×?×? ×?×?×?×? https://check.torproject.org ×?×?×? ×?ר×?×?ת ×?×? Orbot ×?×?×?×?ר×? ×?ר×?×?×? ×?×?×? ×?×? ×?ת×? ×?×?×?×?ר ×?רשת Tor.</string>
-  <string name="pref_hs_group">×?×?ר×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="pref_general_group">×?×?×?×?</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-->
-  <string name="wizard_title_msg">Orbot ×?×?×?×? ×?ת Tor ×?×?× ×?ר×?×?×?×?!
-
-Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surveillance ש×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×¢×? ×?×?×?×¢ ×?ס×?×? ×?×¢×? קשר×?×? ×?×?×? ×?×?ש×?×?×?.
-
-×? Wizard ×?×?×? ×?×¢×?×?ר ×?×? ×?×?×?×?×?ר ×?ת Orbot ×?×?ת Tor ×¢×? ×?×?ש×?ר×?</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">×?×?×?ר×?</string>
-  <string name="wizard_warning_msg">×?×?תק×?×? ×?ת Orbot ×?×?×?×? ×?×? ×?×?ר×?×? ×?תע×?×?רת ×?×?×?ש×?ר ×?×?×?×?ת ×?ס×?×?ת.\n\n×?ת×? ×?×?×?×? ×?×?×?×?×?ר × ×?×?×? ×?ת Orbot, ×?ת ×?×?×?ש×?ר ×?×?ת ש×?ר ×?×?פ×?×?קצ×?×?ת ×?×?שת×?ש ×? Tor</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">×?רש×?×?ת</string>
-  <string name="wizard_permissions_root_msg1">×?ת×? ×?×?×?×? ×?×?×¢× ×?ק ×?×?×?ש×?×? Orbot ×?×?שת \'×?שת×?ש ×¢×?\' ×?×?×? ×?×?פשר ×?×?פ×?×?× ×?×? ×?תק×?×?×?×? ×?×?×?×? ×?פ×?×?Ö¾×?×?×? שק×?×£.</string>
-  <string name="wizard_permissions_root_msg2">×?×? ×?ת×? ×?×? ר×?צ×? ×?עש×?ת ×?ת ×?×?, ×?× ×? ×?קפ×? ×?×?שת×?ש ×?×?פ×?×?קצ×?×?ת ש×?×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
-  <string name="wizard_permissions_no_root_msg">×?×?ש×?ר×? ×?×?× ×? ×?×?פשר ×?×?שת root ×?×? \'Superuser\'.
-
-×?× ×? נס×? ×?ת ×?צ×? ×? \'Apps\' ×?×?×?ס×? ×?ר×?ש×? ×?×?ק×?×?.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-×?×?ש×?×?×?×? ×?×?פע×?×?×?</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ×?פ×?×?קצ×?×?ת ×?סר×?×? ×¢×? ×?צפנת Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: ×?פ×?פ×? שע×?×?ר ×?ר×? Tor ×¢×? פר×?×?×?ת ×?×?×?×?רת</string>
-  <string name="wizard_tips_play">×?צ×? ×?ת ×?×? ×?פ×?×?צ×?×?ת Guardian Project ×?צ×? Google Play</string>
-  <string name="wizard_tips_fdroid">×?צ×? ×?ת ×?×? ×?פ×?×?קצ×?×?ת Guardian Project ×¢×? F-Droid</string>
-  <string name="wizard_tips_fdroid_org">×?צ×? ×?ת ×?×? ת×?×?× ×?ת Guardian Project ×?- https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">×?פ×?×?Ö¾×?×?×? שק×?×£</string>
-  <string name="wizard_transproxy_msg">×?×? ×?×?פשר ×?×?פ×?×?קצ×?×?ת ש×?×? ×?ר×?×¥ ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ר×? רשת Tor ×?×?×? ×?×? תצ×?ר×?.</string>
-  <string name="wizard_transproxy_hint">(ס×?×? ת×?×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?)</string>
-  <string name="wizard_transproxy_none">×?×?×?×?</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">×?פשר ×?פ×?×?Ö¾×?×?×? שק×?×£ ש×? Tor ×¢×?×?ר WiFi ×?×?×?ש×?ר×?×? ×?×?×?×?ר×? USB (×?×?רש ×?פע×?×? ×?×?×?ש)</string>
-  <string name="button_grant_superuser">×?ר×?ש ×?×?ש×?ר Superuser</string>
-  <string name="pref_select_apps">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_select_apps_summary">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_node_configuration">×?×?×?ר×?ת Node</string>
+    <!--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="button_proxy_all">×?×?פ×? ×?×?×? ×?×?×?</string>
-  <string name="button_proxy_none">×?×? תשת×?ש ×?×?פ×?×?Ö¾×?×?×?</string>
-  <string name="button_invert_selection">×?פ×?×? ×?×?×?ר×?</string>
-  <string name="pref_proxy_title">רשת ×?פ×?×?Ö¾×?×?×? ×?×?צ×?ת (רש×?ת×?)</string>
+    <string name="pref_proxy_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>
@@ -157,20 +57,8 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="pref_proxy_password_title">ס×?ס×?×? ש×? Outbound Proxy</string>
   <string name="pref_proxy_password_summary">ס×?ס×?ת ×?פ×?×?Ö¾×?×?×? (רש×?ת×?)</string>
   <string name="pref_proxy_password_dialog">×?×?נס ס×?ס×?ת ×?פ×?×?Ö¾×?×?×?</string>
-  <string name="status">×?×¢×?×?</string>
-  <string name="setting_up_full_transparent_proxying_">×?×?×?×? ×?פ×?×?Ö¾×?×?×? שק×?×£ ×?×?×?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">×?×?×?×? ×?פ×?×?Ö¾×?×?×? שק×?×£ ×?×?×?סס ×?×?ש×?×?...</string>
-  <string name="transparent_proxying_enabled">×?פ×?×?Ö¾×?×?×? שק×?×£ ×?×?×?פשר</string>
-  <string name="transproxy_enabled_for_tethering_">×?פ×?×?Ö¾×?×?×? שק×?×£ ×?×?×?פשר ×¢×?×?ר ×?×?×?×?ר ×?ר×? ×?×?×?!</string>
-  <string name="warning_error_starting_transparent_proxying_">×?×?×?ר×?: ש×?×?×?×? ×?×?ת×?×?ת ×?פ×?×?Ö¾×?×?×? שק×?×£!</string>
-  <string name="transproxy_rules_cleared">×?×?×?×? TransProxy ×?×?×?ר×?</string>
-  <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo רץ ×¢×? פת×?×?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">×?×?×?×? ×?פ×?×?Ö¾×?×?×? שק×?×£ ×?×?×?סס פת×?×?...</string>
-  <string name="bridge_error">ש×?×?×?ת ×?שר</string>
-  <string name="bridge_requires_ip">×¢×? ×?נת ×?×?שת×?ש ×?×?×?פ×?×?×? ×?×?שר, ×?ת×? ×?×?×?×? ×?×?×?× ×?ס ×?פ×?×?ת ×?ת×?×?ת IP ×?שר ×?×?ת.</string>
-  <string name="send_email_for_bridges">ש×?×? ×?×?×?×?×?×? ×?×? bridges@xxxxxxxxxxxxxx ×¢×? ×?ש×?ר×? \"get bridges\" ×?×?×?×£ ש×? ×?×?×?×?×¢×? ×?×?ש×?×?×? Gmail</string>
-  <string name="error">ש×?×?×?×?</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>
@@ -183,10 +71,8 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="use_only_these_specified_nodes">×?שת×?ש *רק* ×?צ×?ת×?×? ×?צ×?×?× ×?×? ×?×?×?</string>
   <string name="bridges">×?שר×?×?</string>
   <string name="use_bridges">×?שת×?ש ×?×?שר×?×?</string>
-  <string name="bridges_obfuscated">×?שר×?×? ×?×¢×?רפ×?×?×?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">×?פשר ×?× ×?ס×?ת ×?×?×?פ×?×?ת ×?ת×?×? רשת Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">×?פשר ×?×? ×?שר×?×? ×?×?×?×?ר×?×? ×?×? ×?שר×?×? ×?×¢×?רפ×?×?×?</string>
-  <string name="ip_address_and_port_of_bridges">×?ת×?×?ת IP ×?פת×?×? ש×? ×?שר×?×?</string>
+    <string name="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>
@@ -202,17 +88,10 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="reachable_ports">פת×?×?ת × ×?×?ש×?ת</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">פת×?×?ת × ×?×?ש×?ת ×?×?×?×?ר×? ×?×?×?ת ×?ש ×?×?×?×?×?×?</string>
   <string name="enter_ports">×?×?נס פת×?×?ת</string>
-  <string name="enable_hidden_services">×?×?ר×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="run_servers_accessible_via_the_tor_network">×?תר שרת ×¢×?-×?×?ש×?ר ×?×?×? ×?×?×?×?ת × ×?×?ש ×?ר×? רשת Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">×?×?נס פת×?×?ת localhost ×¢×?×?ר ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="hidden_service_ports">פת×?×?ת ש×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ש×? ×?ר־×?×?ת×?×?ת ×¢×?×?ר ×?ש×?ר×?ת ×?נסתר ש×?×? (×?ת×?×?×?×? ×?×?×?פ×? ×?×?×?×?×?×?×?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">×?פשר ×?×?×?×? × ×?פ×?×? תק×?×?×? ×?×? פ×?×? (×?×?×?×? ×?×?שת×?ש ×?-adb ×?×? ×?-aLogCat ×?×?×? ×?×?צ×?×?)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">×?פשר ×?×?×?×? × ×?פ×?×? תק×?×?×? ×?×? פ×?×? (×?×?×?×? ×?×?שת×?ש ×?-adb ×?×? ×?-aLogCat ×?×?×? ×?×?צ×?×?)</string>
   <string name="project_home">×?תר×? ×?פר×?×?ק×?:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">×?רש×?×?×? ש×? Tor</string>
-  <string name="https_torproject_org">https://torproject.org/</string>
-  <string name="third_party_software">ת×?×?× ×?-צ×?-×?׳: </string>
+    <string name="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>
@@ -221,37 +100,18 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <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="hidden_service_on">ש×?ר×?ת נסתר ×?:</string>
-  <string name="unable_to_read_hidden_service_name">×?×? ×?×?×? × ×?ת×? ×?קר×?×? ש×? ש×? ש×?ר×?ת נסתר</string>
+    <string name="unable_to_read_hidden_service_name">×?×? ×?×?×? × ×?ת×? ×?קר×?×? ש×? ש×? ש×?ר×?ת נסתר</string>
   <string name="unable_to_start_tor">×?×? ×?ס×?×?×? ×?×?ת×?×?×? ×?ת Tor:</string>
-  <string name="unable_to_reset_tor">×?ת×?×? ×?ת ×?×?×?ש×?ר ש×?×?, ×?×?×? ×?פשר×?ת ×?×?פע×?×? ×?×?×?ש ×?ת Tor!</string>
-  <string name="pref_use_sys_iptables_title">×?שת×?ש ×?×?ר×?ר×?ת ×?×?×?×?×? ש×? iptables</string>
-  <string name="pref_use_sys_iptables_summary">×?שת×?ש ×?×?×?× ×?ר×? iptables ×?×?×?×?× ×? ×?×?ק×?×? ×?×?×?×? ×?×?ר×?×? ×¢×? Orbot</string>
-  <string name="error_installing_binares">×?×?×?× ×?ר×?×? ש×? Tor ×?×? ×?×?×?×? ×?×?×?×?ת ×?×?תקנ×?×? ×?×? ×?×?שת×?ר×?.</string>
-  <string name="pref_use_persistent_notifications">×?ש×?×?ר ת×?×?×? ×?ת ×?×?×?ק×?×? ×?סר×?×? ×?×?×?×? ×?ש×?×?ר×?×?×? ×?×?×?×?ר</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="notification_using_bridges">×?שר×?×? ×?×?×?פשר×?×?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">שפ×?</string>
-  <string name="set_locale_summary">×?×?ר ×?ת ×?×?ק×?×?×?×?ת ×?×?שפ×? ש×? Orbot</string>
-  <string name="wizard_locale_title">×?×?ר שפ×?</string>
-  <string name="wizard_locale_msg">×?ש×?ר ×?ר×?רת ×?×?×?×? ×?×? ×?×?×?×£ ×?שפ×? ×?× ×?×?×?×?ת</string>
-  <string name="powered_by">×?×?פע×? ×?×?×?צע×?ת Tor</string>
-  <string name="btn_save_settings">ש×?×?רת ×?×?×?ר×?ת</string>
-  <string name="no_internet_connection_tor">×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?; ת×?ר ×?×?ת×?×?...</string>
-  <string name="bandwidth_">ר×?×?×? פס:</string>
-  <string name="down">×?×?×?</string>
-  <string name="up">×?×¢×?×?</string>
-  <string name="pref_disable_network_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="menu_verify_browser">×?פ×?פ×?</string>
-  <string name="menu_use_chatsecure">×?פע×? ×?ת ChatSecure</string>
-  <string name="permission_manage_tor_label">× ×?×? Tor</string>
-  <string name="permission_manage_tor_description">×?פשר ×?ת ×?פ×?×?קצ×?×? ×?×? ×?×?×? ×?ש×?×?×? ×?ש×?ר×?ת Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot ×¢×?×?×? ×?צ×?ר×? ×?×?×?×?×? ×?×?×?תר ×¢×? ×?פ×?פ×? Orfox. ×?×?תק×?×? ×?עת?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot ×¢×?×?×? ×?צ×?ר×? ×?×?×?×?×? ×?×?×?תר ×¢×? ×?פ×?פ×? Orfox. ×?×?תק×?×? ×?עת?</string>
   <string name="install_apps_">×?×?תק×?×? ×?פ×?פ×??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">×?×?×? ×?×?×?×?ר ×?רשת. ×?×?×?×? ×?ת Tor....</string>
   <string name="network_connectivity_is_good_waking_tor_up_">×?×?×?×?×?ר ×¢×?×?×? ×?×?×?. ×?×¢×?ר ×?ת Tor...</string>
@@ -268,19 +128,7 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="pref_torrc_title">תצ×?ר×? ×?×?ת×?×?ת ×?×?ש×?ת ש×? Torrc</string>
   <string name="pref_torrc_summary">×?×?×?×?×?×? ×?×?×?×?: ×?×?נס ש×?ר×?ת תצ×?רת torrc ×?ש×?ר</string>
   <string name="pref_torrc_dialog">Torrc ×?×?ת×?×? ×?×?ש×?ת</string>
-  <string name="wizard_tips_martus">Martus × ×?×?×? - ×?×?ש×?×? ת×?×¢×?×? ×?×?×?×?×?ת ×?×?×? ש×? Benetech</string>
-  <string name="your_tor_public_ips_">×?IPs ×?×?×?צ×?× ×?×?×? ש×?×? ×¢×? Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">×?× ×? ×?ש×?ת ×?×?ש×?×? ×?×? ×?×?× ×?ר×?×?×?×?-&lt;×?×?×?ר×?ת-&lt;×?×?ש×?×?×?×? ×?×? ×?ת×? ×?×?×?×? ×?×¢×?×?ת ×¢×? Orbot:</string>
-  <string name="app_conflict">×¢×?×?×?ת ×?×?ש×?×?×?×?</string>
-  <string name="pref_transproxy_refresh_title">רענ×?×? ×?×?×?×?×?×?×? ש×? ×?פ×?×?Ö¾×?×?×? שק×?×£</string>
-  <string name="pref_transproxy_refresh_summary">×?×?×? ×?×?×?ש ×?×?×?×?×? ×?פ×?×?Ö¾×?×?×? שק×?×£ ×?×?שר ×?צ×? ×?רשת ×?שתנ×?</string>
-  <string name="pref_transproxy_flush_title">×?×?×?×?×¥ ×?סר×? ש×? ×?פ×?×?Ö¾×?×?×? שק×?×£</string>
-  <string name="pref_transproxy_flush_summary">×?קש ×?×?×? ×?×?×? ×?ר×?ק×? ×?ת ×?×? ×?×?×?×? ×?רשת ש×? ×?פ×?×?Ö¾×?×?×? שק×?×£ ×¢×?ש×?×?</string>
-  <string name="transparent_proxy_rules_flushed_">×?×?×?×?×? ×?פ×?×?Ö¾×?×?×? שק×?×£ ר×?קנ×?!</string>
-  <string name="you_do_not_have_root_access_enabled">×?×?×? ×?×? ×?×?שת ר×?×? ×?×?×?פשרת</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצ×?ר×? ×?×?×?×?ת ×?×?×?פע×?×? ×?ת Orbot ×¢×? ×?נת ×?×?×?×?×? ×?ת ×?ש×?× ×?×? ×?×?×?×?ר×?ת.</string>
-  <string name="menu_vpn">×?פ×?×?קצ×?×?ת</string>
-  <string name="kbps">ק\"×?/ש</string>
+    <string name="kbps">ק\"×?/ש</string>
   <string name="mbps">×?\"×?/ש</string>
   <string name="kb">ק\"×?</string>
   <string name="mb">×?\"×?</string>
@@ -293,19 +141,15 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="get_bridges_web">×?תר</string>
   <string name="activate">×?פע×?</string>
   <string name="apps_mode">×?צ×? VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">×?ת×? ×?×?×?×? ×?×?פשר ×?×?×?ש×?×?×?×? ×?×¢×?×?ר ×?ר×? Tor ×¢\"×? ש×?×?×?ש ×?-VPN ×?×?×?×?× ×? ש×? Orbot.\n\n ×?×? ×?×? ×?×?פ×?×? ×?×?ת×? ×?×?×?×?×?× ×?, ×?×?×? ×?×? ×?×¢×?×?ר ×?×? ×?×¢×?×?ר ×?ר×? ×?×?×?×?ת ×?ש.</string>
-  <string name="send_email">ש×?×? ×?×?×?\"×?</string>
+    <string name="send_email">ש×?×? ×?×?×?\"×?</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">×?ת×? ×?×?×?×? ×?×?ש×?×? ×?ת×?×?ת ×?שר ×?×?×?צע×?ת ×?×?×?\"×?, ×?רשת ×?×? ×¢\"×? סר×?קת ק×?×? QR ש×? ×?שר. ×?×?ר \'×?×?×?\"×?\' ×?×? \'רשת\' ×?×?×?×? ×?×?×? ×?×?קש ×?ת×?×?ת ×?שר.\n\n×?ר×?×¢ ש×?ש ×?×? ×?ת×?×?ת, ×?עתק ×?×?×?×?ק ×?×?ת×? ×?ת×?×? ×?×?×¢×?פ×? \"×?שר×?×?\" ×?×?×?×?ר×?ת Orbot ×?×?פע×? ×?×?×?ש.</string>
   <string name="install_orweb">×?תק×? Orfox</string>
-  <string name="standard_browser">×?פ×?פ×? ר×?×?×?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">×?ער×?: רק ×?שר×? Tor תקנ×?×?×? ×¢×?×?×?×?×? ×¢×? ×?×?ש×?ר×? ×?×?× ×?×? X86/Atom</string>
-  <string name="vpn_default_world">×¢×?×?×?×? (×?×?×?×?×?×?×?)</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="ports">פת×?×?ת</string>
-  <string name="local_port">פת×?×? ×?ק×?×?×?ת</string>
+    <string name="local_port">פת×?×? ×?ק×?×?×?ת</string>
   <string name="onion_port">פת×?ת ×?צ×?</string>
   <string name="name">ש×?</string>
   <string name="done">×?סת×?×?×?!</string>
@@ -318,9 +162,7 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="backup_restored">×?×?×?×?×? ש×?×?×?ר</string>
   <string name="filemanager_not_available">×?× ×?×? ק×?צ×?×? ×?×?× ×? ×?×?×?×?</string>
   <string name="please_grant_permissions_for_external_storage">×?× ×? ×?ענק ×?רש×?×?ת ×¢×?×?ר ×?×?ס×?×? ×?×?צ×?× ×?</string>
-  <string name="permission_granted">×?רש×?×? ×?×?ענק×?</string>
-  <string name="permission_denied">×?רש×?×? × ×?×?ת×?</string>
-  <string name="restore_backup">ש×?×?ר ×?×?×?×?×?</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>
@@ -353,10 +195,8 @@ Tor ×¢×?×?ר ×?×?×?×?×? ×? traffic analysis ,content filtering ×?- network surve
   <string name="pref_connection_padding_summary">×?פשר ת×?×?×? ר×?פ×?×? ×?×?×?×?ר ×?×?×? ×?×?×?×? ×?פנ×? צ×?ר×?ת ×?ס×?×?×?×?ת ש×? × ×?ת×?×? תע×?×?ר×?. ×?ר×?רת ×?×?×?×?: ×?×?×?×?×?×?×?</string>
   <string name="pref_reduced_connection_padding">×?×?פ×?ת ר×?פ×?×? ×?×?×?×?ר</string>
   <string name="pref_reduced_connection_padding_summary">ס×?×?ר ×?×?×?×?ר×? ×?×?סר ×?×?ק×?×? ×?×?תר ×?ש×?×?×? פ×?×?ת ×?×?×?×?×?ת ×?×?×?×¢ ר×?פ×?×? ×?×?×? ×?×?פ×?×?ת ש×?×?×?ש ש×? נת×?× ×?×? ×?ס×?×?×?×?.</string>
-  <string name="please_enable_vpn">×?× ×? שפע×? ×?ת ×?צ×? ×?Ö¾VPN ×?×?×? ×?×?פשר ×?×?×?ש×?×?×?×? ×?×?שת×?ש ×?Ö¾Tor</string>
-  <string name="app_shortcuts">×?×?ש×?×?×?×? ×?×?×?פשר×?Ö¾Tor</string>
-  <string name="title_activity_bridge_wizard">פע×?×?×?ת ×?שף ×?שר</string>
-  <string name="testing_bridges">×?×?×?×? ×?×?×?×?ר ×?שר ×?×? Tor...</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>
diff --git a/app/src/main/res/values-hi/poestrings.xml b/app/src/main/res/values-hi/poestrings.xml
index 751e24c3..894e1e4e 100644
--- a/app/src/main/res/values-hi/poestrings.xml
+++ b/app/src/main/res/values-hi/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">ब�रिड��स वह ��र र�ल�स ह� �� स��सरशिप �� दर�िनार �रन� म�� सहायता �रत� ह��। ��र ��र �ा प�रय�� �प�� ���रन�� स�वा प�रदाता द�वारा �वर�धित ह� त� ब�रिड��स �� �रि� �प ��र �ा �स�त�माल �र स�त� ह�। हर ब�रि� �� �ल� प�र��रिया �ा �स�त�माल �र स��सरशिप स� ब�ाता ह�, ��र �� ब�रि� �ाम ना �र� त� द�सर� ब�रि� �ा प�रय�� �र��। </string>
-
-    <string name="bridges_no">ब�रिड��स नह��: ��र स� स�धा ���ा ह��। </string>
-    <string name="bridges_provided">प�रदान �� �� ब�रिड��स: </string>
-    <string name="bridges_custom">�स��म ब�रि�</string>
-
-    <string name="bridges_config">ब�रि� ��न�फ़ि�र�शन</string>
-    <string name="action_done">सम�पन�न</string>
 
     <string name="bridges_sometimes">�भ�-�भ� �प�� Tor �� लि� ब�रि� �� �र�रत ह�</string>
     <string name="action_more">म��� �र बता�� </string>
@@ -16,19 +8,6 @@
     <string name="vpn_setup_sub">यह �प�� ��मनाम नह�� बना पा��ा, ल��िन �स� फायरव�ल �� माध�यम स� प�राप�त �रन� म�� मदद मिल���।</string>
     <string name="action_vpn_choose">�प�लि��शन ��नन�</string>
 
-    <string name="status_connected">�न�����ड </string>
-
-    <string name="loading_claim_1">हमारा विविध सम�दाय यह� ह� �� महान बनाता ह�!</string>
-    <string name="loading_claim_2">हर र�� ल�� Tor �ा �पय�� �रत� ह�� ता�ि व� मार����ि�� वि���ापन�� �� बाद स� ब���।</string>
-    <string name="loading_claim_3">�ब फ�सब�� �वर�द�ध ह� �ाता ह�, त� ल�� �पन� मित�र�� �र परिवार स� ��ड़न� �� लि� Tor �ा �पय�� �रत� ह��।</string>
-    <string name="loading_claim_4">�ार�य�र�ता �पन� राय �र �स�था�� �� म�फ�त म�� ��वि� �रन� �� लि� Tor �ा �पय�� �रत� ह��।</string>
-    <string name="loading_claim_5">ब�ल��र�स सामा�ि� स�धार �� �र ल���� �� र�ल� �रन� �� लि� Tor �ा �पय�� �रत� ह��।</string>
-    <string name="loading_claim_6">पत�र�ार�� �� व� �हानिय�� �� रिप�र�� �रन� �� लि� स�र��षित र�प स� �ा�� �रन� �� लि� Tor �ा �पय�� �रत� ह��।</string>
-    <string name="loading_claim_7">व�यावसायि� ल�� �पन� ��पन� �� रणन�तिय�� �� नि�� र�न� �� लि� Tor �ा �पय�� �रत� ह��</string>
-    <string name="loading_claim_8">�ार�य�र�ता �पन� न��र� ��न� �� डर �� बिना न�याय �� लि� लड़न� �� लि� Tor �ा �पय�� �रत� ह��।</string>
-
-    <string name="status_connecting">हम �प�� �न���� �र रह� ह��। \"=\" हम �प�� �न���� �र रह� ह��।</string>
-
     <string name="hello">नमस�त�</string>
     <string name="welcome">म�बा�ल पर ��र म�� �प�ा स�वा�त ह�। </string>
 
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 2e9fbd9d..857a0009 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -2,137 +2,47 @@
 <resources>
   <string name="app_name">�रब��</string>
   <string name="app_description">à¤?रबà¥?à¤?  à¤?ि à¤?नà¥?य à¤?à¥?षà¥?धा à¤?à¥? शà¤?à¥?ति पà¥?रदान à¤?धिà¤? सà¥?रà¤?à¥?षित रà¥?प सà¥? à¤?à¤?à¤?रनà¥?à¤? à¤?ा à¤?पयà¥?à¤? à¤?रनà¥? à¤?à¥? लिà¤? à¤?à¤? मà¥?à¤?à¥?त पà¥?रà¥?à¤?à¥?सà¥? app हà¥?। à¤?रबà¥?à¤? à¤?पनà¥? à¤?à¤?à¤?रनà¥?à¤? यातायात à¤?नà¥?à¤?à¥?रिपà¥?à¤? à¤?रनà¥? à¤?à¥? लिà¤? à¤?à¥? à¤?ा à¤?पयà¥?à¤? à¤?रता हà¥? à¤?र फिर दà¥?निया भर à¤?à¥? à¤?à¤?पà¥?यà¥?à¤?र à¤?à¥? à¤?à¤? शà¥?रà¥?à¤?à¤?ला à¤?à¥? माधà¥?यम सà¥? à¤?à¤?ल दà¥?वारा यह à¤?à¥?पाता हà¥?। à¤?à¥? मà¥?फà¥?त सà¥?फà¥?à¤?वà¥?यर à¤?र à¤?à¤? à¤?à¥?ला नà¥?à¤?वरà¥?à¤? मà¥?à¤? मदद à¤?रता हà¥? à¤?ि à¤?प नà¥?à¤?वरà¥?à¤? निà¤?रानà¥? à¤?ा à¤?à¤? रà¥?प हà¥? à¤?ि वà¥?यà¤?à¥?तिà¤?त सà¥?वतà¤
 ?त�रता �र ��पन�यता, ��पन�य व�यावसायि� �तिविधिय�� �र रिश�त�, �र रा��य स�र��षा यातायात विश�ल�षण �� र�प म�� �ाना �ाता ह� �� �िलाफ �� र��षा �� लि� धम�ाता ह�।</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">श�र� �र र��� त�र </string>
-  <string name="tor_proxy_service_process">त�र प�र���स� सर�विस </string>
-  <string name="status_starting_up">�रब�� श�र� ह� रहा ह�
+    <string name="status_starting_up">�रब�� श�र� ह� रहा ह�
 </string>
   <string name="status_activated">त�र न��वर�� स� ���ा </string>
   <string name="status_disabled">�रब�� निष���रिय ह�</string>
   <string name="status_shutting_down">त�र सर�विस ब�ध ह� रहा ह� </string>
   <string name="tor_process_starting">त�र ��ला��� श�र� ह� रहा ह� </string>
   <string name="tor_process_complete">प�र�ण</string>
-  <string name="tor_process_waiting">��त�़ार </string>
-  <string name="not_anonymous_yet">��तावन�: �प�ा यातायात �भ� त� ��मनाम नह�� ह�! �पन� �व�दन HTTP प�र���स� 127.0.0.1:8118 या SOCKS4A या SOCKS5 प�र���स� 127.0.0.1:9050 �ा �पय�� �रन� �� लि� ��न�फ़ि�र �र��</string>
-  <string name="menu_home">ह�म </string>
-  <string name="menu_browse">ब�रा��़</string>
-  <string name="menu_settings">स��ि���स</string>
+    <string name="menu_settings">स��ि���स</string>
   <string name="menu_log">यात�रा द�नि��</string>
-  <string name="menu_info">मदद</string>
-  <string name="menu_apps">�प�स...</string>
-  <string name="menu_start">प�रार�भ</string>
+    <string name="menu_start">प�रार�भ</string>
   <string name="menu_stop">विराम</string>
   <string name="menu_about">बार� म��</string>
-  <string name="menu_promo_apps">�प�ल���शन प�राप�त ���िय� </string>
-  <string name="main_layout_download">डा�नल�ड</string>
+    <string name="main_layout_download">डा�नल�ड</string>
   <string name="main_layout_upload">�पल�ड</string>
-  <string name="button_help">मदद</string>
-  <string name="button_close">ब�द  �र�� </string>
-  <string name="button_about">बार� म��</string>
-  <string name="button_clear_log">यात�रा द�नि�� साह �र� </string>
-  <string name="menu_verify">���</string>
-  <string name="menu_exit">नि�ास</string>
+    <string name="button_about">बार� म��</string>
+    <string name="menu_exit">नि�ास</string>
   <string name="menu_scan">स���न ब�रि� ��य��र</string>
   <string name="menu_share_bridge">श�यर ब�रि� QR</string>
-  <string name="press_to_start">ल�ब� प�र�स श�र� �रन� �� लि�</string>
-  <string name="pref_trans_proxy_group">पारदर�श� प�र���स� (र�� �� �वश�य�ता ह�)</string>
-  <string name="pref_trans_proxy_title">पारदर�श� प�र���स�</string>
-  <string name="pref_trans_proxy_summary">���म��ि� ��र�रिफ�यि�� �� �प�लि��शन�स </string>
-  <string name="pref_transparent_all_title">सब��� त�र �� माध�यम स� </string>
-  <string name="pref_transparent_all_summary">त�र �� माध�यम स� सभ� �प�लि��शन�स  �� लि� प�र���स� ��र�फि� </string>
-  <string name="pref_transparent_port_fallback_title">प�र�� प�र���स� निवर�तन</string>
-  <string name="pref_transparent_port_fallback_summary">��तावन�: �म ब�दर�ाह�� (80, 443, �दि) म�� �तिर�ध �त�पन�न। * �पय�� ��वल * यदि \'सभ�\' या \'�प\' म�ड �ाम नह�� �रता।</string>
-  <string name="pref_transparent_port_title">प�र�� स���</string>
-  <string name="pref_transparent_port_summary">प�र���स� �� लि� ब�दर�ाह�� �� स���। * �पय�� ��वल * यदि \'सभ�\' या \'�प\' म�ड म�� �ाम नह�� �रता</string>
-  <string name="pref_transparent_port_dialog">प�र���स� �� लि� ब�दर�ाह�� दर��</string>
-  <string name="pref_has_root">र�� ���स�स �ा निव�धन </string>
-  <string name="pref_has_root_summary">र�� ���स�स �ा निव�धन ��रा�सप�र��� प�र��यि�� �� लि� </string>
-  <string name="status_install_success">त�र बिनार�स सफलता प�र�व� स�थापित ह�� </string>
-  <string name="status_install_fail">�� बा�नर� फ़ा�ल�� स�थापित �रन� म�� �समर�थ थ�। ल�� �� �ा�� �र tor-assistants@xxxxxxxxxxxxxx स��ित �र��</string>
-  <string name="title_error">�न�प�रय�� त�र��ि</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">�रब�� बार� म��</string>
-  <string name="btn_next">��ला</string>
-  <string name="btn_back">वापस</string>
-  <string name="btn_finish">समाप�त</string>
-  <string name="btn_okay">ठ�� ह�</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">�न�मति प�रदान �� ��</string>
-  <string name="wizard_permissions_stock">�रब�� �� �न�मति </string>
-  <string name="wizard_premissions_msg_root">�ति �त���ष��! हमन� पाया ह� �ि �प र�� �न�मतिय�� Orbot �� लि� स��षम ह�। हम �स श��ति ब�द�धिमान� �ा �पय�� �र��ा।</string>
-  <string name="wizard_permissions_msg_stock">�पन� डिवा�स र�� �ा �पय�� �िया ह�, �ब�ि यह �वश�य� नह�� ह�, Orbot �� �धि� श��तिशाल� �प�रण बन स�ता ह�। Orbot महाश��तिय�� �� �न�दान �� लि� न��� दि� �� ब�न �ा प�रय�� �र��!</string>
-  <string name="wizard_permissions_no_root">�प र�� �ा �पय�� नह�� ह�, त� या ��� पता नह�� हम �िस बार� म�� बात �र रह� ह��, बस Orbot �� साथ �ाम �रन� �� लि� बनाया ��ष�धा �ा �पय�� �रन� �� लि� स�निश��ित ह�।</string>
-  <string name="wizard_permissions_consent">म�� सम�ता ह�� �र स�परय��र �� बिना �ार� र�ना �ाहत� ह��</string>
-  <string name="wizard_permission_enable_root">�रब�� �� लि� र�� �न�दान</string>
-  <string name="wizard_configure">��न�फ़ि�र ��रिफि��शन </string>
-  <string name="wizard_configure_msg">�रब�� �प व�य��ति�त र�प स� �पन� �व�दन ��नन� �� लि� �� या �� माध�यम स� सभ� �व�दन यातायात मार�� �ा वि�ल�प द�ता ह�।</string>
-  <string name="wizard_configure_all">सभ� �प�ल���शन त�र �� माध�यम स� प�र���स� ���िय��ा </string>
-  <string name="wizard_configure_select_apps">त�र  �� लि� व�य��ति�त ��ष�धा �ा �यन �र��</string>
-  <string name="wizard_tips_tricks">�र�ब��-स��षम �प�स</string>
-  <string name="wizard_tips_msg">न��� ��ष�धा Orbot �� साथ �ाम �रन� �� लि� वि�सित �ि� ��। �ब स�थापित �रन� �� लि� प�रत�य�� ब�न पर ��लि� �र��, या �प �न�ह�� मिल स�ता ह� बाद म�� ���ल पर GuardianProject.info व�बसा�� पर या F-Droid.org �� माध�यम स�, ��लत� ह��।</string>
-  <string name="wizard_tips_otrchat">�ा� सि��य�र - ��ड�रा�ड  �� लि� स�र��षित त�वरित स�द�श ��ला���</string>
-  <string name="wizard_tips_proxy">प�र���स� स��ि���स - �र�ब�� �� साथ �ाम �रन� �� लि� �प �� ��न�फ़ि�र �रन� �ा तर��ा �ान��</string>
-  <string name="wizard_tips_duckgo">ड�ड���� ��� ���न �प</string>
-  <string name="wizard_tips_twitter">\"ल��लह�स��\" �र प�र�� 8118 ह�स�� �रन� �� लि� ��वि�र प�र���स� स�� �र��</string>
-  <string name="wizard_tips_story_maker">स���र�म��र - �� �हान� बना�� �र स�र��षा �� लि� �स� ��ड़ द��!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">प�र���स� स�����</string>
-  <string name="wizard_proxy_help_msg">à¤?प à¤?à¤? HTTP या सà¥?à¤?à¥?स पà¥?रà¥?à¤?à¥?सà¥? à¤?ा à¤?पयà¥?à¤? à¤?र सà¤?तà¥? हà¥?à¤? समरà¥?थन à¤?ा à¤?पयà¥?à¤? à¤?र रहà¥? à¤?à¤?डà¥?रà¥?यड à¤?पà¥?लिà¤?à¥?शन, तà¥? à¤?प à¤?à¥?नà¥?फ़िà¤?र à¤?र सà¤?तà¥? हà¥?à¤?, तà¥? यह Orbot सà¥? à¤?नà¥?à¤?à¥?à¤? à¤?रनà¥? à¤?र à¤?à¥? à¤?ा à¤?पयà¥?à¤? à¤?रà¥?à¤?। मà¥?à¤?बान सà¥?à¤?िà¤?à¤?à¥?स 127.0.0.1 या \"सà¥?थानà¥?य हà¥?सà¥?à¤?\" हà¥?। HTTP à¤?à¥? लिà¤?, पà¥?रà¥?à¤? सà¥?à¤?िà¤?à¤? 8118. मà¥?à¤?à¥? à¤?à¥? लिà¤? हà¥?, पà¥?रà¥?à¤?à¥?सà¥? 9050. à¤?प SOCKS4A या SOCKS5 à¤?ा à¤?पयà¥?à¤? à¤?रना à¤?ाहिà¤?, तà¥? सà¤?भव हà¥?। http://tinyurl.com/proxyandroid\n: à¤?प पर पà¥?à¤?à¥? à¤?ानà¥? वालà¥? पà¥?रशà¥?न à¤?à¥? माधà¥?यम सà¥? Android पर पà¥?रà¥?à¤?à¥?सà¥? à¤
 ?� बार� म�� �धि� स�� स�त� ह��</string>
-  <string name="wizard_final">�र�ब�� त�यार ह�!</string>
-  <string name="wizard_final_msg">द�निया भर �� ला��� ल���� �� �ारण�� �� �� विस�त�त विविधता �� लि� �� �ा �पय�� �र��। पत�र�ार�� �र ब�ल��र�स, मानव �धि�ार�� �� र��ष�, �ान�न प�रवर�तन �धि�ारिय��, स�नि���, नि�म��, दमन�ार� सर�ार�� �� ना�रि���, �र सिर�फ �म ना�रि��� ... �र �ब �प �� र�प म�� ����� तरह स� �रन� �� लि� त�यार �र रह� ह��!</string>
-  <string name="wizard_exit_at_first_screen_toast">�सस� पहल� �ि �प �स�ा �पय�� �रना श�र� �र स���, ��पया �र�ब�� �� ��न�फ़ि�र �र��!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">�प सफलताप�र�व� �� न��वर�� स� ��ड़ा ह� - ल��िन �स�ा मतलब यह नह�� �पन� डिवा�स स�र��षित ह�। �प �पन� �न���शन �ा पर���षण �रन� �� लि� \'ब�रा��र\' ब�न �ा �पय�� �र स�त� ह��। https://guardianproject.info/apps/orbot हम पर �ा�� या �धि� �ानन� �� लि� help@xxxxxxxxxxxxxxxxxxxx �रन� �� लि� �� �म�ल भ����।</string>
-  <string name="tor_check">�स ��रम म�� https://check.torproject.org �� लि� �पन� व�ब ब�रा��़र ��ल �ा��ा द��न� �� लि� ��र Orbot शायद विन�यस�त �िया �ाता ह� �र �प �� स� ��ड़� ह��।</string>
-  <string name="pref_hs_group">�िप� ह�� ह�स��ि�� स�वा</string>
-  <string name="pref_general_group">समन�य </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-->
-  <string name="wizard_title_msg">Orbot Android �� लि� �� लाता ह�! �� �प साम��र� �� �ानन�, यातायात विश�ल�षण �र न��वर�� नि�रान� �ि ��पन�यता, ��पन�य �ान�ार� �र व�य��ति�त स�ब�ध�� �ा �तरा ह� �� �िलाफ �� र��षा म�� मदद �रता ह�। यह वि�़ार�ड �प Orbot �र �� ��न�फ़ि�र �पन� डिवा�स पर मदद मिल���.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">��तावन�</string>
-  <string name="wizard_warning_msg">स�ध� शब�द�� म�� स�थापित Orbot स�व�ालित र�प स� �पन� म�बा�ल यातायात �नाम नह�� ह����। �प ठ�� स� सफलताप�र�व� �� �ा �पय�� �रन� �� Orbot, �प�� डिवा�स �र �न�य ��ष�धा ��न�फ़ि�र �रना ह��ा।</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">�न�मतिया�</string>
-  <string name="wizard_permissions_root_msg1">�प व��ल�पि� र�प स� �न�नत स�विधा�� �� स��षम �रन� �� लि� �रब�त \'स�परय��र\'  पह��� प�रदान �र स�त� ह��, ��स� पारदर�श� प�र���स�ि��</string>
-  <string name="wizard_permissions_root_msg2">यदि �प �सा नह�� �रना �ाहत� ह��, त� ��पया �रब�त �� साथ �ाम �रन� �� लि� बना� �� �प�स �ा �पय�� �रना स�निश��ित �र��</string>
-  <string name="wizard_permissions_no_root_msg">�प�ा डिवा�स �ड़�� या र�� या \'स�पर य��़र\' ���स�स प�रदान नह�� �रता ह�। \ N \ n ��पया �स�� ब�ाय म���य स���र�न पर \'�प\' म�ड �� ��़मा��।</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">�र�ब��-स��षम �प�स</string>
-  <string name="wizard_tips_gibberbot">�ा� सि��य�र: �फ-द-रि��र�ड �न���रिप�शन �� साथ स�र��षित ��� �प</string>
-  <string name="wizard_tips_orweb">�रफ���स : ��पन�यता-बढ़ाया ब�रा��़र �� त�र  �� माध�यम स� �ाम �रता ह�</string>
-  <string name="wizard_tips_play">���ल प�ल� पर सभ� �ार��ियन प�र������ �प�स �����</string>
-  <string name="wizard_tips_fdroid">फ-ड�र��ड पर सभ� �ार��ियन प�र������ �प�स �����</string>
-  <string name="wizard_tips_fdroid_org">सभ� �भिभाव� परिय��ना �प�स https://f-droid.org पर �����</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">पारदर�श� प�र���स�</string>
-  <string name="wizard_transproxy_msg">यह �प�� �प�स �� �िस� भ� ��न�फ़ि�र�शन �� बिना स�व�ालित र�प स� �� न��वर�� �� माध�यम स� �लान� �� �न�मति द�ता ह�।</string>
-  <string name="wizard_transproxy_hint">(यदि �प�� पता नह�� ह� �ि हम �िस बार� म�� बात �र रह� ह�� त� �स ब���स �� ��� �र��)</string>
-  <string name="wizard_transproxy_none">��� नह��</string>
-  <string name="pref_transparent_tethering_title">��र �िथरि��</string>
-  <string name="pref_transparent_tethering_summary">वा�फ़ा� �र य��सब� ��दरड डिवा�स �� लि� �� पारदर�श� प�र���स�ि�� स��षम �र�� (प�नरार�भ �� �वश�य�ता ह�)</string>
-  <string name="button_grant_superuser">स�परय��र ���स�स �ा �न�र�ध �र��</string>
-  <string name="pref_select_apps">�प�स ��न��</string>
-  <string name="pref_select_apps_summary">त�र �� माध�यम स� र�� �रन� �� लि� �प�स ��न��</string>
-  <string name="pref_node_configuration">न�ड ��न�फ़ि�र�शन</string>
+    <!--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="button_proxy_all">प�र���स� सब</string>
-  <string name="button_proxy_none">प�र���स� ��� नह��</string>
-  <string name="button_invert_selection">�यन �� �ल��ा �र��</string>
-  <string name="pref_proxy_title">���बा��ड न��वर�� प�र���स� (व��ल�पि�)</string>
+    <string name="pref_proxy_title">���बा��ड न��वर�� प�र���स� (व��ल�पि�)</string>
   <string name="pref_proxy_type_title">���बा��ड प�र���स� प�र�ार</string>
   <string name="pref_proxy_type_summary">प�र���स� सर�वर �� लि� �पय�� प�र�����ल: ������प�, हत�तप�, स���स४ , स����५</string>
   <string name="pref_proxy_type_dialog">प�र���स� प�र�ार दर�� �र��</string>
@@ -148,20 +58,8 @@
   <string name="pref_proxy_password_title">���बा��ड प�र���स� पासवर�ड</string>
   <string name="pref_proxy_password_summary">प�र���स� पासवर�ड (व��ल�पि�)</string>
   <string name="pref_proxy_password_dialog">प�र�ण पारदर�श� प�र��स�य�� स�� �रना ...</string>
-  <string name="status">स�थिति</string>
-  <string name="setting_up_full_transparent_proxying_">प�र�ण पारदर�श� प�र���स�ि�� स�� �रना ...</string>
-  <string name="setting_up_app_based_transparent_proxying_">�प-�धारित पारदर�श� प�र���स�ि�� स�� �रना ...</string>
-  <string name="transparent_proxying_enabled">पारदर�श� प�र���स�ि�� स��षम</string>
-  <string name="transproxy_enabled_for_tethering_">��रा�सप�र���स� �िथरि�� �� लि� स��षम!</string>
-  <string name="warning_error_starting_transparent_proxying_">��तावन�: पारदर�श� प�र���स�ि�� श�र� �रन� म�� त�र��ि!</string>
-  <string name="transproxy_rules_cleared">��रा�सप�र���स� नियम�� �� म���र� द� द�</string>
-  <string name="couldn_t_start_tor_process_">त�र प�र��रिया श�र� नह�� �िया �ा स�ा:</string>
-  <string name="privoxy_is_running_on_port_">प�ल�प� प�र�� पर �ल रहा ह�:</string>
-  <string name="setting_up_port_based_transparent_proxying_">प�र��-�धारित पारदर�श� प�र���स�ि�� स�� �रना ...</string>
-  <string name="bridge_error">ब�रि� त�र��ि</string>
-  <string name="bridge_requires_ip">प�ल स�विधा �ा �पय�� �रन� �� लि�, �प�� �म स� �म �� प�ल ��प� पता दर�� �रना ह��ा।</string>
-  <string name="send_email_for_bridges">��म�ल ��ा��� स� म�ल �� शर�र म�� स�वय� द�वारा \"ब�रि� �� प�राप�त �र��\" ला�न �� साथ bridges@xxxxxxxxxxxxxx �� �� �म�ल भ����</string>
-  <string name="error">त�र��ि</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>
@@ -174,10 +72,8 @@
   <string name="use_only_these_specified_nodes">* ��वल * �न निर�दिष�� न�ड�स �ा �पय�� �र��</string>
   <string name="bridges">प�ल</string>
   <string name="use_bridges">प�ल �ा �पय�� �र��</string>
-  <string name="bridges_obfuscated">�स�पष�� प�ल��</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">��र� न��वर�� म�� व��ल�पि� प�रव�श द�वार स��षम �र��</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">यदि ��न�फ़ि�र �ि� �� प�ल�� �� प�ल�� �� ढ��ा ह�� ह� त� स��षम �र��</string>
-  <string name="ip_address_and_port_of_bridges">��प� पता �र प�ल �ा ब�दर�ाह</string>
+    <string name="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>
@@ -193,17 +89,10 @@
   <string name="reachable_ports">पह��� य���य ब�दर�ाह</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">प�रतिब�धात�म� फ़ायरव�ल �� प��� ब�दर�ाह त� पह��� य���य</string>
   <string name="enter_ports">ब�दर�ाह�� �� दर�� �र��</string>
-  <string name="enable_hidden_services">�िप� ह�� ह�स��ि�� स�वा</string>
-  <string name="run_servers_accessible_via_the_tor_network">�न-डिवा�स सर�वर �� �� न��वर�� �� माध�यम स� ���स�स �रन� �� �न�मति द��</string>
-  <string name="enter_localhost_ports_for_hidden_services">�िप� स�वा�� �� लि� स�थान�यह�स�� ब�दर�ाह�� �� दर�� �र��</string>
-  <string name="hidden_service_ports">��प� ह�� स�वा ब�दर�ाह</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">�प�� �िप� ह�� स�वा �� लि� स�ब�धित नाम (स�व�ालित र�प स� ��नर�� �िया �या)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ड�ब� ल�� ���प�� �� स��षम �र�� (द��न� �� लि� �ड�ब� या ������� �ा �पय�� �रना �ाहि�)</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="the_tor_license">त�र ला�स��स</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">त�त�य-प��ष-स�फ़��व�यर:</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>
@@ -212,37 +101,18 @@
   <string name="hidden_service_request">�� �प Tor न��वर�� पर %1$s�िपा सर�वर प�र�� ��लना �ाहता ह�। यदि �प �प पर विश�वास �रत� ह��, त� यह स�र��षित ह�</string>
   <string name="found_existing_tor_process">म���दा त�र प�र��रिया पाया ...</string>
   <string name="something_bad_happened">��� ब�रा ह� �या। ल�� �� �ा�� �र��</string>
-  <string name="hidden_service_on">पर ��पा स�वा:</string>
-  <string name="unable_to_read_hidden_service_name">�िप� ह�� स�वा �ा नाम पढ़न� म�� �समर�थ</string>
+    <string name="unable_to_read_hidden_service_name">�िप� ह�� स�वा �ा नाम पढ़न� म�� �समर�थ</string>
   <string name="unable_to_start_tor">�� श�र� �रन� म�� �समर�थ:</string>
-  <string name="unable_to_reset_tor">�पन� डिवा�स �� र�ब�� �र��, �� �� र�स�� �रन� म�� �समर�थ!</string>
-  <string name="pref_use_sys_iptables_title">डिफ़�ल�� �प��ाबल�स �ा �पय�� �र��</string>
-  <string name="pref_use_sys_iptables_summary">�रब�त �� साथ ब�डल �� ब�ाय ��तर�निहित iptables बा�नर� �ा �पय�� �र��</string>
-  <string name="error_installing_binares">��र बायन�रि�़ स�थापित या �प��र�ड �रन� म�� स��षम नह�� थ�।</string>
-  <string name="pref_use_persistent_notifications">�रब�� �न���� ह�न� पर ��लबार म�� हम�शा ���न र���</string>
+    <string name="pref_use_persistent_notifications">�रब�� �न���� ह�न� पर ��लबार म�� हम�शा ���न र���</string>
   <string name="pref_use_persistent_notifications_title">हम�शा �� स��ना��</string>
   <string name="pref_use_expanded_notifications">त�र ����ि� द�श �र ��प� �� साथ विस�तारित स��ना दि�ा��</string>
   <string name="pref_use_expanded_notifications_title">विस�तारित स��ना��</string>
-  <string name="notification_using_bridges">प�ल स��षम!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">भाषा</string>
-  <string name="set_locale_summary">�रब�� �� लि� ल���ल �र भाषा ��न��</string>
-  <string name="wizard_locale_title">भाषा ��न��</string>
-  <string name="wizard_locale_msg">डिफ़�ल�� ��ड़�� या वर�तमान भाषा �� स�वि� �र��</string>
-  <string name="powered_by">त�र द�वारा स��ालित</string>
-  <string name="btn_save_settings">समाय��न ब�ा�</string>
-  <string name="no_internet_connection_tor">��� ���रन�� �न���शन नह��; त�र स����डबाय पर ह� ...</string>
-  <string name="bandwidth_">ब��डविड�थ:</string>
-  <string name="down">न���</string>
-  <string name="up">�प</string>
-  <string name="pref_disable_network_title">��� न��वर�� ���-स�ल�प नह��</string>
+    <string name="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="menu_verify_browser">ब�रा��़र</string>
-  <string name="menu_use_chatsecure">�ा�सि��य�र �ा �पय�� �र��</string>
-  <string name="permission_manage_tor_label">त�र प�रब�धित �र��</string>
-  <string name="permission_manage_tor_description">त�र स�वा �� निय�त�रित �रन� �� लि� �स �प �� स��षम �र��</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot Orfox ब�रा��़र �� साथ सबस� ����ा �ाम �रता ह� �भ� स�थापित �र��?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot Orfox ब�रा��़र �� साथ सबस� ����ा �ाम �रता ह� �भ� स�थापित �र��?</string>
   <string name="install_apps_">ब�रा��़र ��स���ल �र��?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">��� न��वर�� �न����िवि�� नह�� �� �� स�न� �� लि� डालना ...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">न��वर�� �न����िवि�� ����ा ह� �ा�� ��र �प ...</string>
@@ -259,19 +129,7 @@
   <string name="pref_torrc_title">��रर� �स��म ��न�फ़ि�</string>
   <string name="pref_torrc_summary">��वल विश�ष���: प�रत�य��ष ��र�� ��न�फ़ि� ला�न�� दर�� �र��</string>
   <string name="pref_torrc_dialog">�स��म ��रर�</string>
-  <string name="wizard_tips_martus">म�बा�ल मार��स - ब�न�� ह�य�मन रा���स प�रल��न �प</string>
-  <string name="your_tor_public_ips_">�प�ा �� सार�व�नि� ��प�:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">��पया ��ड�र��ड म�� �स �प �� ���षम �र��-&gt; स��ि���स- &amp; gt; यदि �प�� �र�ब�� �� साथ समस�या � रह� ह�:</string>
-  <string name="app_conflict">�प स��र�ष</string>
-  <string name="pref_transproxy_refresh_title">��रा�सप�र��स� ���-रिफ�र�श</string>
-  <string name="pref_transproxy_refresh_summary">��रा�स�प���सि नियम�� �� फिर स� ला�� �र�� �ब न��वर�� स�थिति बदलत� ह�</string>
-  <string name="pref_transproxy_flush_title">��रा�सप�र��स� फ�र�स �� ह�ान�</string>
-  <string name="pref_transproxy_flush_summary">�ब सभ� ��रा�स���सस� न��वर�� नियम�� �� फ�लश �रन� �� लि� यहा� ��प �र��</string>
-  <string name="transparent_proxy_rules_flushed_">पारदर�श� प�र���स� नियम प�लावित!</string>
-  <string name="you_do_not_have_root_access_enabled">�प र�� �ा �पय�� स��षम नह�� ह�</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">त�म ब�द �र� �र Orbot श�र� �रन� �� लि� स��ि���स स��षम ह�न� �� लि� बदलन� �� लि� �वश�य�ता ह� स�त� ह�।</string>
-  <string name="menu_vpn">�प�लि��शन</string>
-  <string name="kbps">��ब�प��स</string>
+    <string name="kbps">��ब�प��स</string>
   <string name="mbps">�मब�प��स</string>
   <string name="kb">�ब</string>
   <string name="mb">मब </string>
@@ -284,19 +142,15 @@
   <string name="get_bridges_web">व�ब</string>
   <string name="activate">स��रिय</string>
   <string name="apps_mode">व�प��न म�ड</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">�प बिल��-�न �र�ब�� व�प��न �ा प�रय�� �र�� ��स स� �ान� �� लि� �प�स �� स��षम �र स�त� ह��। \ N \ n यह �प�� ��मनाम नह�� �र��ा, ल��िन यह फायरव�ल �� माध�यम स� प�राप�त �रन� म�� मदद �र��ा।</string>
-  <string name="send_email">�म�ल भ����</string>
+    <string name="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="install_orweb">�रफ���स �� �नस���ल �र� </string>
-  <string name="standard_browser">मान� ब�रा��़र</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">��तावन� : त�र ��वल ����ल x86 या ��म �प�रण �� �पर �ाम �रता ह��</string>
-  <string name="vpn_default_world">��ल�बल (���)</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="ports">प�र���स</string>
-  <string name="local_port">स�थान�य प�र��</string>
+    <string name="local_port">स�थान�य प�र��</string>
   <string name="onion_port">�नियन प�र��</string>
   <string name="name">नाम</string>
   <string name="done">�िया ह��!</string>
@@ -309,9 +163,7 @@
   <string name="backup_restored">ब���प �� प�नर�स�थापित �िया �या</string>
   <string name="filemanager_not_available">फा�लम�न��र �पलब�ध नह�� ह�</string>
   <string name="please_grant_permissions_for_external_storage">��पया बाहर� स���रहण �� लि� �न�मति द��</string>
-  <string name="permission_granted">�न�मति प�रदान �� ��</string>
-  <string name="permission_denied">�न�मति नह�� मिल�</string>
-  <string name="restore_backup">ब���प बहाल</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>
@@ -344,10 +196,8 @@
   <string name="pref_connection_padding_summary">��र�फि� विश�ल�षण �� ��� र�प�� स� ब�ाव �� लि� हम�शा �न���शन प�डि�� स��षम �रता ह�। डिफ़�ल��: ���</string>
   <string name="pref_reduced_connection_padding">�म �न���शन प�डि��</string>
   <string name="pref_reduced_connection_padding_summary">�ल�द ह� रिल� �न���शन ब�द �र द�ता ह� �र ड��ा �र ब��र� �पय�� �� �म �रन� �� लि� �म प�डि�� प���� भ��ता ह�</string>
-  <string name="please_enable_vpn">��पया �� �� �पय�� �� लि� �प�स �� स��षम �रन� �� लि� व�प��न म�ड स��रिय �र��</string>
-  <string name="app_shortcuts">Tor-स��षम �प�स</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Tor स� ब�रि� �न���शन �ा पर���षण ....</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>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 717ae740..ab067581 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">Polazno</string>
-  <string name="menu_browse">Pretraži</string>
-  <string name="menu_settings">Postavke</string>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="menu_about">O</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zatvori</string>
-  <string name="button_about">O</string>
+    <string name="menu_settings">Postavke</string>
+    <string name="menu_about">O</string>
+    <string name="button_about">O</string>
   <string name="menu_exit">Izlaz</string>
-  <string name="btn_back">Povratak</string>
-  <string name="btn_cancel">Odustani</string>
+    <string name="btn_cancel">Odustani</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Postavke Proxya</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">OpÄ?enito</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Upozorenje</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Nepoznato</string>
-  <string name="status">Status</string>
-  <string name="error">Greška</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Spremi postavke</string>
+    <string name="error">Greška</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 9a7b63cc..e9869516 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -2,123 +2,37 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot je besplatna proxy aplikacija koja omoguÄ?uje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju VaÅ¡eg Internet prometa, a zatim ga skriva Å¡aljuÄ?i ga kroz seriju raÄ?unala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">pokreni i zaustavi Tor</string>
-  <string name="tor_proxy_service_process">torproxyusluga</string>
   <string name="status_starting_up">Orbot se pokreÄ?e...</string>
   <string name="status_activated">Spojen na Tor mrežu</string>
   <string name="status_disabled">Orbot je deaktiviran</string>
   <string name="status_shutting_down">TorService se gasi</string>
   <string name="tor_process_starting">PokreÄ?em Tor klijent...</string>
   <string name="tor_process_complete">gotovo.</string>
-  <string name="tor_process_waiting">Ä?ekam.</string>
-  <string name="not_anonymous_yet">UPOZORENJE: Vaš promet još nije anoniman! Molimo konfigurirajte Vaše aplikacije da koriste HTTP proxy 127.0.0.1:8118 ili SOCKS4A ili SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Polazno</string>
-  <string name="menu_browse">Pretraži</string>
   <string name="menu_settings">Postavke</string>
   <string name="menu_log">Dnevnik</string>
-  <string name="menu_info">PomoÄ?</string>
   <string name="menu_start">PoÄ?etak</string>
   <string name="menu_stop">Zaustavi</string>
   <string name="menu_about">O</string>
-  <string name="menu_promo_apps">Dohvati aplikacije...</string>
   <string name="main_layout_download">Preuzimanje</string>
   <string name="main_layout_upload">Slanje</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zatvori</string>
   <string name="button_about">O</string>
-  <string name="button_clear_log">OÄ?isti Dnevnik</string>
-  <string name="menu_verify">Provjeri</string>
   <string name="menu_exit">Izlaz</string>
   <string name="menu_scan">Skeniraj BridgeQR</string>
   <string name="menu_share_bridge">Podijeli BridgeQR</string>
-  <string name="press_to_start">- dugi klik za poÄ?etak -</string>
-  <string name="pref_trans_proxy_group">Transparentni Proxy (Zahtijeva Root)</string>
-  <string name="pref_trans_proxy_title">Transparentni Proxy</string>
-  <string name="pref_trans_proxy_summary">Automatska Torifikacija Aplikacija</string>
-  <string name="pref_transparent_all_title">Tor Sve</string>
-  <string name="pref_transparent_all_summary">Proxy promet svih aplikacija kroz Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Rezerva</string>
-  <string name="pref_transparent_port_fallback_summary">UPOZORENJE: Zaobilazi uobiÄ?ajene portove (80, 443, itd.) *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi.</string>
-  <string name="pref_transparent_port_title">Popis portova</string>
-  <string name="pref_transparent_port_summary">Popis portova za proxy. *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi</string>
-  <string name="pref_transparent_port_dialog">Unesite port za proxy</string>
-  <string name="pref_has_root">Zatraži Root Pristup</string>
-  <string name="pref_has_root_summary">Zatraži root pristup za transparentni proxy</string>
-  <string name="status_install_success">Tor izvršne datoteke uspješno instalirane!</string>
-  <string name="status_install_fail">Tor izvrÅ¡ne datoteke nije bilo moguÄ?e instalirati. Molimo provjerite dnevnik i obavijestite tor-assistans@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Greška u Aplikaciji</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O Orbot-u</string>
-  <string name="btn_next">SljedeÄ?e</string>
-  <string name="btn_back">Natrag</string>
-  <string name="btn_finish">Završi</string>
   <string name="btn_okay">U redu</string>
   <string name="btn_cancel">Odustani</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Detalji o Orbot-u</string>
-  <string name="wizard_permissions_root">Dopuštenje Odobreno</string>
-  <string name="wizard_permissions_stock">Orbot Dopuštenja</string>
-  <string name="wizard_premissions_msg_root">OdliÄ?no! UoÄ?ili smo da imate root dopuÅ¡tenja omoguÄ?ena za Orbot. Koristit Ä?emo ovu moÄ? mudro.</string>
-  <string name="wizard_permissions_msg_stock">Iako nije neophodan, Orbot može postati moÄ?an alat ako vaÅ¡ ureÄ?aj ima root pristup. Koristite gumb niže da bi odobrili Orbot-u supermoÄ?i!</string>
-  <string name="wizard_permissions_no_root">Ako nemate root pristup ili nemate pojma o Ä?emu priÄ?amo, osigurajte da koristite aplikacije koje rade s Orbot-om.</string>
-  <string name="wizard_permissions_consent">Razumijem i želim nastaviti bez Superuser-a</string>
-  <string name="wizard_permission_enable_root">Odobri Root za Orbot</string>
-  <string name="wizard_configure">Konfiguriraj Torifikaciju</string>
-  <string name="wizard_configure_msg">Orbot Vam daje opciju da usmjerite sav aplikacijski promet kroz Tor ILI odaberete aplikacije individualno.</string>
-  <string name="wizard_configure_all">Proxy Sve Aplikacije Kroz Tor</string>
-  <string name="wizard_configure_select_apps">Odaberi Individualne Aplikacije za Tor</string>
-  <string name="wizard_tips_tricks">Orbot-omoguÄ?ene Aplikacije</string>
-  <string name="wizard_tips_msg">Aplikacije dolje su napravljene da rade sa Orbot-om. Kliknite svaki gumb da instalirate odmah ili ih kasnije možete naÄ?i na Google Play-u, na GuardianProject.info web stranici ili preko F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Sigurni klijent instant poruka za Adnroid</string>
-  <string name="wizard_tips_proxy">Proxy Postavke - NauÄ?ite kako konfigurirati aplikacije za rad s Orbot-om</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo aplikacija za pretraživanje</string>
-  <string name="wizard_tips_twitter">Namjesti Twitter proxy na host \"localhost\" i port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - napravite priÄ?u i prepustite sigurnost Tor-u!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Postavke Proxy-a</string>
-  <string name="wizard_proxy_help_msg">Ako Android aplikacija koju koristite podržava koriÅ¡tenje HTTP ili SOCKS proxy-a, možete ju konfigurirati da se spaja na Orbot i koristi Tor.\n\n\n Postavke su 127.0.0.1 ili \"localhost\". Za HTTP postavke porta su 8118. Za SOCKS, proxy je 9050. Trebali bi koristiti SOCKS4A ili SOCKS5 ako je moguÄ?e.\n\n\n Možete nauÄ?iti viÅ¡e o proxy-ranju na Androidu putem Ä?esto postavljenih pitanja: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot je spreman!</string>
-  <string name="wizard_final_msg">Milijuni ljudi diljem svijeta koriste Tor iz raznih razloga.\n\nNovinari i blogeri, pravobranitelji, policijski službenici, vojnici, korporacije, graÄ?ani represivnih režima i uobiÄ?ajeni graÄ?ani... a od sad i Vi!</string>
-  <string name="wizard_exit_at_first_screen_toast">Molimo konfigurirajte Orbot prije nego ga poÄ?nete koristiti!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">UspjeÅ¡no ste spojeni na Tor mrežu - ali ovo NE znaÄ?i da je VaÅ¡ ureÄ?aj siguran. Možete koristiti gumb \'Preglednik\' kako bi testirali svoju vezu. \n\nPosjetite nas na https://guardianproject.info/apps/orbot ili nam poÅ¡aljite email na help@xxxxxxxxxxxxxxxxxxxx kako bi nauÄ?ili viÅ¡e.</string>
-  <string name="tor_check">Ovo Ä?e otvoriti VaÅ¡ web preglednik na https://check.torproject.org kako bi vidjeli je li Orbot konfiguriran i jeste li povezani na Tor.</string>
-  <string name="pref_hs_group">Hosting Skrivenih Usluga</string>
   <string name="pref_general_group">OpÄ?enito</string>
   <string name="pref_start_boot_title">Pokreni Orbot pri pokretanju</string>
   <string name="pref_start_boot_summary">Automatski pokreni Orbot i poveži Tor kad se Android ureÄ?aj pokrene</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot donosi Tor na Android!\n\nTor pomaže u borbi protiv filtriranja prometa, analize prometa i nadzora mreže koji ugrožava privatnost, povjerljive informacije i osobne veze.\n\nOvaj Ä?arobnjak Ä?e Vam pomoÄ?i u konfiguraciji Orbot-a i Tor-a na VaÅ¡em ureÄ?aju.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Upozorenje</string>
-  <string name="wizard_warning_msg">Samo instaliranje Orbot-a neÄ?e automatski anonimizirati VaÅ¡ mobilni promet.\n\nMorate ispravno konfigurirati Orbot, svoj ureÄ?aj i ostale aplikacije da uspjeÅ¡no koriste Tor.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Dopuštenja</string>
-  <string name="wizard_permissions_root_msg1">Opcionalno, možete odobriti Orbot-u \'Superuser\' pristup da bi omoguÄ?ili napredne znaÄ?ajke, kao Å¡to je Transparentni Proxy.</string>
-  <string name="wizard_permissions_root_msg2">Ako ne želite ovo, budite sigurni da koristite aplikacije koje su napravljene da rade s Orbotom</string>
-  <string name="wizard_permissions_no_root_msg">Ä?ini se da VaÅ¡ ureÄ?aj nije root-an.\n\nMolimo probajte \'Aplikacije\' naÄ?in rada na glavnom ekranu.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-OmoguÄ?ene Aplikacije</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Sigurna aplikacija za Ä?avrljanje s Povjerljivom Enkripcijom</string>
-  <string name="wizard_tips_orweb">Orfox: Preglednik s pojaÄ?anom privatnosti koji radi kroz Tor</string>
-  <string name="wizard_tips_play">PronaÄ?i sve Guardian Projekt aplikacije na Google Play</string>
-  <string name="wizard_tips_fdroid">PronaÄ?i sve Guardian Project aplikacije na F-Droid-u</string>
-  <string name="wizard_tips_fdroid_org">PronaÄ?i sve Guardian Project aplikacije na https://f-droid.org</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentni Proxy</string>
-  <string name="wizard_transproxy_msg">Ovo omoguÄ?ava VaÅ¡im aplikacijama da automatski rade kroz Tor mrežu bez ikakve konfiguracije.</string>
-  <string name="wizard_transproxy_hint">(Stavite kvaÄ?icu ako nemate pojma o Ä?emu priÄ?amo)</string>
-  <string name="wizard_transproxy_none">Ništa</string>
-  <string name="pref_transparent_tethering_title">Tor Privezanje</string>
-  <string name="pref_transparent_tethering_summary">OmoguÄ?i Tor Transparentni Proxy za Wifi i USB privezane ureÄ?aje (zahtijeva ponovno pokretanje)</string>
-  <string name="button_grant_superuser">Zatraži Pristup Superuser-u</string>
-  <string name="pref_select_apps">Odaberi Aplikacije</string>
-  <string name="pref_select_apps_summary">Odaberi Aplikacije koje Ä?e se usmjeriti kroz Tor</string>
   <string name="pref_node_configuration">Konfiguracija Ä?vora</string>
   <string name="pref_node_configuration_summary">Ovo su napredne postavke koje mogu smanjiti Vašu anonimnost</string>
   <string name="pref_entrance_node">Ulazni Ä?vorovi</string>
@@ -126,9 +40,6 @@
   <string name="pref_entrance_node_dialog">Unesi Ulazne Ä?vorove</string>
   <string name="pref_allow_background_starts_title">Dozvoli pokretanja u pozadini</string>
   <string name="pref_allow_background_starts_summary">Dopusti bilo kojoj aplikaciji da kaže Orbot-u da pokrene Tor i povezane usluge</string>
-  <string name="button_proxy_all">Proxy-raj sve</string>
-  <string name="button_proxy_none">Ne proxy-raj ništa</string>
-  <string name="button_invert_selection">Izokreni odabrano</string>
   <string name="pref_proxy_title">Izlazni Mrežni Proxy (Opcionalno)</string>
   <string name="pref_proxy_type_title">Vrsta Izlaznog Proxy-a</string>
   <string name="pref_proxy_type_summary">Protokol koji se koristi za proxy server: HTTP, HTTPS, Socks4, Socks5</string>
@@ -145,19 +56,7 @@
   <string name="pref_proxy_password_title">Proxy izlazna lozinka</string>
   <string name="pref_proxy_password_summary">Proxy lozinka (Opcionalno)</string>
   <string name="pref_proxy_password_dialog">Unesite Proxy lozinku</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Postavljam potpuno transparentan proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na aplikaciji...</string>
-  <string name="transparent_proxying_enabled">Transparentni Proxy OMOGUÄ?ENO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy omoguÄ?en za Privezivanje!</string>
-  <string name="warning_error_starting_transparent_proxying_">UPOZORENJE: greška pri pokretanju transparentnog proxy-a!</string>
-  <string name="transproxy_rules_cleared">TransProxy pravila oÄ?iÅ¡Ä?ena</string>
   <string name="couldn_t_start_tor_process_">Nije moguÄ?e zapoÄ?eti Tor proces:</string>
-  <string name="privoxy_is_running_on_port_">Polipo je pokrenut na portu:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na portu...</string>
-  <string name="bridge_error">Greška Mosta</string>
-  <string name="bridge_requires_ip">Da bi koristili mostove, morate unijeti bar jednu IP adresu mosta.</string>
-  <string name="send_email_for_bridges">PoÅ¡aljite email koristeÄ?i gmail raÄ?un na bridges@xxxxxxxxxxxxxx samo s tekstom \"get bridges\" u sadržaju.</string>
   <string name="error">Greška</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše ReachableAddresses postavke su uzrokovale iznimku!</string>
   <string name="your_relay_settings_caused_an_exception_">Vaše postavke releja su uzrokovale iznimku!</string>
@@ -171,8 +70,6 @@
   <string name="use_only_these_specified_nodes">Koristi *samo* ove navedene Ä?vorove</string>
   <string name="bridges">Mostovi</string>
   <string name="use_bridges">Koristi Mostove</string>
-  <string name="bridges_obfuscated">Skriveni Mostovi</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">OmoguÄ?ite ako su postavljeni mostovi skriveni mostovi</string>
   <string name="ip_address_and_port_of_bridges">IP adresa i port mostova</string>
   <string name="enter_bridge_addresses">Unesi Adrese Mostova</string>
   <string name="relays">Releji</string>
@@ -189,52 +86,26 @@
   <string name="reachable_ports">Dostupni portovi</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Portovi dostupni iza restriktivnog firewall-a</string>
   <string name="enter_ports">Unesi portove</string>
-  <string name="enable_hidden_services">Hosting Skrivenih Usluga</string>
-  <string name="run_servers_accessible_via_the_tor_network">dopusti poslužitelju na ureÄ?aju da bude dostupan preko Tor mreže</string>
-  <string name="enter_localhost_ports_for_hidden_services">unesi localhost portove za skrivene usluge</string>
-  <string name="hidden_service_ports">Portovi za skrivene usluge</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresirano ime za vašu skrivenu uslugu (generirano automatski)</string>
   <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">omoguÄ?i izlaznost dnevnika o otkrivanju greÅ¡ke (mora koristiti adb ili aLogCat za pregled)</string>
   <string name="project_home">Dom(ovi) Projekta:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor licenca</string>
-  <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">Software treÄ?e strane:</string>
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
   <string name="found_existing_tor_process">pronaÄ?eni postojeÄ?i Tor procesi...</string>
   <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-  <string name="hidden_service_on">skrivena usluga na:</string>
   <string name="unable_to_read_hidden_service_name">nije moguÄ?e proÄ?itati ime skrivene usluge</string>
   <string name="unable_to_start_tor">Nije moguÄ?e pokrenuti Tor:</string>
-  <string name="unable_to_reset_tor">Ponovno pokrenit svoj ureÄ?aj, nije moguÄ?e ponovno pkrenuti Tor!</string>
-  <string name="pref_use_sys_iptables_title">Koristi Zadane Iptablice</string>
-  <string name="pref_use_sys_iptables_summary">koristi ugraÄ?ene iptablice umjesto onih zapakiranih s Orbot-om</string>
-  <string name="error_installing_binares">Nije bilo moguÄ?e instalirati ili nadograditi Tor datoteke .</string>
   <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
   <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
   <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
   <string name="pref_use_expanded_notifications_title">Proširene obavijesti</string>
-  <string name="notification_using_bridges">Mostovi omoguÄ?eni!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">Jezik</string>
-  <string name="set_locale_summary">Odaberi lokaciju i jezik za Orbot</string>
-  <string name="wizard_locale_title">Odaberi Jezik</string>
-  <string name="wizard_locale_msg">Ostavi zadano ili promjeni na trenutni jezik</string>
-  <string name="powered_by">pogoni Tor</string>
-  <string name="btn_save_settings">Spremi postavke</string>
   <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">dolje</string>
-  <string name="up">gore</string>
   <string name="pref_disable_network_title">Nema mrežnog auto-spavanja</string>
   <string name="pref_disable_network_summary">Stavi Tor na spavanje kad internet nije dostupan</string>
   <string name="newnym">Prebacili ste se na nov Tor identitet!</string>
-  <string name="menu_verify_browser">Preglednik</string>
-  <string name="menu_use_chatsecure">Koristi ChatSecure</string>
-  <string name="permission_manage_tor_label">Upravljaj Tor-om</string>
-  <string name="permission_manage_tor_description">OmoguÄ?i ovoj palikaciji da upravlja Tor-om</string>
   <string name="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>
@@ -250,18 +121,6 @@
   <string name="pref_torrc_title">Torrc prilagoÄ?ena konfiguracija</string>
   <string name="pref_torrc_summary">SAMO ZA STRUÄ?NJAKE: unesite direktno torrc konfiguracijske linije</string>
   <string name="pref_torrc_dialog">PrilagoÄ?eni Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech aplikacija za dokumentaciju ljudskih prava</string>
-  <string name="your_tor_public_ips_">Vaši javni Tor IP-evi:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">OnemoguÄ?ite ovu palikaciju u Android-&gt;Postavke-&gt;Aplikacije ako imate problema s Orbot-om:</string>
-  <string name="app_conflict">Konflikt aplikacija</string>
-  <string name="pref_transproxy_refresh_title">Automatsko osvježavanje Transproxy-a</string>
-  <string name="pref_transproxy_refresh_summary">Ponovno primjeni Transproxy pravila kad se promjeni mrežno stanje</string>
-  <string name="pref_transproxy_flush_title">Transproxy PRISILNO UKLANJANJE</string>
-  <string name="pref_transproxy_flush_summary">Dotaknite ovdje da bi oÄ?istili sva transproxy mrežna pravila ODMAH</string>
-  <string name="transparent_proxy_rules_flushed_">Pravila transparentnog proxy-a oÄ?iÅ¡Ä?ena!</string>
-  <string name="you_do_not_have_root_access_enabled">Nema omoguÄ?en root pristup</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Možda Ä?e te morati zaustaviti i pokrenuti Orbot da bi se omoguÄ?ile promjenjene postavke.</string>
-  <string name="menu_vpn">Aplikacije</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
@@ -276,8 +135,6 @@
   <string name="send_email">Pošalji email</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Možete dobiti adrese mostova kroz email, web ili skeniranjem QR koda. Odaberite \'Email\' ili \'Web\' niže da zatražite adresu mosta.\n\nJednom kad imate adresu, kopirajte i zalijepite ju u \"Mostovi\" postavku Orbot-a i ponovno ga pokrenite.</string>
   <string name="install_orweb">Instaliraj Orfox</string>
-  <string name="standard_browser">Standardni preglendik</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NAPOMENA: samo standardni Tor mostovi rade na Intel X86/ATOM ureÄ?ajima</string>
   <string name="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>
diff --git a/app/src/main/res/values-hu/poestrings.xml b/app/src/main/res/values-hu/poestrings.xml
index 9e0bc2d3..07b12111 100644
--- a/app/src/main/res/values-hu/poestrings.xml
+++ b/app/src/main/res/values-hu/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"A Hidak Tor csomópontok, amelyek lehetÅ?vé teszik a cenzúra megkerülését. Megpróbálhatja a hidakat, ha Tor blokkolt az internet szolgáltató által; minden hídtípus más megoldást használ
-a cenzúra elkerülésére: ha egyik típus nem működik, próbáljon egy másikat.</string>
-
-    <string name="bridges_no">Nincs híd: Direkt csatlakozás a Tor-hoz</string>
-    <string name="bridges_provided">Biztosított Hidak:</string>
-    <string name="bridges_custom">Egyéni Hidak</string>
-
-    <string name="bridges_config">Híd konfiguráció</string>
-    <string name="action_done">Kész</string>
 
     <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>
@@ -17,19 +8,6 @@ a cenzúra elkerülésére: ha egyik típus nem működik, próbáljon egy mási
     <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="status_connected">Csatlakoztatva!</string>
-
-    <string name="loading_claim_1">A változatos közössége teszi a Tor-t naggyá!</string>
-    <string name="loading_claim_2">Hétköznapi emberek használják a Tor-t a reklámok követésének megakadályozására.</string>
-    <string name="loading_claim_3">Ha a Facebook blokkolt, akkor az emberek a Tort használják családjuk barátaik elérésére.</string>
-    <string name="loading_claim_4">Aktivisták használják a Tort véleményük, hitük megosztására.</string>
-    <string name="loading_claim_5">Bloggerek használják a Tor-t emberek mozgósítására a szociális reformokért.</string>
-    <string name="loading_claim_6">�jságírók használják a Tor-t a sztorik utáni nyomozás biztonságossá tételére.</string>
-    <string name="loading_claim_7">�zleti felhasználók használják a Tort arra, hogy biztonságtan tartsák a vállalati stratégiát.</string>
-    <string name="loading_claim_8">Munkások harcolnak a Tor-ral az igazságért, a félelem nélkül, hogy elveszthetik munkájukat.</string>
-
-    <string name="status_connecting">Csatlkoztatjuk\" = \"Csatlakoztatjuk.</string>
-
     <string name="hello">Helló</string>
     <string name="welcome">�dvözli a Tor a mobilon.</string>
 
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 7ea880e4..9529e05b 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosítsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számítógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segít megvédeni a hálózati felügyelettÅ?l, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság címén a forgalomelemzéstÅ?l.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">a Tor indítása, leállítása</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Az Orbot indul...</string>
+    <string name="status_starting_up">Az Orbot indul...</string>
   <string name="status_activated">Csatlakozva a Tor hálózathoz</string>
   <string name="status_disabled">Az Orbot deaktiválva</string>
   <string name="status_shutting_down">A TorService leáll</string>
   <string name="tor_process_starting">A Tor kliens indítása...</string>
   <string name="tor_process_complete">kész.</string>
-  <string name="tor_process_waiting">várakozik.</string>
-  <string name="not_anonymous_yet">FIGYELEM: A forgalmad még nem névtelen! �llítsd be az alkalmazásaidat, hogy HTTP proxyt használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxyt a 127.0.0.1:9050 címen</string>
-  <string name="menu_home">KezdÅ?lap</string>
-  <string name="menu_browse">Böngészés</string>
-  <string name="menu_settings">Beállítások</string>
+    <string name="menu_settings">Beállítások</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Súgó</string>
-  <string name="menu_apps">Alkalmazások...</string>
-  <string name="menu_start">Indítás</string>
+    <string name="menu_start">Indítás</string>
   <string name="menu_stop">Leállítás</string>
   <string name="menu_about">Névjegy</string>
-  <string name="menu_promo_apps">Alkalmazások beszerzése...</string>
-  <string name="main_layout_download">Letöltés</string>
+    <string name="main_layout_download">Letöltés</string>
   <string name="main_layout_upload">Feltöltés</string>
-  <string name="button_help">Súgó</string>
-  <string name="button_close">Bezár</string>
-  <string name="button_about">Névjegy</string>
-  <string name="button_clear_log">Log törlése</string>
-  <string name="menu_verify">EllenÅ?rzés</string>
-  <string name="menu_exit">Kilépés</string>
+    <string name="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="press_to_start">- hosszú nyomás az indításhoz -</string>
-  <string name="pref_trans_proxy_group">Transzparens Proxyzás (Root szükséges)</string>
-  <string name="pref_trans_proxy_title">Transzparens Proxyzás</string>
-  <string name="pref_trans_proxy_summary">Alkalmazások automatikus Tor-izálása</string>
-  <string name="pref_transparent_all_title">Minden Tor-olása</string>
-  <string name="pref_transparent_all_summary">Minden forgalom átproxyzása a Tor-on</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy visszacsatolás</string>
-  <string name="pref_transparent_port_fallback_summary">FIGYELEM: Kikerüli a szokásos portokat (80, 443, stb). *CSAK AKKOR HASZN�LD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
-  <string name="pref_transparent_port_title">Port Lista</string>
-  <string name="pref_transparent_port_summary">A proxyzandó portok listája. *CSAK AKKOR HASZN�LD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
-  <string name="pref_transparent_port_dialog">Add meg a proxyzandó portokat</string>
-  <string name="pref_has_root">Root hozzáférés szükséges</string>
-  <string name="pref_has_root_summary">Root hozzáférés szükséges a transzparens proxyzáshoz</string>
-  <string name="status_install_success">A Tor binárisok sikeresen telepítve lettek!</string>
-  <string name="status_install_fail">A Tor bináris állományok telepítése sikertelen. EllenÅ?rizd a naplót és értesítsd a tor-assistants@xxxxxxxxxxxxxx -ot</string>
-  <string name="title_error">Alkalmazás hiba</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Az Orbot-ról</string>
-  <string name="btn_next">Tovább</string>
-  <string name="btn_back">Vissza</string>
-  <string name="btn_finish">Befejezés</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Jogosultság megadva</string>
-  <string name="wizard_permissions_stock">Orbot jogosultságok</string>
-  <string name="wizard_premissions_msg_root">KitűnÅ?! Ã?gy észleltük, hogy root jogot engedélyeztél az Orbot számára. Ezt az erÅ?t bölcsen fogjuk használni.</string>
-  <string name="wizard_permissions_msg_stock"> Habár nem szükséges, az Orbot sokkal hatékonyabb eszköz lehet, ha a készüléknek van root hozzáférése. Használd az alábbi gombot, hogy szuper-erÅ?t adj az Orbot-nak! </string>
-  <string name="wizard_permissions_no_root">Ha nincs root hozzáférésed, vagy fogalmad sincs, hogy mirÅ?l beszélünk, csak gyÅ?zÅ?djél meg arról, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal.</string>
-  <string name="wizard_permissions_consent">�rtettem és Superuser nélkül folytatnám tovább</string>
-  <string name="wizard_permission_enable_root">Root jog megadása az Orbot-nak</string>
-  <string name="wizard_configure">Tor-izálás konfigurálása</string>
-  <string name="wizard_configure_msg">Az Orbot lehetÅ?vé teszi, hogy az összes alkalmazás forgalmát a Tor-on keresztül küldje VAGY hogy egyénileg kiválaszthasd az alkalmazásaidat.</string>
-  <string name="wizard_configure_all">Minden alkalmazás keresztülproxyzása a Tor-on</string>
-  <string name="wizard_configure_select_apps">Alkalmazások kiválasztása a Tor-hoz</string>
-  <string name="wizard_tips_tricks">Orbot-engedélyezett alkalmazások</string>
-  <string name="wizard_tips_msg">Az alábbi alkalmazások az Orbot-tal való együttműködésre lettek fejlesztve. Kattints minden gombra az azonnali telepítéshez, vagy késÅ?bb megtalálod Å?ket a Google Play-en, a GuardianProject.info weboldalon vagy az F-Droid.org-n.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Biztonságos azonnali üzenetküldÅ? kliens Androidra</string>
-  <string name="wizard_tips_proxy">Proxy beállítások - Tanuld meg, hogyan állíthatod be az alkalmazásaidat, hogy együttműködjenek az Orbot-tal</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo keresÅ?motor alkalmazás</string>
-  <string name="wizard_tips_twitter"> �llítsd be a Twitter proxyt a hosztnál \"localhost\"-ra és a port-nál 8118-ra</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Készíts egy történetet és hagyd a Tor-ra a biztonságért!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy beállítások</string>
-  <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használsz támogatja a HTTP vagy SOCKS proxy használatát, akkor konfigurálhatod, hogy csatlakozzon az Orbot-hoz és Tor-t használjon.\n\n\n A hoszt beállítások 127.0.0.1 vagy \"localhost\". HTTP-nek a port beállítása 8118. A SOCKS-nak a proxyja 9050. SOCKS4A -t vagy SOCKS5 -t kéne használnod, ha lehetséges.\n \n\n\n Többet tudhatsz meg a proxyzásról Androidon a GYIK-en keresztül itt: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Az Orbot kész!</string>
-  <string name="wizard_final_msg">Emberek milliói használják a világ körül a Tor-t többféle különbözÅ? okból.\n\nÃ?jságírók és bloggerek, emberi jogok védelmezÅ?i, rendÅ?rök, katonák, cégek, elnyomó rezsimek polgárai, és csak átlagos polgárok... és most már te is készen állsz!</string>
-  <string name="wizard_exit_at_first_screen_toast">Kérlek konfiguráld az Orbot-ot, mielÅ?tt elkezded használni!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Sikeresen csatlakoztál a Tor hálózathoz - de ez NEM jelenti azt, hogy a készüléked biztonságos. Használhatod a \'BöngészÅ?\' gombot a kapcsolatod teszteléséhez. \n\nLátogass meg minket a https://guardianproject.info/apps/orbot -on vagy küldj egy emailt a help@xxxxxxxxxxxxxxxxxxxx -ra, hogy többet megtudj.</string>
-  <string name="tor_check">Ez megnyitja a webböngészÅ?dben a https://check.torproject.org -t ahhoz, hogy lásd, az Orbot valószínűleg konfigurált és csatlakozva vagy a Tor-hoz.</string>
-  <string name="pref_hs_group">Rejtett szolgáltatás kiszolgálás</string>
-  <string name="pref_general_group">�ltalános</string>
+    <!--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-->
-  <string name="wizard_title_msg">Az Orbot elhozza a Tor-t Androidra!\n\nA Tor segít megvédeni téged a tartalomszűréstÅ?l, forgalomelemzéstÅ?l és hálózati felügyelettÅ?l ami fenyegeti a magánéletet, bizalmas információt és személyes kapcsolatokat.\n\nEz a varázsló segít konfigurálni az Orbot-ot és Tor-t az eszközödön.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Figyelem</string>
-  <string name="wizard_warning_msg">Az Orbot egyszerű telepítésével nem fogja automatikusan névtelenné tenni a mobilforgalmadat.\n\nMegfelelÅ?en kell konfigurálnod az Orbot-ot, az eszközödet és egyéb alkalmazásokat ahhoz, hogy sikeresen használják a Tor-t.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Jogosultságok</string>
-  <string name="wizard_permissions_root_msg1">Opcionálisan adhatsz az Orbot részére \'Superuser\' hozzáférést, hogy engedélyezz olyan speciális szolgáltatásokat, mint például a Transzparens Proxyzás.</string>
-  <string name="wizard_permissions_root_msg2">Ha nem akarod ezt tenni, kérlek bizonyosodj meg róla, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal</string>
-  <string name="wizard_permissions_no_root_msg">Az eszközöd nem tűnik rootoltnak vagy nem ad root vagy \'Superuser\' hozzáférést.\n\nKérlek próbáld az \'Appok\' módot a fÅ?képernyÅ?n ehelyett.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Biztonságos üzenetküldÅ? alkalmazás OTR titkosítással</string>
-  <string name="wizard_tips_orweb">Orfox: Fokozott adatvédelmi böngészÅ?, ami Tor-on keresztül működik</string>
-  <string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string>
-  <string name="wizard_tips_fdroid">Az összes Guardian Project alkalmazást megtalálod az F-Droid -on</string>
-  <string name="wizard_tips_fdroid_org">Az összes Guardian Project alkalmazást megtalálod a https://f-droid.org -on</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">�tlátszó Proxyzás</string>
-  <string name="wizard_transproxy_msg">Ez lehetÅ?vé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string>
-  <string name="wizard_transproxy_hint">(Jelöld be ezt négyzetet, ha fogalmad sincs arról, hogy mirÅ?l beszélünk)</string>
-  <string name="wizard_transproxy_none">Nincs</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">A Tor Transzparens Proxyzásának engedélyezése a Wifi és az USB Tetherelt eszközök felé (újraindítást igényel)</string>
-  <string name="button_grant_superuser">Superuser hozzáférés kérése</string>
-  <string name="pref_select_apps">Alkalmazások kiválasztása</string>
-  <string name="pref_select_apps_summary">Válassz alkalmazásokat, amik keresztül haladjanak a Tor-on</string>
-  <string name="pref_node_configuration">Csomópont konfiguráció</string>
+    <!--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="button_proxy_all">Mindent proxyz</string>
-  <string name="button_proxy_none">Semmit nem proxyz</string>
-  <string name="button_invert_selection">Kijelölés megfordítása</string>
-  <string name="pref_proxy_title">KimenÅ? hálózati proxy (választható)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">KimenÅ? proxy jelszó</string>
   <string name="pref_proxy_password_summary">Proxy jelszó (választható)</string>
   <string name="pref_proxy_password_dialog">Add meg a proxy jelszót</string>
-  <string name="status">Ã?llapot</string>
-  <string name="setting_up_full_transparent_proxying_">A teljes körű transzparens proxyzás beállítása...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Alkalmazásalapú transzparens proxyzás beállítása...</string>
-  <string name="transparent_proxying_enabled">Transzparens proxyzás ENGED�LYEZVE</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy engedélyezve tetheringre!</string>
-  <string name="warning_error_starting_transparent_proxying_">FIGYELMEZTET�S: hiba a transzparens proxyzás indításakor!</string>
-  <string name="transproxy_rules_cleared">TransProxy szabályok törölve</string>
-  <string name="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</string>
-  <string name="privoxy_is_running_on_port_">A Polipo ezen a porton fut:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Port alapú transzparens proxyzás beállítása...</string>
-  <string name="bridge_error">Híd hiba</string>
-  <string name="bridge_requires_ip">A híd szolgáltatás használatához legalább egy híd IP címét meg kell adnod.</string>
-  <string name="send_email_for_bridges">Küldj egy emailt a bridges@xxxxxxxxxxxxxx -ra a \"get bridges\" sorral a levél törzsében egy gmail fiókból.</string>
-  <string name="error">Hiba</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">*Csak* ezeknek a megadott csomópontoknak a használata</string>
   <string name="bridges">Hidak</string>
   <string name="use_bridges">Hidak használata</string>
-  <string name="bridges_obfuscated">FedÅ?hidak</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">A Tor hálózat bejáratok váltogatásának engedélyezése </string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Bekapcsolva, ha a konfigurált hidak fedÅ?hidak</string>
-  <string name="ip_address_and_port_of_bridges">A hidak IP címe és portja</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">ElérhetÅ? portok</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">A tűzfal mögött elérhetÅ? portok</string>
   <string name="enter_ports">Add meg a portokat</string>
-  <string name="enable_hidden_services">Rejtett szolgáltatás kiszolgálás</string>
-  <string name="run_servers_accessible_via_the_tor_network">a készülék szerver elérhetÅ?ségének engedélyezése a Tor hálózaton keresztül</string>
-  <string name="enter_localhost_ports_for_hidden_services">add meg a localhost portokat a rejtett szolgáltatásokhoz</string>
-  <string name="hidden_service_ports">Rejtett szolgáltatás portok</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">a címezhetÅ? neve a rejtett szolgáltatásaidnak (automatikusan generált)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">a hibakeresési napló engedélyezése a kimenetre (adb -t vagy aLogCat -t kell használni a megtekintéshez)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">a hibakeresési napló engedélyezése a kimenetre (adb -t vagy aLogCat -t kell használni a megtekintéshez)</string>
   <string name="project_home">Projekt honlap(ok):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Tor Licenc</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3. fél szoftver:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">rejtett szolgáltatás itt:</string>
-  <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
+    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
   <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
-  <string name="unable_to_reset_tor">Indítsd újra a készüléked, nem lehet helyreállítani a Tor-t!</string>
-  <string name="pref_use_sys_iptables_title">Alapértelmezett Iptables használata</string>
-  <string name="pref_use_sys_iptables_summary">a beépített iptables bináris használata az Orbot-tal egybecsomagolt helyett</string>
-  <string name="error_installing_binares">A Tor binárisok nem telepíthetÅ?ek, vagy frissíthetÅ?ek.</string>
-  <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
+    <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
   <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
   <string name="pref_use_expanded_notifications">Mutassa a bÅ?vített értesítést a Tor kilépÅ? országgal és IP-vel</string>
   <string name="pref_use_expanded_notifications_title">BÅ?vített értesítések</string>
-  <string name="notification_using_bridges">Hidak engedélyezve!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Nyelv</string>
-  <string name="set_locale_summary">Válaszd ki a helyszínt és nyelvet az Orbot-nak</string>
-  <string name="wizard_locale_title">Válassz nyelvet</string>
-  <string name="wizard_locale_msg">Hagyd alapértelmezetten vagy válts az aktuális nyelvre</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">Beállítások mentése</string>
-  <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</string>
-  <string name="bandwidth_">Sávszélesség:</string>
-  <string name="down">le</string>
-  <string name="up">fel</string>
-  <string name="pref_disable_network_title">Nincs hálózati auto-alvás</string>
+    <string name="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="menu_verify_browser">BöngészÅ?</string>
-  <string name="menu_use_chatsecure">ChatSecure használata</string>
-  <string name="permission_manage_tor_label">Tor kezelése</string>
-  <string name="permission_manage_tor_description">Engedélyezi ennek az alkalmazásnak, hogy a Tor szolgáltatást vezérelje</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Az Orbot legjobban az Orfox böngészÅ?vel dolgozik együtt. Telepítsük most?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Az Orbot legjobban az Orfox böngészÅ?vel dolgozik együtt. Telepítsük most?</string>
   <string name="install_apps_">BöngészÅ? telepítése?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Nincs hálózati kapcsolat. Tor alvó állapotba helyezése...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">A hálózati kapcsolat jó. Tor felébresztése...</string>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Torrc egyedi konfiguráció</string>
   <string name="pref_torrc_summary">CSAK SZAKÃ?RTÅ?KNEK: torrc konfigurációs sorok közvetlen beírása</string>
   <string name="pref_torrc_dialog">Egyedi Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech emberi jogok dokumentációja alkalmazás</string>
-  <string name="your_tor_public_ips_">A Tor-od publikus IP-jei:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Kérlek tiltsd le ezt az alkalmazást az Android-&gt;Beállítások-&gt;Alkalmazások-ban, ha az Orbot-tal problémáid vannak: </string>
-  <string name="app_conflict">Alkalmazás ütközés</string>
-  <string name="pref_transproxy_refresh_title">Transproxy auto-frissítés</string>
-  <string name="pref_transproxy_refresh_summary">A Transproxy szabályok újraalkalmazása, ha a hálózati állapot változik</string>
-  <string name="pref_transproxy_flush_title">Transproxy KÃ?NYSZERÃ?TETT ELTÃ?VOLÃ?TÃ?SA</string>
-  <string name="pref_transproxy_flush_summary">�rintsd meg itt, az összes transproxy hálózati szabály AZONNALI kiürítéséhez</string>
-  <string name="transparent_proxy_rules_flushed_">Transzparens proxy szabályok kiürítve!</string>
-  <string name="you_do_not_have_root_access_enabled">Nincs ROOT hozzáférésed engedélyezve</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Szükséged lehet az Orbot megállítására és indítására, hogy a beállítások megváltoztatása engedélyezve legyen.</string>
-  <string name="menu_vpn">Alkalmazások</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Aktiválás</string>
   <string name="apps_mode">VPN Mód</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Beállíthatja, hogy appjai a Tor-on keresztól kommunikáljanak, a beépített Orbot VPN használatával.\n\nEz nem teszi �nt anonommá, de segít keresztül jutni a tűzfalakon.</string>
-  <string name="send_email">Email küldése</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 &amp; illeszd be \"Hidak\" preferenciákba az Orbot beállításaiban és indítsd újra.</string>
   <string name="install_orweb">Orweb telepítése</string>
-  <string name="standard_browser">Standard böngészÅ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">MEGJEGYZ�S: Csak standard Tor hidak működnek az Intel X86/ATOM eszközökön</string>
-  <string name="vpn_default_world">Globális (Auto)</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="ports">Portok</string>
-  <string name="local_port">Helyi Port</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Jogosultság megadva</string>
-  <string name="permission_denied">Hozzáférés megtagadva</string>
-  <string name="restore_backup">Mentés visszaállítása</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Kérjük kapcsolja be a VPN módot az alkalmazások Tor elérésének lehetÅ?vé tételéhez</string>
-  <string name="app_shortcuts">Tor-engedélyezett Alkalmazások</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">A híd Tor-hoz csatlakozásának tesztelése....</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>
diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml
index 616e9d04..808f972e 100644
--- a/app/src/main/res/values-hy-rAM/strings.xml
+++ b/app/src/main/res/values-hy-rAM/strings.xml
@@ -3,22 +3,17 @@
   <string name="app_name">Orbot</string>
   <string name="menu_about">Õ?Õ¡Õ½Õ«Õ¶</string>
   <string name="button_about">Õ?Õ¡Õ½Õ«Õ¶</string>
-  <string name="menu_verify">Õ?Õ¿Õ¸Ö?Õ£Õ¥Õ¬</string>
-  <string name="menu_exit">ÔµÕ¬Ö?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="btn_cancel">Õ¥Õ²Õ¡Ö?Õ¯Õ¥Õ¬</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-->
-  <string name="wizard_warning_title">Õ?Ö?Õ·Õ¡Õ¤Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ«Õ³Õ¡Õ¯</string>
-  <string name="error">Õ?Õ­Õ¡Õ¬</string>
-  <string name="default_bridges"></string>
-  <string name="save">Õ?Õ¡Õ°Õ¥Õ¬</string>
+    <string name="error">Õ?Õ­Õ¡Õ¬</string>
+    <string name="save">Õ?Õ¡Õ°Õ¥Õ¬</string>
   <string name="name">Ô±Õ¶Õ¸Ö?Õ¶</string>
 </resources>
diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml
index 1a5d6fb4..c8208c36 100644
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@@ -1,33 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_home">Initio</string>
-  <string name="menu_browse">Navigar</string>
-  <string name="menu_settings">Configurationes</string>
-  <string name="menu_info">Adjuta</string>
-  <string name="menu_about">Circa</string>
-  <string name="button_help">Adjuta</string>
-  <string name="button_close">Clauder</string>
-  <string name="button_about">Circa</string>
+    <string name="menu_settings">Configurationes</string>
+    <string name="menu_about">Circa</string>
+    <string name="button_about">Circa</string>
   <string name="menu_exit">Sortir</string>
-  <string name="btn_back">Retro</string>
-  <string name="btn_cancel">Cancellar</string>
+    <string name="btn_cancel">Cancellar</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Configurationes de proxy:</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">General</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Advertimento</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Nulle</string>
-  <string name="status">Stato</string>
-  <string name="error">Error</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Linguage</string>
-  <string name="btn_save_settings">Salveguardar configurationes</string>
-  <string name="save">Salveguardar</string>
+    <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/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
index 9a9876cf..7c801f8c 100644
--- a/app/src/main/res/values-id/strings.xml
+++ b/app/src/main/res/values-id/strings.xml
@@ -2,134 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mulai dan akhiri Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sedang dimulai...</string>
+    <string name="status_starting_up">Orbot sedang dimulai...</string>
   <string name="status_activated">Tersambung ke Jaringan Tor</string>
   <string name="status_disabled">Orbot telah dibatalkan</string>
   <string name="status_shutting_down">TorService dimatikan</string>
   <string name="tor_process_starting">Memulai klien Tor...</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Beranda</string>
-  <string name="menu_browse">Jelajah</string>
-  <string name="menu_settings">Pengaturan</string>
+    <string name="menu_settings">Pengaturan</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_start">Mulai</string>
+    <string name="menu_start">Mulai</string>
   <string name="menu_stop">Berhenti</string>
   <string name="menu_about">Tentang</string>
-  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
-  <string name="main_layout_download">Unduh</string>
+    <string name="main_layout_download">Unduh</string>
   <string name="main_layout_upload">Unggah</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Hapus Log</string>
-  <string name="menu_verify">Periksa</string>
-  <string name="menu_exit">Keluar</string>
+    <string name="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="press_to_start">- sentuh dan tahan untuk memulai -</string>
-  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Transparan</string>
-  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
-  <string name="pref_transparent_all_title">Tor Semuanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
-  <string name="pref_transparent_port_title">Daftar Port</string>
-  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
-  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
-  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants@xxxxxxxxxxxxxxx</string>
-  <string name="title_error">Kesalahan Pada Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Berikutnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Selesai</string>
-  <string name="btn_okay">Oke</string>
+    <string name="btn_okay">Oke</string>
   <string name="btn_cancel">Batal</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Beberapa Rincian Orbot</string>
-  <string name="wizard_permissions_root">Izin Diberikan</string>
-  <string name="wizard_permissions_stock">Perizinan Orbot</string>
-  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
-  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torifikasi</string>
-  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
-  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
-  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string>
-  <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
-  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot sudah siap!</string>
-  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
-  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Anda telah berhasil terhubung ke jaringan Tor - tetapi ini tidak berarti perangkat Anda sudah aman. Anda dapat menggunakan tombol \'Browser\' untuk menguji koneksi Anda. \n\nKunjungi kami di https://guardianproject.info/apps/orbot atau mengirim email ke help@xxxxxxxxxxxxxxxxxxxx untuk mempelajari lebih lanjut.</string>
-  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
-  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
-  <string name="pref_general_group">Umum</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Peringatan</string>
-  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Perizinan</string>
-  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: Browser Privasi yang ditingkatkan, yang bekerja melalui Tor</string>
-  <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
-  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparan Proxying</string>
-  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
-  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
-  <string name="wizard_transproxy_none">Tidak ada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
-  <string name="button_grant_superuser">Meminta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Simpul</string>
+    <!--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="button_proxy_all">Proxy Semuanya</string>
-  <string name="button_proxy_none">Tanpa Proxy</string>
-  <string name="button_invert_selection">Balik Pilihan</string>
-  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+    <string name="pref_proxy_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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
   <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
   <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
-  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
-  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
-  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
-  <string name="bridge_error">Kesalahan pada Bridge</string>
-  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
-  <string name="send_email_for_bridges">Kirimkan email ke bridges@xxxxxxxxxxxxxx dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
-  <string name="error">Kesalahan</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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Pakai Bridges</string>
-  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+    <string name="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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Ports terjangkau</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
   <string name="enter_ports">Memasuki ports</string>
-  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
-  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
-  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
-  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
   <string name="project_home">Beranda Projek:</string>
   <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Lisensi Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+    <string name="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="hidden_service_on">layanan tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
-  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
-  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
-  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
-  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
-  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+    <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
   <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
   <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
   <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
-  <string name="notification_using_bridges">Bridge diaktifkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Bahasa</string>
-  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
-  <string name="powered_by">diperkuat dengan Tor</string>
-  <string name="btn_save_settings">Simpan Pengaturan</string>
-  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">unduh</string>
-  <string name="up">unggah</string>
-  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+    <string name="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="menu_verify_browser">Peramban</string>
-  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
-  <string name="permission_manage_tor_label">Kelola Tor</string>
-  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</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>
@@ -250,19 +121,7 @@
   <string name="pref_torrc_title">Konfigurasi Torrc</string>
   <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
   <string name="pref_torrc_dialog">Torrc Custom</string>
-  <string name="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
-  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
-  <string name="app_conflict">Konflik Aplikasi</string>
-  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
-  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
-  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
-  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
-  <string name="menu_vpn">Aplikasi</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,9 +135,7 @@
   <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="install_orweb">Pasang Orfox</string>
-  <string name="standard_browser">Peramban Standar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
-  <string name="save">Simpan</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>
diff --git a/app/src/main/res/values-in-rID/poestrings.xml b/app/src/main/res/values-in-rID/poestrings.xml
index 9dc8a064..25f89793 100644
--- a/app/src/main/res/values-in-rID/poestrings.xml
+++ b/app/src/main/res/values-in-rID/poestrings.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Bridge adalah penghubung Tor (relay) yang membantu mengatasi sensor. Anda dapat mencoba memakai bridge jika Tor diblok oleh ISP Anda; setiap tipe bridge memakai metoda berbeda.
- untuk menghindari sensor: jika tidak berhasil memakai sebuah tipe, cobalah memakai tipe yang lain.</string>
-
-    <string name="bridges_no">Tanpa Bridge: Terhubung Langsung ke Tor</string>
-    <string name="bridges_provided">Bridge yang Tersedia: </string>
-    <string name="bridges_config">Konfigurasi Bridge</string>
-    <string name="action_done">Selesai</string>
 
     <string name="bridges_sometimes">Kadang Anda memerlukan sebuah bridge untuk dapat terhubung ke Tor. </string>
     <string name="action_more">BERITAHU SAYA LEBIH BANYAK</string>
@@ -15,19 +8,6 @@
     <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="status_connected">Terhubung!</string>
-
-    <string name="loading_claim_1">Anggota komunitas kami berbeda-beda, itulah yang membuat Tor hebat! </string>
-    <string name="loading_claim_2">Setiap hari orang memakai Tor untuk mencegah diikuti oleh iklan pemasaran. </string>
-    <string name="loading_claim_3">Ketika Facebook diblok, orang memakai Tor untuk terhubung ke teman dan keluarga mereka. </string>
-    <string name="loading_claim_4">Para aktivis memakai Tor untuk mencuit pendapat dan kepercayaan mereka secara bebas. </string>
-    <string name="loading_claim_5">Para blogger memakai Tor untuk mengerahkan orang ke arah reformasi sosial. </string>
-    <string name="loading_claim_6">Wartawan memakai Tor untuk menyelidiki kasus yang akan disajikan secara aman. </string>
-    <string name="loading_claim_7">Para pelaku bisnis memakai Tor untuk menjaga strategi perusahaan tetap terjaga privat dan aman. </string>
-    <string name="loading_claim_8">Para pekerja memakai Tor untuk mencari keadilan tanpa takut kehilangan pekerjaan. </string>
-
-    <string name="status_connecting">Kami menghubungkan Anda.\" = \"Kami menghubungkan Anda. </string>
-
     <string name="hello">Halo</string>
     <string name="welcome">Selamat datang ke Tor versi mobile.</string>
 
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 8b99a0d9..0781709b 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -2,134 +2,45 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mulai dan akhiri Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sedang memulai...</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="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">PERINGATAN: Trafik data Anda belum anonim! Silahkan konfigurasikan aplikasi Anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Beranda</string>
-  <string name="menu_browse">Jelajah</string>
-  <string name="menu_settings">Pengaturan</string>
+    <string name="menu_settings">Pengaturan</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_start">Mulai</string>
+    <string name="menu_start">Mulai</string>
   <string name="menu_stop">Berhenti</string>
   <string name="menu_about">Tentang</string>
-  <string name="menu_promo_apps">Dapatkan apps...</string>
-  <string name="main_layout_download">Unduh</string>
+    <string name="main_layout_download">Unduh</string>
   <string name="main_layout_upload">Unggah</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Hapus Log</string>
-  <string name="menu_verify">Periksa</string>
-  <string name="menu_exit">Keluar</string>
+    <string name="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="press_to_start">- sentuh dan tahan untuk memulai -</string>
-  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Transparan</string>
-  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
-  <string name="pref_transparent_all_title">Tor Semuanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
-  <string name="pref_transparent_port_title">Daftar Port</string>
-  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
-  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
-  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants@xxxxxxxxxxxxxxx</string>
-  <string name="title_error">Kesalahan Pada Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Berikutnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Selesai</string>
-  <string name="btn_okay">Oke</string>
+    <string name="btn_okay">Oke</string>
   <string name="btn_cancel">Batal</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Beberapa Rincian Orbot</string>
-  <string name="wizard_permissions_root">Izin Diberikan</string>
-  <string name="wizard_permissions_stock">Perizinan Orbot</string>
-  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
-  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torifikasi</string>
-  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
-  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
-  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string>
-  <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
-  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot sudah siap!</string>
-  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
-  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Anda telah terhubung ke jaringan Tor - tetapi ini BUKAN berarti perangkat Anda sudah aman. Anda dapat menggunakan pilihan \'Peramban\' dari menu untuk menguji koneksi Anda. Kunjungi kami di https://guardianproject.info/apps/orbot atau kirimkan email ke help@xxxxxxxxxxxxxxxxxxxx untuk mempelajari lebih lanjut.</string>
-  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
-  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
-  <string name="pref_general_group">Umum</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Peringatan</string>
-  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Perizinan</string>
-  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: Peramban dengan peningkatan privasi yang bekerja melalui Tor</string>
-  <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
-  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparan Proxying</string>
-  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
-  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
-  <string name="wizard_transproxy_none">Tidak ada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wi-Fi dan Perangkat Tether USB (diperlukan restart)</string>
-  <string name="button_grant_superuser">Meminta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Simpul</string>
+    <!--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="button_proxy_all">Proxy Semuanya</string>
-  <string name="button_proxy_none">Tanpa Proxy</string>
-  <string name="button_invert_selection">Balik Pilihan</string>
-  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+    <string name="pref_proxy_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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
   <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
   <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
-  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
-  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
-  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
-  <string name="bridge_error">Kesalahan pada Bridge</string>
-  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
-  <string name="send_email_for_bridges">Kirimkan email ke bridges@xxxxxxxxxxxxxx dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
-  <string name="error">Kesalahan</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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Pakai Bridges</string>
-  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+    <string name="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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Ports terjangkau</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
   <string name="enter_ports">Memasuki ports</string>
-  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
-  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
-  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
-  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
   <string name="project_home">Beranda Projek:</string>
   <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Lisensi Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+    <string name="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="hidden_service_on">layanan tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
-  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
-  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
-  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
-  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
-  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+    <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
   <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
   <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
   <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
-  <string name="notification_using_bridges">Bridge diaktifkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Bahasa</string>
-  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
-  <string name="powered_by">diperkuat dengan Tor</string>
-  <string name="btn_save_settings">Simpan Pengaturan</string>
-  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">unduh</string>
-  <string name="up">unggah</string>
-  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+    <string name="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="menu_verify_browser">Peramban</string>
-  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
-  <string name="permission_manage_tor_label">Kelola Tor</string>
-  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</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>
@@ -250,19 +121,7 @@
   <string name="pref_torrc_title">Konfigurasi Torrc</string>
   <string name="pref_torrc_summary">HANYA UNTUK AHLI: masukkan baris konfigurasi direct Torrc</string>
   <string name="pref_torrc_dialog">Torrc Custom</string>
-  <string name="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
-  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
-  <string name="app_conflict">Konflik Aplikasi</string>
-  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
-  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
-  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
-  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
-  <string name="menu_vpn">Aplikasi</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,7 +135,5 @@
   <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="install_orweb">pasang Orfox</string>
-  <string name="standard_browser">Peramban Standar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
-  <string name="please_restart_Orbot_to_enable_the_changes">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
+    <string name="please_restart_Orbot_to_enable_the_changes">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
 </resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 42c44612..2026ca19 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -1,48 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mulai dan akhiri Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sedang dimulaiâ?¦</string>
+    <string name="status_starting_up">Orbot sedang dimulaiâ?¦</string>
   <string name="status_activated">Tersambung ke Jaringan Tor</string>
   <string name="status_disabled">Orbot telah dibatalkan</string>
   <string name="status_shutting_down">Orbot sedang dimatikan</string>
-  <string name="not_anonymous_yet">PERINGATAN: </string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Jelajahi</string>
-  <string name="menu_settings">Pengaturan</string>
+    <string name="menu_settings">Pengaturan</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_about">Mengenai</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Dekat</string>
-  <string name="button_about">Mengenai</string>
-  <string name="button_clear_log">Hapus Log</string>
-  <string name="menu_verify">Periksa</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="pref_transparent_all_title">Tor Semuanya</string>
-  <string name="pref_transparent_port_title">Daftar Port</string>
-  <string name="pref_has_root">Minta Akses Dasar</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_cancel">Batal</string>
+    <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)-->
-  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Umum</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Peringatan</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Tidak ada</string>
-  <string name="status">Status</string>
-  <string name="error">Kesalahan</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Simpan Pengaturan</string>
+    <string name="error">Kesalahan</string>
 </resources>
diff --git a/app/src/main/res/values-is/poestrings.xml b/app/src/main/res/values-is/poestrings.xml
index 2fb155b3..ee298b25 100644
--- a/app/src/main/res/values-is/poestrings.xml
+++ b/app/src/main/res/values-is/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Brýr eru Tor-endurvarpar sem hjálpa til við að komast framhjá ritskoðun. �ú getur reynt að nota brýr ef ISP-netþjónustan þín lokar á Tor; hver gerð brúa notar mismunandi aðferðir
-        til að komast framhjá ritskoðun: ef ein gerðin virkar ekki, prófarðu einhverja aðra.</string>
-
-    <string name="bridges_no">Engar brýr: Tengist beint við Tor</string>
-    <string name="bridges_provided">Brýr sem fylgja:</string>
-    <string name="bridges_custom">Sérsniðnar brýr</string>
-
-    <string name="bridges_config">Uppsetning brúar</string>
-    <string name="action_done">Lokið</string>
 
     <string name="bridges_sometimes">Stundum eru brýr nauðsynlegar til að tengjast Tor.</string>
     <string name="action_more">SEGIÃ? MÃ?R MEIRA</string>
@@ -17,19 +8,6 @@
     <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="status_connected">Tengt!</string>
-
-    <string name="loading_claim_1">Fjölbreytt samfélag notenda er það sem gerir Tor frábært!</string>
-    <string name="loading_claim_2">Venjulegt fólk notar Tor til að sleppa undan eftirliti markaðsdrónanna.</string>
-    <string name="loading_claim_3">�egar lokað er á Facebook, getur fólk notað Tor til að tengjast vinum sínum og fjölskyldu.</string>
-    <string name="loading_claim_4">Aðgerðasinnar nota Tor til að hafa fullt frelsi til að viðra skoðanir sínar.</string>
-    <string name="loading_claim_5">Bloggarar nota Tor til að stefna fólki saman til að berjast fyrir félagslegum réttindum.</string>
-    <string name="loading_claim_6">Blaðamenn nota Tor sem örugga leið við rannsóknir á fréttum sem þeir eru að vinna.</string>
-    <string name="loading_claim_7">Fólk í viðskiptalífinu notar Tor til að halda viðskiptaáætlunum sínum frá snuðri utanaðkomandi aðila.</string>
-    <string name="loading_claim_8">Verkafólk notar Tor í réttindabaráttu sinni án þess að þurfa að hafa áhyggjur af því að missa vinnuna.</string>
-
-    <string name="status_connecting">Við tengjum þig.\" = \"Við tengjum þig.</string>
-
     <string name="hello">Halló</string>
     <string name="welcome">Velkomin í Tor-vafrann á snjalltæki.</string>
 
diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml
index 134cab09..653549bb 100644
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@@ -2,136 +2,46 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">ræsa og stöðva Tor</string>
-  <string name="tor_proxy_service_process">torproxyþjónusta</string>
-  <string name="status_starting_up">Orbot er að ræsa...</string>
+    <string name="status_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="tor_process_waiting">í bið.</string>
-  <string name="not_anonymous_yet">A�V�RUN: Netumferðin þín er ekki nafnlaus enn! Stilltu hugbúnaðinn þinn til að nota HTTP proxy 127.0.0.1:8118 eða SOCK4A eða SOCK5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Heim</string>
-  <string name="menu_browse">Vafra</string>
-  <string name="menu_settings">Stillingar</string>
+    <string name="menu_settings">Stillingar</string>
   <string name="menu_log">Atvikaskráning</string>
-  <string name="menu_info">Hjálp</string>
-  <string name="menu_apps">Forrit...</string>
-  <string name="menu_start">Ræsa</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="menu_promo_apps">Ná í forrit�</string>
-  <string name="main_layout_download">Sótt gögn</string>
+    <string name="main_layout_download">Sótt gögn</string>
   <string name="main_layout_upload">Send gögn</string>
-  <string name="button_help">Hjálp</string>
-  <string name="button_close">Loka</string>
-  <string name="button_about">Um hugbúnaðinn</string>
-  <string name="button_clear_log">Hreinsa atvikaskráningu</string>
-  <string name="menu_verify">Athuga</string>
-  <string name="menu_exit">Hætta</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="press_to_start">- ýttu lengi til að byrja -</string>
-  <string name="pref_trans_proxy_group">Gegnsæ milliþjónabeining (krefst rótaraðgangs)</string>
-  <string name="pref_trans_proxy_title">Gegnsæ milliþjónabeining</string>
-  <string name="pref_trans_proxy_summary">Tor-gera forrit sjálfvirkt</string>
-  <string name="pref_transparent_all_title">Tor-gera allt</string>
-  <string name="pref_transparent_all_summary">Beina umferð fyrir öll forrit í gegnum Tor</string>
-  <string name="pref_transparent_port_fallback_title">Gátt milliþjónabeiningar til vara</string>
-  <string name="pref_transparent_port_fallback_summary">A�V�RUN: Fer framhjá algengum gáttum (80, 443, etc). *NOTA A�EINS* ef \'Allt\' eða \'Forrit\' hamur virkar ekki.</string>
-  <string name="pref_transparent_port_title">Listi yfir gáttir</string>
-  <string name="pref_transparent_port_summary">Listi yfir gáttir sem á að beina. *NOTA A�EINS* ef \'Allt\' eða \'Forrit\' hamur virkar ekki</string>
-  <string name="pref_transparent_port_dialog">Settu inn gátt til að beina á milliþjóna</string>
-  <string name="pref_has_root">Biðja um rótaraðgang</string>
-  <string name="pref_has_root_summary">Krefst rótaraðgangs fyrir gegnsæja milliþjónabeiningu</string>
-  <string name="status_install_success">Uppsetning Tor-keyrsluskráa tókst!</string>
-  <string name="status_install_fail">Ekki var hægt að setja upp tvíundaskrár Tor (binary). Skoðaðu atvikaskráninguna og láttu vita á tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Villa í forriti</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Um Orbot</string>
-  <string name="btn_next">Næsta</string>
-  <string name="btn_back">Til baka</string>
-  <string name="btn_finish">Ljúka</string>
-  <string name="btn_okay">Ã? lagi</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>
-  <string name="wizard_permissions_root">Aðgangur heimilaður</string>
-  <string name="wizard_permissions_stock">Orbot-heimildir</string>
-  <string name="wizard_premissions_msg_root">Frábært! Við höfum skynjað að þú hefur heimildir fyrir  rótaraðgang á Orbot. Við munum nota þetta vald skynsamlega.</string>
-  <string name="wizard_permissions_msg_stock">�rátt fyrir að vera ekki nauðsynlegt, getur Orbot orðið öflugra verkfæri ef tækið þitt er með rótaraðgang. Notaðu hnappinn hér fyrir neðan til að veita Orbot ofurkrafta!</string>
-  <string name="wizard_permissions_no_root">Ef þú ert ekki með rótaraðgang eða hefur enga hugmynd um hvað við erum að tala, vertu viss um að nota forrit sem gerð eru til að vinna með Orbot.</string>
-  <string name="wizard_permissions_consent">�g skil og vil halda áfram án réttinda ofurnotanda</string>
-  <string name="wizard_permission_enable_root">Veita rótaraðgang fyrir Orbot</string>
-  <string name="wizard_configure">Stilla Tor-eiginleika</string>
-  <string name="wizard_configure_msg">Orbot gefur þér möguleikann á að beina allri umferð forrita í gegnum Tor E�A að velja hvert forrit fyrir sig.</string>
-  <string name="wizard_configure_all">Beina umferð fyrir öll forrit í gegnum Tor</string>
-  <string name="wizard_configure_select_apps">Velja einstök forrit fyrir Tor</string>
-  <string name="wizard_tips_tricks">Orbot-virkjuð forrit</string>
-  <string name="wizard_tips_msg">Forritin hér fyrir neðan voru þróuð til að virka með Orbot. Smelltu á hvern hnapp til að setja upp núna, eða þú getur fundið þau seinna á Google Play, á heimasíðu GuardianProject.info eða í gegnum F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - �ruggur smáskilaboðaþjónn fyrir Android</string>
-  <string name="wizard_tips_proxy">Proxy milliþjónastillingar - Lærðu hvernig á að stilla forrit til að virka með Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo leitarvélarforrit</string>
-  <string name="wizard_tips_twitter">Setja Twitter milliþjón í að hýsa \"localhost\" og gátt 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Skrifaðu einhverja sögu og láttu Tor um að gæta öryggis hennar!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Stillingar milliþjóns (proxy)</string>
-  <string name="wizard_proxy_help_msg">Ef Android-forritið sem þú notar styður notkun af HTTP eða SOCKS milliþjóna, getur þú stillt það til að tengjast Orbot og að nota Tor.\n\n\nStilling þjóns er að nota 127.0.0.1 eða \"localhost\". Fyrir HTTP, er gáttarstillingin á 8118. Fyrir SOCKS, er milliþjónninn á 9050. �ú ættir að nota SOCKS4A eða SOCKS5 ef það er mögulegt. �ú getur lært meira um milliþjónabeiningar (proxying) á Android með því að skoða Algengar spurningar (FAQ) á: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot er tilbúið!</string>
-  <string name="wizard_final_msg">Milljónir manna um allan heim nota Tor af mörgum mismunandi ástæðum.\n\nBlaðamenn og bloggarar, mannréttindasinnar, lögreglufólk, hermenn, stórfyrirtæki, þegnar kúgandi ríkisstjórna og bara venjulegir borgarar... og núna þú ert líka til í tuskið!</string>
-  <string name="wizard_exit_at_first_screen_toast">Endilega stilltu Orbot áður en þú getur byrjað að nota það!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">�ér hefur tekist að tengjast Tor-netinu - en það þýðir EKKI að tækið þitt sé orðið öruggt. �ú getur notað \'Vafri\'-hnappinn til að prófa tenginguna þína. \n\nHeimsæktu https://guardianproject.info/apps/orbot eða sendu tölvupóst á help@xxxxxxxxxxxxxxxxxxxx til að fá nánari upplýsingar.</string>
-  <string name="tor_check">�etta mun opna vafrann þinn á https://check.torproject.org til að sjá hvort Orbot sé rétt tengt og hvort þú sért tengdur Tor.</string>
-  <string name="pref_hs_group">Falin hýsingarþjónusta</string>
-  <string name="pref_general_group">Almennt</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-->
-  <string name="wizard_title_msg">Orbot kemur með Tor til Android!\n\nTor hjálpar þér að verjast gegn síun innihalds, umferðargreiningu og neteftirliti sem ógnar friðhelgi einkalífsins, trúnaðarupplýsingum og persónulegum samböndum.\n\n�essi leiðarvísir hjálpar þér að stilla Orbot og Tor á tækinu þínu.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Aðvörun</string>
-  <string name="wizard_warning_msg">Með því einu að setja Orbot upp mun netumferð þín ekki verða sjálfkrafa nafnlaus.\n\n�ú verður að stilla Orbot rétt, og fá tækið þitt og önnur forrit til að nota Tor á réttan hátt.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Aðgangsheimildir</string>
-  <string name="wizard_permissions_root_msg1">�ú getur einnig veitt Orbot \'ofurnotanda\'-aðgang til að virkja eiginleika fyrir lengra komna, eins og t.d. gegnsæja milliþjónabeiningu.</string>
-  <string name="wizard_permissions_root_msg2">Ef þú vilt ekki gera þetta, gakktu þá úr skugga um að þú notir forrit sem gerð eru til að vinna með Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Tækið þitt virðist ekki vera með rótaraðgang eða veita \'Ofurnotanda\'-réttindi.\n\nPrófaðu í staðinn \'Forrit\'-haminn á aðalskjánum.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-virkjuð forrit</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: �ruggt spjallforrit með dulritun fyrir óskráð spjall</string>
-  <string name="wizard_tips_orweb">Orfox: Netvafri með hertum einkamálavörnum sem virkar í gegnum Tor</string>
-  <string name="wizard_tips_play">Finndu öll forrit Guardian-verkefnisins á Google Play</string>
-  <string name="wizard_tips_fdroid">Finndu öll forrit Guardian-verkefnisins á F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Finndu öll forrit Guardian-verkefnisins á https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Gegnsæ milliþjónabeining (proxying)</string>
-  <string name="wizard_transproxy_msg">�etta gerir forritunum þínum kleift að keyra sjálfvirkt í gengum Tor-netið án nokkurra uppsetningar.</string>
-  <string name="wizard_transproxy_hint">(Hakaðu í þennan reit ef þú hefur enga hugmynd um hvað við erum að tala)</string>
-  <string name="wizard_transproxy_none">Ekkert</string>
-  <string name="pref_transparent_tethering_title">Tor-netaðgangspunktur</string>
-  <string name="pref_transparent_tethering_summary">Leyfa gegnsæja milliþjónabeiningu á Tor fyrir tæki sem geta gefið netaaðgang í gegnum WiFi og USB  (þarfnast endurræsingar)</string>
-  <string name="button_grant_superuser">Biðja um ofurnotandaréttindi</string>
-  <string name="pref_select_apps">Veldu forrit</string>
-  <string name="pref_select_apps_summary">Veldu forrit til að beina í gegnum Tor</string>
-  <string name="pref_node_configuration">Stillingar aðgangspunkts</string>
+    <!--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="button_proxy_all">Milliþjónabeina öllu</string>
-  <string name="button_proxy_none">Milliþjónabeina engu</string>
-  <string name="button_invert_selection">Snúa við vali</string>
-  <string name="pref_proxy_title">Milliþjónn á útleið (valfrjálst)</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>
@@ -147,20 +57,8 @@
   <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="status">Staða</string>
-  <string name="setting_up_full_transparent_proxying_">Set upp full-gegnsæja milliþjónabeiningu...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Set upp gegnsæja milliþjónabeiningu byggða á forritum... </string>
-  <string name="transparent_proxying_enabled">Gegnsæ milliþjónabeining (proxying) er VIRK</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy er virkjað fyrir netaðgangspunkt!</string>
-  <string name="warning_error_starting_transparent_proxying_">A�V�RUN: villa við að kveikja á gegnsærri milliþjónabeiningu</string>
-  <string name="transproxy_rules_cleared">TransProxy reglur hreinsaðar</string>
-  <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor-ferli:</string>
-  <string name="privoxy_is_running_on_port_">Polipo keyrir á gátt:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Set upp gegnsæja milliþjónabeiningu byggða á gáttum... </string>
-  <string name="bridge_error">Villa í brú</string>
-  <string name="bridge_requires_ip">Til að nota brúar-eiginleikann, verðurðu að setja inn að minnsta kosti eitt IP-vistfang fyrir brú.</string>
-  <string name="send_email_for_bridges">Sendu tölvupóst á bridges@xxxxxxxxxxxxxx úr gmail-aðgangi með \"get bridges\" í stakri línu í efni skeytisins.</string>
-  <string name="error">Villa</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>
@@ -173,10 +71,8 @@
   <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="bridges_obfuscated">Villandi brýr</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Virkjaðu varaleiðir inn á Tor-netið</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Leyfa ef stilltar brýr eru villandi brýr</string>
-  <string name="ip_address_and_port_of_bridges">IP-vistfang og brúargáttir</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>
@@ -192,17 +88,10 @@
   <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_hidden_services">Falin hýsingarþjónusta</string>
-  <string name="run_servers_accessible_via_the_tor_network">leyfa á-tækis-netþjóni að vera aðgengilegur í gegnum Tor-netið</string>
-  <string name="enter_localhost_ports_for_hidden_services">settu inn localhost-gáttir fyrir faldar þjónustur</string>
-  <string name="hidden_service_ports">Faldar þjónustugáttir</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nafnið fyrir földu þjónustuna þína (búið til sjálfkrafa)</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="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="the_tor_license">Notkunarleyfi Tor</string>
-  <string name="https_torproject_org">https:torproject.org</string>
-  <string name="third_party_software">Hugbúnaður frá 3ja aðila:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">falin þjónusta á:</string>
-  <string name="unable_to_read_hidden_service_name">get ekki lesið heiti földu þjónustunnar</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="unable_to_reset_tor">Endurræstu tækið þitt, ekki er hægt að endurstilla Tor!</string>
-  <string name="pref_use_sys_iptables_title">Nota sjálfgefnar IP-töflur (Iptables)</string>
-  <string name="pref_use_sys_iptables_summary">nota innbyggðar tvíundarskrár iptables í staðinn fyrir þær sem fylgja með Orbot</string>
-  <string name="error_installing_binares">Ekki var hægt að setja upp eða uppfæra tvíundarkerfisskrár 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">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="notification_using_bridges">Brýr virkjaðar!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Tungumál</string>
-  <string name="set_locale_summary">Veldu staðfærslu og tungumál fyrir Orbot</string>
-  <string name="wizard_locale_title">Veldu tungumál</string>
-  <string name="wizard_locale_msg">Halda sjálfgefnu eða skipta um núverandi tungumál</string>
-  <string name="powered_by">keyrt með Tor</string>
-  <string name="btn_save_settings">Vista stillingar</string>
-  <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</string>
-  <string name="bandwidth_">Bandbreidd:</string>
-  <string name="down">sótt</string>
-  <string name="up">sent</string>
-  <string name="pref_disable_network_title">Engin sjálfvirk svæfing netkerfis</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="menu_verify_browser">Vafri</string>
-  <string name="menu_use_chatsecure">Nota ChatSecure</string>
-  <string name="permission_manage_tor_label">Sýsla með Tor</string>
-  <string name="permission_manage_tor_description">Leyfa þessu forriti að stjórna Tor þjónustunni</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot virkar best með Orfox-vafranum. Setja upp núna?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot virkar best með Orfox-vafranum. Setja upp núna?</string>
   <string name="install_apps_">Setja upp vafra?</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>
@@ -258,19 +128,7 @@
   <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="wizard_tips_martus">Mobile Martus - Skjölunarforrit fyrir Benetech mannréttindaskráningu</string>
-  <string name="your_tor_public_ips_">Opinberar Tor IP-tölur þínar </string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Slökktu á þessu forriti í Android-&gt;Stillingar-&gt;Forrit ef þú ert í vandræðum með Orbot: </string>
-  <string name="app_conflict">Ã?rekstur forrita</string>
-  <string name="pref_transproxy_refresh_title">Sjálfvirk-endurnýjun á gegnsærri beiningu</string>
-  <string name="pref_transproxy_refresh_summary">Endurvirkja reglur fyrir gegnsæja beiningu þegar ástand netsins breytist</string>
-  <string name="pref_transproxy_flush_title">�VINGU� FJARL�GING á gegnsærri beiningu</string>
-  <string name="pref_transproxy_flush_summary">�ttu hér til að henda öllum reglum fyrir gegnsæja beiningu N�NA</string>
-  <string name="transparent_proxy_rules_flushed_">Reglum fyrir gegnsæja beiningu hent!</string>
-  <string name="you_do_not_have_root_access_enabled">�ú ert ekki með virkan R�TAR-aðgang</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">�ú gætir þurft að stöðva og ræsa Orbot aftur til að breytingar á stillingum taki gildi.</string>
-  <string name="menu_vpn">Forrit</string>
-  <string name="kbps">kb/sek</string>
+    <string name="kbps">kb/sek</string>
   <string name="mbps">mb/sek</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Vefur</string>
   <string name="activate">Virkja</string>
   <string name="apps_mode">VPN-hamur</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">�ú getur stillt hvaða forrit sem er á að fara í gegnum Tor með því að nota innbyggt VPN í Orbot.\n\n�etta mun ekki gera þig nafnlausan, en mun hjálpa til við að komast í gegnum eldveggi.</string>
-  <string name="send_email">Senda tölvupóst</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 &amp; límdu það inn í stillingar fyrir \'Brýr\' í kjörstillingum Orbot og endurræstu síðan.</string>
   <string name="install_orweb">Uppsetning Orfox</string>
-  <string name="standard_browser">Staðlaður vafri</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ATHUGA�U: Aðeins staðlaðar Tor-brýr virka á Intel X86/ATOM tækjum</string>
-  <string name="vpn_default_world">Víðvært (sjálfvirkt)</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="ports">Gáttir</string>
-  <string name="local_port">Staðvær gátt</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Aðgangur heimilaður</string>
-  <string name="permission_denied">Heimild hafnað</string>
-  <string name="restore_backup">Endurheimta úr öryggisafriti</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Virkjaðu VPN-haminn til að hægt sé að virkja forrit til að nota Tor</string>
-  <string name="app_shortcuts">Tor-virkjuð forrit</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Prófa brúartengingu við Tor....</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>
diff --git a/app/src/main/res/values-it/poestrings.xml b/app/src/main/res/values-it/poestrings.xml
index 16ea358e..594716c9 100644
--- a/app/src/main/res/values-it/poestrings.xml
+++ b/app/src/main/res/values-it/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"I bridge sono relay di Tor che aiutano ad aggirare la censura. Puoi provare i bridge se Tor viene bloccato dal tuo ISP; ogni tipo di bridge usa un metodo differente
-        per evitare la censura: se un tipo non funziona, prova ad usarne un altro.</string>
-
-    <string name="bridges_no">Nessun bridge: connetti direttamente a Tor</string>
-    <string name="bridges_provided">Bridge forniti:</string>
-    <string name="bridges_custom">Bridge personali</string>
-
-    <string name="bridges_config">Configurazione bridge</string>
-    <string name="action_done">Fatto</string>
 
     <string name="bridges_sometimes">Talvolta è necessario un bridge per usare Tor.</string>
     <string name="action_more">DIMMI DI PIÃ?</string>
@@ -17,19 +8,6 @@
     <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="status_connected">Connesso!</string>
-
-    <string name="loading_claim_1">La nostra comunità così varia è ciò che rende Tor fantastico!</string>
-    <string name="loading_claim_2">Ogni giorno le persone usano Tor per evitare di essere tracciati dalla pubblicità.</string>
-    <string name="loading_claim_3">Quando Facebook viene bloccato, le persone usano Tor per rimanere in contatto con i loro amici e la famiglia.</string>
-    <string name="loading_claim_4">Gli attivisti usano Tor per twittare liberamente le loro opinioni e pensieri.</string>
-    <string name="loading_claim_5">I blogger usano Tor per radunare persone verso la riforma sociale.</string>
-    <string name="loading_claim_6">I giornalisti usano Tor per investigare in modo sicuro le storie che riportano.</string>
-    <string name="loading_claim_7">Le persone d\'affari usano Tor per mantenere private le strategie aziendali.</string>
-    <string name="loading_claim_8">I lavoratori usano Tor per ottenere giustizia senza avere la paura di perdere il lavoro.</string>
-
-    <string name="status_connecting">Ti stiamo connettendo.\" = \"Ti stiamo connettendo.</string>
-
     <string name="hello">Ciao</string>
     <string name="welcome">Benvenuto su Tor per smartphone</string>
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3d9f3f21..62e8da41 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il  traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">avvia e ferma Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot è in esecuzione...</string>
+    <string name="status_starting_up">Orbot è in esecuzione...</string>
   <string name="status_activated">Connesso alla rete Tor</string>
   <string name="status_disabled">Orbot è disattivato</string>
   <string name="status_shutting_down">TorService si sta spegnendo</string>
   <string name="tor_process_starting">Avvio client Tor...</string>
   <string name="tor_process_complete">completa.</string>
-  <string name="tor_process_waiting">in attesa.</string>
-  <string name="not_anonymous_yet">ATTENZIONE: Il traffico non è ancora anonimo! Configura le applicazioni per utilizzare il proxy HTTP 127.0.0.1:8118,  SOCKS4A o proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Naviga</string>
-  <string name="menu_settings">Impostazioni</string>
+    <string name="menu_settings">Impostazioni</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Aiuto</string>
-  <string name="menu_apps">Apps...</string>
-  <string name="menu_start">Avvia</string>
+    <string name="menu_start">Avvia</string>
   <string name="menu_stop">Ferma</string>
   <string name="menu_about">Info</string>
-  <string name="menu_promo_apps">Installa apps...</string>
-  <string name="main_layout_download">Download</string>
+    <string name="main_layout_download">Download</string>
   <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Aiuto</string>
-  <string name="button_close">Chiudi</string>
-  <string name="button_about">Info</string>
-  <string name="button_clear_log">Cancella log</string>
-  <string name="menu_verify">Controlla</string>
-  <string name="menu_exit">Esci</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="press_to_start">- tieni premuto per avviare -</string>
-  <string name="pref_trans_proxy_group">Proxying trasparente (richiede root)</string>
-  <string name="pref_trans_proxy_title">Proxying trasparente</string>
-  <string name="pref_trans_proxy_summary">Torifying automatico delle app</string>
-  <string name="pref_transparent_all_title">Tor ovunque</string>
-  <string name="pref_transparent_all_summary">Traffico proxy di tutte le app attraverso Tor</string>
-  <string name="pref_transparent_port_fallback_title">Fallback porte proxy</string>
-  <string name="pref_transparent_port_fallback_summary">ATTENZIONE: Aggira le porte comuni (80, 443, ecc). *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
-  <string name="pref_transparent_port_title">Elenco porte</string>
-  <string name="pref_transparent_port_summary">Lista di porte per cui fare proxy. *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
-  <string name="pref_transparent_port_dialog">Inserisci porte da proxare</string>
-  <string name="pref_has_root">Richiesto accesso root</string>
-  <string name="pref_has_root_summary">Richiede il root per il proxying trasparente</string>
-  <string name="status_install_success">I binari di Tor sono stati installati con successo!</string>
-  <string name="status_install_fail">I file binari di Tor non possono essere installati. Controlla i log e notifica l\'accaduto su tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Errore applicazione</string>
-  <string name="wizard_title">Benvenuti in Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Avanti</string>
-  <string name="btn_back">Indietro</string>
-  <string name="btn_finish">Fine</string>
-  <string name="btn_okay">Ok</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Permesso concesso</string>
-  <string name="wizard_permissions_stock">Permessi Orbot</string>
-  <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string>
-  <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string>
-  <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string>
-  <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string>
-  <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string>
-  <string name="wizard_configure">Configura Torification</string>
-  <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string>
-  <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string>
-  <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string>
-  <string name="wizard_tips_tricks">App abilitate per Orbot</string>
-  <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client sicuro di messaggistica istantanea, per Android</string>
-  <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string>
-  <string name="wizard_tips_duckgo">App del motore di ricerca Duckduckgo</string>
-  <string name="wizard_tips_twitter">Twitter supporta il proxy http \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Crea una storia e lascia a Tor la sicurezza!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Impostazioni proxy</string>
-  <string name="wizard_proxy_help_msg">Se l\'app Android che stai usando supporta l\'uso di Proxy HTTP o SOCKS, allora puoi configurarle per connettersi a Orbot e usare Tor.\n\n\n L\'impostazione host è 127.0.0.1 o \"localhost\". Per l\'HTTP, il valore della porta è 8118. Per SOCKS, il proxy è 9050. Dovresti utilizzare SOCKS4A o SOCKS5 se possibile.\n \n\n\n PPuoi imparare altro sul proxying in Android tramite le FAQ: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot è pronto!</string>
-  <string name="wizard_final_msg">Milioni di persione in giro per il mondo usano Tor per un\'ampia varietà di ragioni.\n\nGiornalisti e blogger, difensori dei diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
-  <string name="wizard_exit_at_first_screen_toast">Perfavore configura Orbot prima di iniziare ad usarlo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il tuo dispositivo è sicuro. � possibile utilizzare l\'opzione \'Browser\' dal menù per testare il browser. \n\nVisita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help@xxxxxxxxxxxxxxxxxxxx per saperne di più.</string>
-  <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
-  <string name="pref_hs_group">Servizi nascosti</string>
-  <string name="pref_general_group">Generale</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Attenzione</string>
-  <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor efficacemente.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permessi</string>
-  <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string>
-  <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da \'Superutente\'.\n\nPerfavore prova invece la modalità \'App\' nella schermata principale.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-App abilitate</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: App chat sicura con Cifratura Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: Browser progettato per la privacy che funziona attraverso Tor</string>
-  <string name="wizard_tips_play">Cerca tutte le app del Guardian Project su Google Play</string>
-  <string name="wizard_tips_fdroid">Trova tutte le app Guardian Projec su F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Trova tutte le app Guardian Project su https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxying trasparente</string>
-  <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string>
-  <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string>
-  <string name="wizard_transproxy_none">Nessuno</string>
-  <string name="pref_transparent_tethering_title">Tethering Tor</string>
-  <string name="pref_transparent_tethering_summary">Abilita il proxying trasparente di Tor per i dispositivi connessi in tethering via WiFi e USB (necessita di riavvio)</string>
-  <string name="button_grant_superuser">Richiede accesso superuser</string>
-  <string name="pref_select_apps">Seleziona app</string>
-  <string name="pref_select_apps_summary">Scegli le applicazioni da utilizzare attraverso Tor</string>
-  <string name="pref_node_configuration">Configurazione nodo</string>
+    <!--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="button_proxy_all">Proxa tutto</string>
-  <string name="button_proxy_none">Non proxare niente</string>
-  <string name="button_invert_selection">Inverti selezione</string>
-  <string name="pref_proxy_title">Proxy di Rete in Uscita (Facoltativo)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Password del Proxy in Uscita</string>
   <string name="pref_proxy_password_summary">Password del Proxy (Facoltativo)</string>
   <string name="pref_proxy_password_dialog">Inserisci Password Proxy</string>
-  <string name="status">Stato</string>
-  <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string>
-  <string name="transparent_proxying_enabled">Proxying trasparente ABILITATO</string>
-  <string name="transproxy_enabled_for_tethering_">Proxying trasparente abilitato per il tethering</string>
-  <string name="warning_error_starting_transparent_proxying_">AVVERTIMENTO: errore nell\'avvio del TransProxy!</string>
-  <string name="transproxy_rules_cleared">Regole del TransProxy cancellate</string>
-  <string name="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo è in esecuzione sulla porta:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurazione del proxying trasparente basato su porta...</string>
-  <string name="bridge_error">Errore bridge</string>
-  <string name="bridge_requires_ip">Al fine di utilizzare la funzionalità bridge, è necessario inserire almeno l\'indirizzo IP di un bridge.</string>
-  <string name="send_email_for_bridges">Si consiglia di inviare una email a bridges@xxxxxxxxxxxxxx con la linea \"get bridges\" da sola nel corpo del messaggio da un account gmail.</string>
-  <string name="error">Errore</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>
@@ -173,10 +71,8 @@
   <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="bridges_obfuscated">Bridge mascherati</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Attiva entrate alternate nella rete Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string>
-  <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Porte raggiungibili</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porte raggiungibili dietro un firewall restrittivo</string>
   <string name="enter_ports">Inserisci porte</string>
-  <string name="enable_hidden_services">Abilita servizi nascosti</string>
-  <string name="run_servers_accessible_via_the_tor_network">esegui server accessibili attraverso la rete Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">inserire la porta per l\'host locale per i servizi nascosti</string>
-  <string name="hidden_service_ports">Porta per i servizi nascosti</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">il nome di indirizzamento per i propri servizi nascosti (generato automaticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">abilita i log di debug in output (richiede l\'uso di adb o aLogCat per esser visualizzato)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">abilita i log di debug in output (richiede l\'uso di adb o aLogCat per esser visualizzato)</string>
   <string name="project_home">Home progetto:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Licenza Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software di terze parti:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">servizio nascosto attivo:</string>
-  <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
+    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
   <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
-  <string name="unable_to_reset_tor">Riavvia il tuo dispositivo, impossibile resettare Tor!</string>
-  <string name="pref_use_sys_iptables_title">Utilizza Iptables di default</string>
-  <string name="pref_use_sys_iptables_summary">utilizza il binario di iptables installato invece di quello fornito con Orbot</string>
-  <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string>
-  <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
+    <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
   <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
   <string name="pref_use_expanded_notifications">Visualizza notifica espansa con nazione e ip dell\'nodo d\'uscita Tor</string>
   <string name="pref_use_expanded_notifications_title">Espandi notifiche</string>
-  <string name="notification_using_bridges">Bridge attivati!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Lingua</string>
-  <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
-  <string name="wizard_locale_title">Scegli Lingua</string>
-  <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">Salva impostazioni</string>
-  <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</string>
-  <string name="bandwidth_">Larghezza di Banda:</string>
-  <string name="down">giù</string>
-  <string name="up">su</string>
-  <string name="pref_disable_network_title">impedire spegnimento automatico della rete</string>
+    <string name="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="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Usa ChatSecure</string>
-  <string name="permission_manage_tor_label">Gestisci Tor</string>
-  <string name="permission_manage_tor_description">Abilita questa app per controllare il servizio Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funziona al meglio con Orfox Browser. Installarlo ora?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funziona al meglio con Orfox Browser. Installarlo ora?</string>
   <string name="install_apps_">Installare il browser?</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>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Configurazioni personalizzate di Torrc</string>
   <string name="pref_torrc_summary">SOLO ESPERTI: inserisci direttamente configurazioni torrc</string>
   <string name="pref_torrc_dialog">Torrc personalizzate</string>
-  <string name="wizard_tips_martus">Mobile Martus - App per la Documentazione dei Diritti Umani Benetech</string>
-  <string name="your_tor_public_ips_">Il tuo Tor IP pubblico è:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Perfavore disabilita quest\'app in Android-&gt;Impostazioni-&gt;Apps se stai avendo problemi con Orbot: </string>
-  <string name="app_conflict">Conflitto app</string>
-  <string name="pref_transproxy_refresh_title">Auto-Refresh TransProxy</string>
-  <string name="pref_transproxy_refresh_summary">Ri-applica regole Transproxy quando cambia lo stato della rete</string>
-  <string name="pref_transproxy_flush_title">FORZA RIMOZIONE Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Clicca qui per eliminare tutte le regole di rete Transproxy IMMEDIATAMENTE</string>
-  <string name="transparent_proxy_rules_flushed_">Regole Proxy Trasparente eliminate!</string>
-  <string name="you_do_not_have_root_access_enabled">Non ci sono i permessi di ROOT abilitati</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Potrebbe essere necessario riavviare Orbot per applicare i cambiamenti delle impostazioni.</string>
-  <string name="menu_vpn">App</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Attiva</string>
   <string name="apps_mode">Modalità VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puoi consentire alle app di attraversare Tor usando la VPN di Orbot inclusa.\n\nCiò non ti renderà anonimo, ma ti aiuterà a superare i firewall.</string>
-  <string name="send_email">Invia email</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 &amp; incollalo nell\'opzione \"Bridges\" delle impostazioni di Orbot e riavvialo.</string>
   <string name="install_orweb">Installa Orfox</string>
-  <string name="standard_browser">Browser standard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Solo i Tor Bridges standard funzionano sui dispositivi Intel x86/Atom</string>
-  <string name="vpn_default_world">Globale (Auto)</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="ports">Porte</string>
-  <string name="local_port">Porta locale</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Autorizzazione concessa</string>
-  <string name="permission_denied">Autorizzazione negata</string>
-  <string name="restore_backup">Ripristina backup</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Attiva la modalità VPN per consentire alle app di usare Tor.</string>
-  <string name="app_shortcuts">App abilitate a Tor</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Test della connessione bridge verso Tor...</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>
diff --git a/app/src/main/res/values-iw/poestrings.xml b/app/src/main/res/values-iw/poestrings.xml
index b9a1025b..bd2a440e 100644
--- a/app/src/main/res/values-iw/poestrings.xml
+++ b/app/src/main/res/values-iw/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"×?שר×?×? ×?×? ×?×?סר×? Tor שע×?×?ר×?×? ×?עק×?פת צנ×?×?ר×?. ×?ת×? ×?×?×?×? ×?נס×?ת ×?שר×?×? ×?×? Tor ×?ס×?×? ×¢\"×? ספק ×?×?×?× ×?רנ×? ש×?×?; ×?×? ס×?×? ש×? ×?שר ×?שת×?ש ×?ש×?×?×? ש×?× ×? 
-×?×?×? ×?×?× ×?×¢ צנ×?×?ר×?: ×?×? ס×?×? ×?×?×? ×?×?× ×? ×¢×?×?×?, נס×? ×?×?שת×?ש ×?×?×?×? ×?×?ר.</string>
-
-    <string name="bridges_no">×?×?×? ×?שר×?×?: ×?ת×?×?ר ×?ש×?ר×?ת ×?×? Tor</string>
-    <string name="bridges_provided">×?שר×?×? ×?ס×?פק×?×?:</string>
-    <string name="bridges_custom">×?שר ×?×?ת×?×? ×?×?ש×?ת</string>
-
-    <string name="bridges_config">תצ×?רת ×?שר</string>
-    <string name="action_done">ס×?×?×?</string>
 
     <string name="bridges_sometimes">×?פע×?×?×? ×?ת×? צר×?×? ×?שר ×?×?×? ×?×?ת×?×?ר ×?×? Tor.</string>
     <string name="action_more">ספר ×?×? ×¢×?×?</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">×?×? ×?×? ×?×?פ×?×? ×?×?ת×? ×?×?×?×?×?× ×?, ×?×?×? ×?×? ×?×¢×?×?ר ×?×? ×?×¢×?×?ר ×?ר×? ×?×?×?×?ת ×?ש.</string>
     <string name="action_vpn_choose">×?×?ר ×?×?ש×?×?×?×?</string>
 
-    <string name="status_connected">×?×?×?×?ר!</string>
-
-    <string name="loading_claim_1">×?ק×?×?×?×? ×?×?×?×?×?נת ש×?× ×? ×?×?×? ×?×? שע×?ש×? ×?ת Tor ×?×?×?×?×?!</string>
-    <string name="loading_claim_2">×?×? ×?×?×? ×?נש×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?×?×?×?× ×¢ ×?×?עק×? ×¢\"×? ×?×?×?×¢×?ת ש×?×?×?ק×?×?ת.</string>
-    <string name="loading_claim_3">×?×?שר Facebook ×?ס×?×?, ×?נש×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?×?×?×?ר ×?×? ×?×?ר×?×?×? ×?×?×? ×?שפ×?×?ת×?×?×?.</string>
-    <string name="loading_claim_4">פע×?×?× ×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?צ×?×?×¥ ×?×?×?פש×?×?ת ×?ת ×?×¢×?ת×?×?×? ×?×?×?×?× ×?ת×?×?×?.</string>
-    <string name="loading_claim_5">×?×?×?×?ר×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?×?×?×? ×?נש×?×? ×?×?פ×? רפ×?ר×?×? ×?×?רת×?ת.</string>
-    <string name="loading_claim_6">×¢×?ת×?× ×?×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?×?ק×?ר ×?×?×?×?×? ס×?פ×?ר×?×? ש×?×? ×?×?×?×?×?×?×? ×¢×?×?×?×?.</string>
-    <string name="loading_claim_7">×?נש×? עסק×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?ש×?×?ר ×¢×? ×?ס×?ר×?×?×?×?ת ×?×?×?ר×? ש×?×?×? פר×?×?×?ת.</string>
-    <string name="loading_claim_8">×¢×?×?×?×?×? ×?שת×?ש×?×? ×?-Tor ×?×?×? ×?×?×?×?×?×? ×?×?×¢×? צ×?ק ×?×?×? פ×?×? ×?×?×?×? ×?ת ×¢×?×?×?ת×?.</string>
-
-    <string name="status_connecting">×?× ×?× ×? ×?×?×?×?ר×?×? ×?×?×?×?.\" = \"×?× ×?× ×? ×?×?×?×?ר×?×? ×?×?×?×?.</string>
-
     <string name="hello">ש×?×?×?</string>
     <string name="welcome">×?ר×?×? ×?×?×? ×?×? Tor ×?× ×?×?×?.</string>
 
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index e5e33f9b..d0c716c4 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -2,126 +2,43 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ×?×?× ×? ×?פ×?×?קצ×?×?ת פר×?קס×? ×?×?× ×?×?ת ×?×?×?פשרת ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?שת×?ש ×?×?×?× ×?רנ×? ×?×?×?×?×?. Orbot × ×¢×?רת ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?רנ×? ש×?×? ×?×?×?ס×?×?ת×? ×?×?×?צע×?ת×? × ×?ת×?×?×? ×?ר×? ×?ספר ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?פש×?ת ×?רשת פת×?×?×? ×?×?ס×?×?עת ×?×? ×?×?ת×?×?× ×? ×?פנ×? ס×?×?×?×? ×?ס×?×?×?×?×? ש×? ×?×?צע×? × ×?×?×?ר ×?×?עק×? ×?×?ר רשת ×?×?×?× ×?רנ×? ×?×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×?×?×?ר×?ת ×?×?×?ש×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?×?ער×?×?ת ×?×?ס×?×? ×?ש×?×?×?ת.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">×?ת×?×? ×?עצ×?ר ×?ת Tor</string>
-  <string name="tor_proxy_service_process">ש×?ר×?ת פר×?קס×? Tor</string>
-  <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
+    <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
   <string name="status_activated">×?×?×?×?ר ×?רשת Tor</string>
   <string name="status_disabled">Orbot ×?×?×?×?</string>
   <string name="tor_process_starting">×?ת×?×?×? ×?ק×?×? Tor...</string>
   <string name="tor_process_complete">×?×?ש×?×?.</string>
-  <string name="tor_process_waiting">×?×?×?×?.</string>
-  <string name="not_anonymous_yet">×?×?×?ר×?: ×?תע×?×?ר×? ש×?×? ×?×?× ×? ×?× ×?× ×?×?×?ת ×¢×?×?×?×?! ×?×?קש×? ×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?×? ש×?ת×?פשר ש×?×?×?ש ×?פר×?קס×? HTTP (קר×? 127.0.0.1:8118) ×?×? SOCKS4A ×?×? SOCKS5 (קר×? 127.0.0.1:9050)</string>
-  <string name="menu_home">×?×?ת</string>
-  <string name="menu_browse">×?פ×?×£</string>
-  <string name="menu_settings">×?×?×?ר×?ת</string>
+    <string name="menu_settings">×?×?×?ר×?ת</string>
   <string name="menu_log">ר×?ש×?×?</string>
-  <string name="menu_info">×¢×?ר×?</string>
-  <string name="menu_start">×?ת×?×?</string>
+    <string name="menu_start">×?ת×?×?</string>
   <string name="menu_stop">עצ×?ר</string>
   <string name="menu_about">×?×?×?×?ת</string>
   <string name="main_layout_download">×?×?ר×?×?</string>
   <string name="main_layout_upload">×?×¢×?×?×?</string>
-  <string name="button_help">×¢×?ר×?</string>
-  <string name="button_close">ס×?×?ר</string>
-  <string name="button_about">×?×?×?×?ת</string>
-  <string name="button_clear_log">נק×? ר×?ש×?×?</string>
-  <string name="menu_verify">×?×?×?ק</string>
-  <string name="menu_exit">×?צ×?×?×?</string>
+    <string name="button_about">×?×?×?×?ת</string>
+    <string name="menu_exit">×?צ×?×?×?</string>
   <string name="menu_scan">סר×?ק BridgeQR</string>
   <string name="menu_share_bridge">שתף BridgeQR</string>
-  <string name="press_to_start">-× ×?×?×¢×? ×?ר×?×?×? ×?×?ת×?×?×?-</string>
-  <string name="pref_trans_proxy_group">פר×?קס×? שק×?×£ (ש×?רש × ×?רש)</string>
-  <string name="pref_trans_proxy_title">פר×?קס×? שק×?×£</string>
-  <string name="pref_trans_proxy_summary">×¢×?×?×?×? ×?×?×?×?×?×?×?ת ×¢×? ×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_all_title">×?×?×? ×?ר×? Tor</string>
-  <string name="pref_transparent_all_summary">תע×?×?ר ×?ר×? פר×?קס×?  ×¢×?×?ר ×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_port_fallback_title">×?פ×?×? פ×?ר×? פר×?קס×?</string>
-  <string name="pref_transparent_port_fallback_summary">×?×?×?ר×?: עק×?×£ פ×?ר×?×?×? נפ×?צ×?×? (80,443 ×?×?×?\'). *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_title">רש×?×?ת פ×?ר×?×?×?</string>
-  <string name="pref_transparent_port_summary">רש×?×?ת פ×?ר×?×?×? ×?פר×?קס×?. *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_dialog">×?×?×? פ×?ר×?×?×? ×?פר×?קס×?</string>
-  <string name="pref_has_root">×?ר×?ש×? ×?×?שת ש×?רש</string>
-  <string name="pref_has_root_summary">×?קש ×?×?ש×? ×¢×?×?×?× ×? ×¢×?×?ר ש×?×?×?ש ×?פר×?קס×? שק×?×£</string>
-  <string name="status_install_success">ק×?צ×?×? ×?ר×? ×?רצ×? ש×? Tor ×?×?תקנ×? ×?×?צ×?×?×?!</string>
-  <string name="status_install_fail">×?ק×?צ×?×? ×?ר×? ×?×?רצ×? ש×? Tor ×?×? × ×?תנ×? ×?×?תקנ×?. ×?×?קש×? ×?×?×?ק ×?ת ×?×?×?×? ×?×?×?×?×¢ ×? 
-tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ש×?×?×?ת ×?פ×?×?קצ×?×?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">×?×?×?×?ת Orbot</string>
-  <string name="btn_next">×?×?×?</string>
-  <string name="btn_back">×?ק×?×?×?</string>
-  <string name="btn_finish">ס×?×?×?</string>
-  <string name="btn_okay">×?×?ש×?ר</string>
+    <string name="btn_okay">×?×?ש×?ר</string>
   <string name="btn_cancel">×?×?×?×?×?</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">פר×?×?×? ×?ס×?×?×?×?×? ש×? Orbot </string>
   <string name="wizard_details_msg">Orbot ×?×?×? ×?פ×?×?קצ×?×?ת ק×?×? פת×?×? ×?×?×?×?×?ת ×?ת Tor, LibEvent ×?-Polipo. ×?×?×? ×?ת×?×?ר ×?רשת Tor ×?×?×?צע×?ת שרת פר×?קס×? HTTP ×?ק×?×?×? (8118) ×?שרת פר×?קס×? SOCKS (פ×?ר×? 9050). Orbot ×?×?×?×?×? ×?× ×?סף ×¢×? ×?רש×?×?ת ר×?×? ×?נת×? ×?ת ×?×? תע×?×?רת ×?×?×?× ×?רנ×? ש×? ×?×?×?ש×?ר ×?ר×? Tor ×?×?ר×?רת ×?×?×?×?.</string>
-  <string name="wizard_permissions_root">× ×?תנ×? ×?רש×?×?</string>
-  <string name="wizard_permissions_stock">×?רש×?×?ת Orbot</string>
-  <string name="wizard_premissions_msg_root">×?צ×?×?×?! ×?×?×?×?× ×? ×?×? ×?ש ×?×? ×?רש×?×?ת ש×?רש ×?×?×?פשר×?ת ×?ש×?×?×? Orbot. ×?× ×?× ×? נשת×?ש ×?×?×?×? ×?×?×? ×?×?×?×?×?×?.</string>
-  <string name="wizard_permissions_msg_stock">×?×?×?×? ש×?×? ×?×? × ×?רש, Orbot ×?×?×?×?×? ×?×?פ×?×? ×?×?×?×?ת ×?×?×? ×?×?ק ×?×?תר ×?×? ×?×?×?ש×?ר ש×?×? ×?ש ×?×?ש×? ×¢×?×?×?× ×?. תשת×?ש ×?×?פת×?ר ×?×?×?×? ×?×?×? ×?ק×?×? ×?×?×?×?ת ×¢×? ש×? Orbot !</string>
-  <string name="wizard_permissions_no_root">×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×?×?×?× ×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?, רק ת×?×?×?×? שתשת×?ש ×?×?פ×?×?קצ×?×?ת שנ×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot.</string>
-  <string name="wizard_permissions_consent">×?×?נת×? ×?×?× ×? ×?×¢×?×?×£ ×?×?×?ש×?×? ×?×?×? Superuser</string>
-  <string name="wizard_permission_enable_root">×?פשר ×?×?שת ש×?רש ×¢×?×?ר Orbot</string>
-  <string name="wizard_configure">×?×?×?ר ×¢×?×?×?×? ×?×?×?צע×?ת Tor</string>
-  <string name="wizard_configure_msg">Orbot × ×?תנת ×?×? ×?פשר×?ת ×?×?×?×?×? ×?ת ×?×? תע×?×?רת ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor ×?×? ×?×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?נפר×?.</string>
-  <string name="wizard_configure_all">×?שת×?ש ×?פר×?קס×? ×?×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="wizard_configure_select_apps">×?×?ר ×?פ×?×?קצ×?×?ת ×?ס×?×?×?×?ת ×¢×?×?ר Tor</string>
-  <string name="wizard_tips_tricks">Orbot ×?ת×?פשר ×¢×? ×?×?×? ×?פ×?×?קצ×?×?ת</string>
-  <string name="wizard_tips_msg">×?×?פ×?×?קצ×?×?ת ×?ת×?ת פ×?ת×?×? ×?×¢×?×?×?×? ×¢×? Orbot. ×?×?×¥ ×¢×? ×?×? ×?פת×?ר ×?×?תקנ×? ×?×?×?×?×?ת, ×?×? ש×?ת×? ×?×?×?×? ×?×?צ×?×? ×?×?ת×? ×?×?ר ×?×? ×? Google Play, ×?×?תר GuardianProject.info ×?×?
-×?ר×?  F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ת×?×?נת ×?סר×?×? ×?×?×?×?×?×? ×?×?×?×?×?×?ת ×?×?× ×?ר×?×?×?×?</string>
-  <string name="wizard_tips_proxy">×?×?×?ר×?ת פר×?קס×? - ×?×?×? ×?×?×? ×?×?×?×?×?ר ×?פ×?×?קצ×?×?ת ×?×¢×?×?×? ×¢×? Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ×?פ×?×?קצ×?×?ת ×?× ×?×¢ ×?×?פ×?ש</string>
-  <string name="wizard_tips_twitter">ק×?×¢ פר×?קס×? Twitter ×?×?×?ר×? \"localhost\" ×?×?פ×?ר×? 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ×?ער×? ש×?×¢×?ר×?×? ×?×¢×?ת×?× ×?×?×? ×¢×? ש×?×?×?ש ×?-Tor ×?×?×?× ×? ×¢×? ×¢×?×?×?ת×?.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">×?×?×?ר×?ת פר×?קס×?</string>
-  <string name="wizard_proxy_help_msg">×?×? ×?פ×?×?קצת ×?×?× ×?ר×?×?×?×? ש×?ת×? ×?שת×?ש ת×?×?×?ת ×?פר×?קס×? ×?×?×?סס HTTP ×?×? SOCKS, ת×?×?×? ×?×?×?×?×?ר ×?×?ת×? ×?×¢×?×?×? ×¢×? Orbot ת×?ת Tor. \n\n\n ×?×?×?×?ר×?ת ×?×?: ש×? ×?שרת ×?×?×? 127.0.0.1 ×?×? \"localhost\". ×¢×?×?ר HTTP, ×?פ×?ר×? ×?×?×? 8118. ×¢×?×?ר SOCKS, ×?פ×?ר×? ×?×?×? 9050. ×¢×?×?×? ×?×?שת×?ש ×?SOCKS4A ×?×? SOCKS5 ×?×? ×?פשר.\n \n\n\n ת×?×?×? ×?×?×?×?×? ×¢×?×? ×?×?×?×?ת פר×?קס×? ×?×?× ×?ר×?×?×?×? ת×?ת ×¢×?×?×? ×?ש×?×?×?ת ×?נפ×?צ×?ת ש×?× ×? ×?×?ת×?×?ת: http://tinyurl.com/proxyandroid </string>
-  <string name="wizard_final">Orbot ×?×?×?×?!</string>
-  <string name="wizard_final_msg">×?×?×?×?×?× ×? ×?נש×?×? ×?ר×?×?×? ×?×¢×?×?×? ×?שת×?ש×?×? ×?Tor ×?ס×?×?×?ת ר×?×?ת.\n\n ×¢×?ת×?× ×?×?×? ×?×?×?×?×?ר×?×?, פע×?×?×? ×?×?×?×?×?ת ×?×?×?, ש×?×?ר×?×?, ×?×?×?×?×?×?, ת×?×?×?×?×?×?, ×?×?ר×?×? ×?×?ש×?ר×?×? ×?×?×?×?×?×?×? ×?×?×? ×?×?ר×?×?×? פש×?×?×?×?... ×?×¢×?ש×?×? ×?×? ×?ת×?!</string>
-  <string name="wizard_exit_at_first_screen_toast">×?× ×? ×?×?×?ר ×?ת Orbot ×?פנ×? שת×?×?×? ×?×?ת×?×?×? ×?×?שת×?ש ×?×?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">×?×?ר ×?×? ×?×?×?×?×? ×?ת ×?פ×?פ×? ×?רשת ש×?×? ×?×?×?×? https://check.torproject.org ×?×?×? ×?ר×?×?ת ×?×? Orbot ×?×?×?×?ר×? ×?ר×?×?×? ×?×?×? ×?×? ×?ת×? ×?×?×?×?ר ×?רשת Tor.</string>
-  <string name="pref_hs_group">×?×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="pref_general_group">×?×?×?×?</string>
+    <!--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-->
-  <string name="wizard_warning_title">×?×?×?ר×?</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">×?רש×?×?ת</string>
-  <string name="wizard_permissions_root_msg1">×?ת×? ×?×?×?×? ×?×?×¢× ×?ק ×?×?פ×?×?קצ×?×? Orbot ×?×?שת \'Superuser\' ×?×?×? ×?×?פשר ×?×?פ×?×?× ×?×? ×?תק×?×?×?×? ×?×?×? ×?×?ש×?, פר×?קס×? שק×?×£.</string>
-  <string name="wizard_permissions_root_msg2">×?×? ×?ת×? ×?×? ר×?צ×? ×?עש×?ת ×?ת ×?×?, ×?× ×? ×?קפ×? ×?×?שת×?ש ×?×?פ×?×?קצ×?×?ת ש×?×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-×?×?ש×?×?×?×? ×?×?פע×?×?×?</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ×?פ×?×?קצ×?×?ת ×?סר×?×? ×¢×? ×?צפנת Off-the-Record</string>
-  <string name="wizard_tips_play">×?צ×? ×?ת ×?×? ×?פ×?×?צ×?×?ת Guardian Project ×?צ×? Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">פר×?קס×? שק×?×£</string>
-  <string name="wizard_transproxy_msg">×?×? ×?×?פשר ×?×?פ×?×?קצ×?×?ת ש×?×? ×?ר×?×¥ ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ר×? רשת Tor ×?×?×? ×?×? תצ×?ר×?.</string>
-  <string name="wizard_transproxy_hint">(ס×?×? ת×?×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?)</string>
-  <string name="wizard_transproxy_none">×?×?×?×?</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">×?×?פשר ×¢×?×?×?×? ×¢×? פר×?קס×? שק×?×£ ×¢×?×?ר רשת ×?×?×?×?×?×?ת ×?×?×?ש×?ר×?  USB Tethered (×?×?רש ×?ת×?×?×? ×?×?×?ש)</string>
-  <string name="button_grant_superuser">×?ר×?ש ×?×?ש×?ר Superuser</string>
-  <string name="pref_select_apps">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_select_apps_summary">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_node_configuration">×?×?×?ר×?ת Node</string>
+    <!--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="button_proxy_all">×?×¢×?ר ×?×?×? ×?ר×? פר×?קס×?</string>
-  <string name="button_proxy_none">×?×? תשת×?ש ×?פר×?קס×?</string>
-  <string name="button_invert_selection">×?פ×?×? ×?×?×?ר×?</string>
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+    <string name="pref_proxy_type_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>
@@ -136,18 +53,8 @@ tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="pref_proxy_password_title">ס×?ס×?×? ש×? Outbound Proxy</string>
   <string name="pref_proxy_password_summary">ס×?ס×?ת פר×?קס×? (רש×?ת)</string>
   <string name="pref_proxy_password_dialog">×?×?×? ס×?ס×?ת פר×?קס×?</string>
-  <string name="status">ס×?×?×?ס</string>
-  <string name="setting_up_full_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£...</string>
-  <string name="setting_up_app_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס ×?פ×?×?קצ×?×?ת...</string>
-  <string name="transparent_proxying_enabled">פר×?קס×? שק×?×£ ×?×?×?פשר</string>
-  <string name="transproxy_enabled_for_tethering_">פר×?קס×? שק×?×£ ×?×?×?פשר ×? Tathering!</string>
-  <string name="warning_error_starting_transparent_proxying_">×?×?×?ר×?: ש×?×?×?×? ×?ת×?×?×?×? ×?ת ×?פר×?קס×? ×?שק×?×£!</string>
-  <string name="transproxy_rules_cleared">×?×?×?×? TransProxy ×?×?×?ר×?</string>
-  <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo רץ ×¢×? פ×?ר×?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס פ×?ר×?...</string>
-  <string name="bridge_error">ש×?×?×?ת ×?שר</string>
-  <string name="error">ש×?×?×?×?</string>
+    <string name="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>
@@ -156,8 +63,7 @@ tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="use_only_these_specified_nodes">×?שת×?ש *רק* ×?צ×?ת×?×? ×?צ×?×?× ×?×? ×?×?×?</string>
   <string name="bridges">×?שר×?×?</string>
   <string name="use_bridges">×?שת×?ש ×?×?שר×?×?</string>
-  <string name="bridges_obfuscated">×?שר×?×? ×?×¢×?רפ×?×?×?</string>
-  <string name="ip_address_and_port_of_bridges">×?ת×?×?ת ×?-IP ×?×?צ×?×?×? ש×? ×?×?שר×?×?</string>
+    <string name="ip_address_and_port_of_bridges">×?ת×?×?ת ×?-IP ×?×?צ×?×?×? ש×? ×?×?שר×?×?</string>
   <string name="enter_bridge_addresses">×?×?נס ×?ת×?×?×?ת ×?שר</string>
   <string name="relays">×?×?סר×?×?</string>
   <string name="relaying">×?×?ס×?ר</string>
@@ -171,44 +77,22 @@ tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="reachable_addresses">×?ת×?×?×?ת ×?×?×?ש×? ×?×?</string>
   <string name="reachable_ports">פ×?ר×?×?×? ×?×?×?ש×? ×?×?</string>
   <string name="enter_ports">×?×?×? פ×?ר×?×?×?</string>
-  <string name="enable_hidden_services">×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="enter_localhost_ports_for_hidden_services">×?×?×? פ×?ר×?×?×? ש×? localhost ×¢×?×?ר ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="hidden_service_ports">פ×?ר×? ×?ש×?ר×?ת×?×? ×?נסתר×?×?</string>
-  <string name="project_home">×?תר×? ×?פר×?×?ק×?:</string>
+    <string name="project_home">×?תר×? ×?פר×?×?ק×?:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">×?רש×?×?×? ש×? Tor</string>
-  <string name="https_torproject_org">https://torproject.org/</string>
-  <string name="third_party_software">ת×?×?× ×?-צ×?-×?׳: </string>
+    <string name="third_party_software">ת×?×?× ×?-צ×?-×?׳: </string>
   <string name="tor_version">Tor: https://www.torproject.org</string>
   <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
   <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
+    <string name="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
   <string name="something_bad_happened">×?ש×?×? רע ×?תר×?ש. ×?×?×?ק ×?ת ×?×?×?×?×?</string>
-  <string name="hidden_service_on">ש×?ר×?ת נסתר ×?:</string>
-  <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
+    <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
   <string name="unable_to_start_tor">×?×? ×?ס×?×?×? ×?×?ת×?×?×? ×?ת Tor:</string>
-  <string name="unable_to_reset_tor">×?ת×?×? ×?ת ×?×?×?ש×?ר ש×?×?, ×?×?×? ×?פשר×?ת ×?×?פע×?×? ×?×?×?ש ×?ת Tor!</string>
-  <string name="pref_use_sys_iptables_title">×?שת×?ש ×?×?ר×?ר×?ת ×?×?×?×?×? ש×? iptables</string>
-  <string name="pref_use_persistent_notifications">×?ש×?×?ר ת×?×?×? ×?ת ×?×?×?ק×?×? ×?סר×?×? ×?×?×?×? ×?ש×?×?ר×?×?×? ×?×?×?×?ר</string>
-  <string name="notification_using_bridges">×?שר×?×? ×?×?×?פשר×?×?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">שפ×?</string>
-  <string name="set_locale_summary">×?×?ר ×?ת ×?×?ק×?×?×?×?ת ×?×?שפ×? ש×? Orbot</string>
-  <string name="wizard_locale_title">×?×?ר שפ×?</string>
-  <string name="wizard_locale_msg">×?ש×?ר ×?ר×?רת ×?×?×?×? ×?×? ×?×?×?×£ ×?שפ×? ×?× ×?×?×?×?ת</string>
-  <string name="powered_by">×?×?פע×? ×?×?×?צע×?ת Tor</string>
-  <string name="btn_save_settings">ש×?×?רת ×?×?×?ר×?ת</string>
-  <string name="no_internet_connection_tor">×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?; ת×?ר ×?×?ת×?×?...</string>
-  <string name="bandwidth_">ר×?×?×? פס:</string>
-  <string name="down">×?×?×?</string>
-  <string name="up">×?×¢×?×?</string>
-  <string name="pref_disable_network_summary">×?×?×? ×?ת Tor ×?×?שר ×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?</string>
+    <string name="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="menu_use_chatsecure">×?פע×? ×?ת ChatSecure</string>
-  <string name="permission_manage_tor_label">× ×?×? Tor</string>
-  <string name="permission_manage_tor_description">×?פשר ×?ת ×?פ×?×?קצ×?×? ×?×? ×?×?×? ×?ש×?×?×? ×?ש×?ר×?ת Tor</string>
-  <string name="install_apps_">×?×?תק×?×? ×?פ×?×?קצ×?×??</string>
+    <string name="install_apps_">×?×?תק×?×? ×?פ×?×?קצ×?×??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">×?×?×? ×?×?×?×?ר ×?רשת. ×?×?×?×? ×?ת Tor....</string>
   <string name="network_connectivity_is_good_waking_tor_up_">×?×?×?×?×?ר ×¢×?×?×? ×?×?×?. ×?×¢×?ר ×?ת Tor...</string>
   <string name="updating_settings_in_tor_service">×?×¢×?×?×? ×?×?×?ר×?ת Tor ×?×?×?ש×?ר</string>
@@ -217,10 +101,7 @@ tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="pref_transport_title">Tor TransProxy Port</string>
   <string name="pref_transport_dialog">×?×?×?רת ×?פ×?ר×? ש×? TransProxy</string>
   <string name="pref_dnsport_title">Tor DNS Port</string>
-  <string name="your_tor_public_ips_">×?IPs ×?×?×?צ×?× ×?×?×? ש×?×? ×¢×? Tor:</string>
-  <string name="you_do_not_have_root_access_enabled">×?×?×? ×?×? ×?×?שת ר×?×? ×?×?×?פשרת</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצ×?ר×? ×?×?×?×?ת ×?×?×?פע×?×? ×?ת Orbot ×¢×? ×?נת ×?×?×?×?×? ×?ת ×?ש×?× ×?×? ×?×?×?×?ר×?ת.</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -229,5 +110,4 @@ tor-assistants@xxxxxxxxxxxxxx</string>
   <string name="get_bridges_web">×?תר</string>
   <string name="activate">×?פע×?</string>
   <string name="send_email">ש×?×? ×?×?×?\"×?</string>
-  <string name="standard_browser">×?פ×?פ×? ר×?×?×?</string>
 </resources>
diff --git a/app/src/main/res/values-ja/poestrings.xml b/app/src/main/res/values-ja/poestrings.xml
index 6492f8de..dd236cac 100644
--- a/app/src/main/res/values-ja/poestrings.xml
+++ b/app/src/main/res/values-ja/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">ã??ã?ªã??ã?¸ã?¯æ¤?é?²ã??å??é?¿ã??ã??ã??ã??ã?®Torã?ªã?¬ã?¼ã?§ã??ã??Torã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?­ã??ã?¤ã??ã?¼ã?«ã??ã?­ã??ã?¯ã??ã??ã??ã??ã??ã??ã?ªã??ã?¸ã??使ã?£ã?¦ã?¿ã?¦ä¸?ã??ã??ã??æ§?ã??ã?ªã?¿ã?¤ã??ã?®ã??ã?ªã??ã?¸ã??ã??ã??ã??ã??ã??ã?¦ã?¿ã?¤ã??å?¥ã?®é??ã??æ?¹æ³?ã?§æ¤?é?²ã??å??é?¿ã??ã?¾ã??ã??
-ã??ã??ã??ã?ªã??ã?¸ã??ã??ã?¾ã??ã??ã??ã?ªã??å ´å??ã??ã??ã?ªã??ã?¸ã??å??ã??æ?¿ã??ã?¦ã?¿ã?¦ä¸?ã??ã??ã??</string>
-
-    <string name="bridges_no">ã??ã?ªã??ã?¸ã??使ç?¨ã??ã?ªã?? : Tor ã?«ç?´æ?¥æ?¥ç¶?</string>
-    <string name="bridges_provided">æ??ä¾?ã??ã??ã??ã??ã?ªã??ã?¸:</string>
-    <string name="bridges_custom">ã?«ã?¹ã?¿ã? ã??ã?ªã??ã?¸</string>
-
-    <string name="bridges_config">ã??ã?ªã??ã?¸è¨­å®?</string>
-    <string name="action_done">��</string>
 
     <string name="bridges_sometimes">Torã?¨æ?¥ç¶?ã??ã??ã?«ã?¯ã??ã??ã?ªã??ã?¸ã??使ã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?ªã??ã??</string>
     <string name="action_more">ã??ã?£ã?¨è©³ã??ã??</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">å®?å?¨ã?ªå?¿å??æ?§ã?§ã?¯ã?ªã??ã??ã??ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??æ?¦ã??æ??ã??ã??ã?«ã?¯å½¹ç«?ã?¡ã?¾ã??ã??</string>
     <string name="action_vpn_choose">ã?¢ã??ã?ªã??é?¸æ??</string>
 
-    <string name="status_connected">����!</string>
-
-    <string name="loading_claim_1">æ??ã??ã?®å¤?æ§?ã?ªã?³ã??ã?¥ã??ã??ã?£ã?¼ã?¯Torã??ç´ æ?´ã??ã??ã??ã??ã??ï¼?</string>
-    <string name="loading_claim_2">å¹³å?¡ã?ªäººã??ã?¯ã??ã?ªã?³ã?©ã?¤ã?³ã??ã?¼ã?±ã??ã?£ã?³ã?°ã??é?¤ã??ã??ã??ã??ã?«Torã??å?©ç?¨ã??ã?¾ã??ã??</string>
-    <string name="loading_claim_3">Facebookã??ã??ã?­ã??ã?¯ã??ã??ã??æ??ã?«ã??人ã??ã?¯Torã??å?©ç?¨ã??ã?¦å®¶æ??ã??å??é??ã?¨å®?å?¨ã?«ã?¤ã?ªã??ã??ç¶?ã??ã?¾ã??ã??</string>
-    <string name="loading_claim_4">æ´»å??家ã?¯Torã??å?©ç?¨ã??ã?¦ã??è?ªç?±ã?«æ??è¦?ã??è¨?ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??</string>
-    <string name="loading_claim_5">ã??ã?­ã?¬ã?¼ã?¯Torã??å?©ç?¨ã??ã?¦ã??社ä¼?æ?¹è?¯ã?¸ã?®æ?¯æ??ã??å?¼ã?³é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??</string>
-    <string name="loading_claim_6">äº?件è¨?è??ã?¯Torã??å?©ç?¨ã??ã?¦ã??å®?å?¨ã?«è¨?äº?ã?®ã??ã??ã?«æ??å ±ã??é??ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??</string>
-    <string name="loading_claim_7">å®?業家ã?¯Torã??å?©ç?¨ã??ã?¦ã??ä¼?社ã?®ä¼?業æ?¦ç?¥ã??é? ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??</string>
-    <string name="loading_claim_8">å?´å??è??ã?¯Torã??å?©ç?¨ã??ã?¦ã??ä»?äº?ã??失ã??ã??ã?¨ã??æ??ã??ã??ã?«æ­£ç¾©ã?®ã??ã??ã?«æ?¦ã??ã?¾ã??ã??</string>
-
-    <string name="status_connecting">æ??ã??ã?¯ã??ã??ã?ªã??ã??ã??äº?ã??ã?«æ?¥ç¶?ã??ã?¾ã??ã??</string>
-
     <string name="hello">ã??ã??ã?«ã?¡ã?¯</string>
     <string name="welcome">ã?¢ã??ã?¤ã?«ç?? Tor ã?¸ã??ã??ã??ã??</string>
 
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a3226fcc..50797fbb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbotã?¯ä»?ã?®ã?¢ã??ã?ªã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã??å®?å?¨ã?«ä½¿ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??ã??ã?ªã?¼ã?®ã??ã?­ã?­ã?·ã?¢ã??ã?ªã?§ã??ã??Orbotã?§ã?¯ã??Torã??ç?¨ã??ã?¦ã??ã?ªã??ã?®ç«¯æ?«ã?®ã??ã?©ã??ã?£ã??ã?¯ã??æ??å?·å??ã??ã??ä¸?ç??中ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??中ç¶?ã??ã??ã??ã?¨ã?§ã??ã??ã?®ã??ã?©ã??ã?£ã??ã?¯ã??é? ã??ã?¾ã??ã??Torã?¯ã??ã?ªã?¼ã?®ã?½ã??ã??ã?¦ã?§ã?¢ã?¨ã?ªã?¼ã??ã?³ã?ªã??ã??ã??ã?¯ã?¼ã?¯ã?§ã??ã??ã??ã?¦ã?¼ã?¶ã?¼ã?®è?ªç?±ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã??è??ã??ã??ç?£è¦?æ´»å??ã??ã??æ©?å¯?ã?®ã??ã?¸ã??ã?¹æ´»å??ã??å?½å®¶ã?«ã??ã??ã??ã?©ã??ã?£ã??ã?¯å??æ??ã??ã??身ã??å®?ã??ã??ã?¨ã??å?©ã??ã?¦ã??ã??ã?¾ã??ã??</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Torã??èµ·å??ã?»å??æ­¢ã??ã??</string>
-  <string name="tor_proxy_service_process">Torã??ã?­ã?¯ã?·ã?µã?¼ã??ã?¹</string>
-  <string name="status_starting_up">Orbotã??é??å§?ã??ã??ã?¦ã??ã?¾ã??...</string>
+    <string name="status_starting_up">Orbotã??é??å§?ã??ã??ã?¦ã??ã?¾ã??...</string>
   <string name="status_activated">Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??</string>
   <string name="status_disabled">\"Orbotã??解é?¤ã??ã??ã?¾ã??ã??</string>
   <string name="status_shutting_down">TorServiceã??çµ?äº?ã??ã?¦ã??ã?¾ã??</string>
   <string name="tor_process_starting">Torã?¯ã?©ã?¤ã?¨ã?³ã??ã??é??å§?ã??ã?¦ã??ã?¾ã??...</string>
   <string name="tor_process_complete">��</string>
-  <string name="tor_process_waiting">ã??å¾?ã?¡ã??ã? ã??ã??</string>
-  <string name="not_anonymous_yet">è­¦å??:ã??ã?®é??ä¿¡ã?¯ã?¾ã? å?¿å??å??ã??ã??ã?¦ã??ã?¾ã??ã??ï¼?ã??HTTP proxy 127.0.0.1:8118ã??ã??ã?? SOCKS4A ã?¾ã??ã?¯ SOCKS5 proxy 127.0.0.1:9050ã??ã??å?©ç?¨ã??ã??ã??ã??ã?«ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³å?´ã?§è¨­å®?ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="menu_home">ã??ã?¼ã? </string>
-  <string name="menu_browse">�覧</string>
-  <string name="menu_settings">設�</string>
+    <string name="menu_settings">設�</string>
   <string name="menu_log">履歴</string>
-  <string name="menu_info">ã??ã?«ã??</string>
-  <string name="menu_apps">ã?¢ã??ã?ª...</string>
-  <string name="menu_start">ã?¹ã?¿ã?¼ã??</string>
+    <string name="menu_start">ã?¹ã?¿ã?¼ã??</string>
   <string name="menu_stop">å??æ­¢</string>
   <string name="menu_about">æ??å ±</string>
-  <string name="menu_promo_apps">ã?¢ã??ã?ªã??å?¥æ??â?¦</string>
-  <string name="main_layout_download">ã??ã?¦ã?³ã?­ã?¼ã??</string>
+    <string name="main_layout_download">ã??ã?¦ã?³ã?­ã?¼ã??</string>
   <string name="main_layout_upload">ã?¢ã??ã??ã?­ã?¼ã??</string>
-  <string name="button_help">ã??ã?«ã??</string>
-  <string name="button_close">é??ã??ã??</string>
-  <string name="button_about">ã?«ã?¤ã??ã?¦</string>
-  <string name="button_clear_log">ã?­ã?°ã??å??é?¤ã??ã??</string>
-  <string name="menu_verify">確�</string>
-  <string name="menu_exit">��</string>
+    <string name="button_about">ã?«ã?¤ã??ã?¦</string>
+    <string name="menu_exit">��</string>
   <string name="menu_scan">ã??ã?ªã??ã?¸QRã??ã?¹ã?­ã?£ã?³</string>
   <string name="menu_share_bridge">ã??ã?ªã??ã?¸QRã??å?±æ??</string>
-  <string name="press_to_start">- é?·æ?¼ã??ã??ã?¦èµ·å?? -</string>
-  <string name="pref_trans_proxy_group">é??é??ã??ã?­ã?­ã?· (è¦?root)</string>
-  <string name="pref_trans_proxy_title">é??é??ã??ã?­ã?­ã?·</string>
-  <string name="pref_trans_proxy_summary">ã?¢ã??ã?ªã?®è?ªå??Torå??中</string>
-  <string name="pref_transparent_all_title">å?¨ã?¦ã??Torå??</string>
-  <string name="pref_transparent_all_summary">å?¨ã?¦ã?®ã?¢ã??ã?ªã??Torçµ?ç?±ã?§ä½¿ã??</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">è­¦å??:é??常ã?®ã??ã?¼ã??(80,443ç­?)ã??è¿?å??ã??ã??å?¨ã?¦ã??ã??ã??æ??å®?ã?¢ã??ã?ªã??ã?¢ã?¼ã??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="pref_transparent_port_title">ã??ã?¼ã??ä¸?覧</string>
-  <string name="pref_transparent_port_summary">ã??ã?­ã?­ã?·ã??é??ã??ã??ã?¼ã??ã??*è­¦å??*ã??ã??å?¨ã?¦ã??ã??ã??æ??å®?ã?¢ã??ã?ªã??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="pref_transparent_port_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??ç?ªå?·ã??å?¥å??</string>
-  <string name="pref_has_root">ã?«ã?¼ã??ã?¢ã?¯ã?»ã?¹ã?®è¨±å?¯ã??è¦?æ±?ã??ã?¾ã??</string>
-  <string name="pref_has_root_summary">é??é??ã??ã?­ã?­ã?·ã?®ã??ã??ã?«root権é??ã??å¿?è¦?ã?§ã??</string>
-  <string name="status_install_success">Torã??ã?¤ã??ã?ªã?¤ã?³ã?¹ã??ã?¼ã?«ã??æ??å??ã??ã?¾ã??ã??</string>
-  <string name="status_install_fail">Torã??ã?¤ã??ã?ªã??ã?¡ã?¤ã?«ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??ã?­ã?°ã??調ã?¹ã?¦ã??é??ç?¥ã??tor-assistants@xxxxxxxxxxxxxxã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="title_error">ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?¨ã?©ã?¼</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbotã?«ã?¤ã??ã?¦</string>
-  <string name="btn_next">次</string>
-  <string name="btn_back">æ?»ã??</string>
-  <string name="btn_finish">��</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">権é??ã??å??å¾?å®?äº?</string>
-  <string name="wizard_permissions_stock">Orbotã?®æ¨©é??</string>
-  <string name="wizard_premissions_msg_root">Orbotã??root権é??ã??å??å¾?ã??ã??ã??ã?¨ã??確èª?ã??ã?¾ã??ã??ã??å?¨ã?¦ã?®æ©?è?½ã??å?©ç?¨ã?§ã??ã?¾ã??ã??</string>
-  <string name="wizard_permissions_msg_stock">Orbotã?¯rootå??ã??ã??ã??端æ?«ã?§ã?¯å?¨ã?¦ã?®æ©?è?½ã??æ´»ç?¨ã?§ã??ã?¾ã??ã??ä¸?ã?®ã??ã?¿ã?³ã??æ?¼ã??ã?¦Orbotã?«ç®¡ç??è??権é??ã??ä¸?ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_permissions_no_root">rootå??ã??ã?¦ã??ã?ªã??ã?£ã??ã??ã??ã??ã??ã??ã??rootå??ã??ä½?ã?®ã??ã?¨ã? ã??ã??ã??ã??ã?ªã??æ?¹ã?¯ã??Orbotä¸?ã?§å??ä½?確èª?ã??å??ã??ã?¦ã??ã??ã?¢ã??ã?ªã? ã??ã??使ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_permissions_consent">Superuserã??å?©ç?¨ã??ã??ã?«ç¶?è¡?</string>
-  <string name="wizard_permission_enable_root">Orbotã?«root権é??ã??ä¸?ã??ã??</string>
-  <string name="wizard_configure">Torã??ã?½ã??ã??ã?¦ã?§ã?¢ã?«ä½¿ç?¨ã??ã??設å®?</string>
-  <string name="wizard_configure_msg">Orbotã?§ã?¯å?¨ã?¦ã?®ã?¢ã??ã?ªã?«Torã??ã?­ã?­ã?·ã??é??ã??ã??ã??Torã?¢ã??ã?ªã??使ã??å??ã??ã?®ã?¢ã??ã?ªã??æ??å®?ã?§ã??ã?¾ã??ã??</string>
-  <string name="wizard_configure_all">å?¨ã?¦ã?®ã?¢ã??ã?ªã?«Torã??ã?­ã?­ã?·ã??é??ã??</string>
-  <string name="wizard_configure_select_apps">æ??å®?ã??ã??ã?¢ã??ã?ªã? ã??ã?«Torã??ã?­ã?­ã?·ã??é??ã??</string>
-  <string name="wizard_tips_tricks">Orbotã??æ??å?¹å??ã??ã??ã??ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_msg">以ä¸?ã?®ã?¢ã??ã?ªã?¯Orbotç?¨ã?«ä½?ã??ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã??ã??ã?®ã??ã?¿ã?³ã??æ?¼ã??ã?¨ä»?ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã?§ã??ã?¾ã??ã??Google Playã??ã??ã??å??ã??ã??ã?®ã??æ?¢ã??ã?¾ã??ã??</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android ç?¨ã?®ã?»ã?­ã?¥ã?¢ã?ªã?¤ã?³ã?¹ã?¿ã?³ã??ã?¡ã??ã?»ã?¼ã?¸ã?¯ã?©ã?¤ã?¢ã?³ã??</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Orbotã?§ã?¢ã??ã?ªã??å??ã??ã??ã??ã??ã?®æ??é ?æ?¸</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo æ¤?ç´¢ã?¨ã?³ã?¸ã?³ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_twitter">Twitter proxyã??ã??localhostã??ã?¨8118ç?ªã??ã?¼ã??ã?«å??ã??ã??ã??</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ã?¹ã??ã?¼ã?ªã?¼ã??ä½?æ??ã??ã?¦ã??ã?»ã?­ã?¥ã?ªã??ã?£ã?®ã??ã??Torã?§æ®?ã??ã?¾ã??!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">ã??ã?­ã?­ã?·è¨­å®?</string>
-  <string name="wizard_proxy_help_msg">Androidã?¢ã??ã?ªã??HTTPã??SOCKSã??ã?­ã?­ã?·ã??å?©ç?¨ã?§ã??ã??å ´å??ã??Orbotã??使ã?£ã?¦Toræ?¥ç¶?ã??ã??ã??ã??ã?¨ã??å?¯è?½ã?§ã??ã??\n\n\n ã??ã?¹ã??設å®?ã?¯127.0.0.1ã?¾ã??ã?¯localhostã?§ã??ã??HTTPã?§ã?¯ä½¿ç?¨ã??ã?¼ã??ã?¯8118ã?§ã??ã??SOCKSã?§ã?¯9050ã?§ã??ã??å?¯è?½ã?§ã??ã??ã?°SOCKS4Aã??SOCKS5ã?®å?©ç?¨ã??æ?¨å¥¨ã??ã?¾ã??ã??\n \n\n\n Androidä¸?ã?®ã??ã?­ã?­ã?·ã?«ã?¤ã??ã?¦å­¦ã?³ã??ã??å ´å??ã?¯ http://tinyurl.com/proxyandroid ã?®FAQã??å??ç?§ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_final">Orbotã?®æº?å??ã??å®?äº?ã??ã?¾ã??ã??</string>
-  <string name="wizard_final_msg">ä¸?ç??中ã?§æ?°ç?¾ä¸?人ã??æ§?ã??ã?ªç??ç?±ã?§Torã??å?©ç?¨ã??ã?¦ã??ã?¾ã??ã??\n\nã?¸ã?£ã?¼ã??ã?ªã?¹ã??ã??ã??ã?­ã?¬ã?¼ã??人権å?£ä½?ã??æ³?ç??æ©?é?¢ã??è»?é??ã??ä¼?業ã??ç?¬è£?å?½å®¶ã?®å¸?æ°?ã??æ?®é??ã?®å¸?æ°?ã??â?¦ ã??ã??ã?¦ã??ã?ªã??ã??å??ã??ã??ã??ã?«å?©ç?¨ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??!</string>
-  <string name="wizard_exit_at_first_screen_toast">使ç?¨ã??é??å§?ã??ã??å??ã?«Orbotã??設å®?ã??ã?¦ã??ã? ã??ã??!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ­£å¸¸ã?«æ?¥ç¶?ã??ã?¾ã??ã?? - ã??ã??ã??ã??使ã??ã?®ç«¯æ?«ã??å®?å?¨ã? ã?¨ã?¯é??ã??ã?¾ã??ã??ã??ã??ã??ã?©ã?¦ã?¶ã??ã??ã?¿ã?³ã??使ç?¨ã??ã?¦æ?¥ç¶?ã?®ã??ã?¹ã??ã??ã?§ã??ã?¾ã??ã?? \n\nã??ã??ã?«è©³ç´°ã?¯https://guardianproject.info/apps/orbot ã??å??ç?§ã??ã??ã??ã??help@xxxxxxxxxxxxxxxxxxxx ã?«ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="tor_check">ã??ã?©ã?¦ã?¶ã??é??ã??ã?¦https://check.torproject.org ã?«Toræ?¥ç¶?ã??ã??Orbotã?®è¨­å®?ã??æ??å??ã??ã??ã??ã??試ã??ã?¾ã??ã??</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">��</string>
+    <!--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-->
-  <string name="wizard_title_msg">Androidã?§ã??Orbotã?§Torã??使ã??ã?¾ã??!\n\nTorã?¯ã??ã?³ã?³ã??ã?³ã??ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã??ã??ã?©ã??ã?£ã??ã?¯å??æ??ã??ã??ã??ã?¦ã??ã?©ã?¤ã??ã?·ã?¼ã??æ©?å¯?æ??å ±ã??å??人ç??ã?ªé?¢ä¿?ã??è??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ç?£è¦?ã??ã??å®?ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n\nã??ã?®ã?¦ã?£ã?¶ã?¼ã??ã?¯ã??使ã??ã?®ç«¯æ?«ã?§Orbotã?¨Torã?®è¨­å®?ã??ã?§ã??ã?¾ã??ã??</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">注æ??</string>
-  <string name="wizard_warning_msg">Orbotã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã? ã??ã?§ã?¯é??ä¿¡ã?¯å?¿å??å??ã??ã??ã?¾ã??ã??ã??\n\nOrbotã??Android端æ?«ã??ã?¢ã??ã?ªã?®å?¨ã?¦ã??æ­£ã??ã??設å®?ã??ã?ªã??ã?¨Torã?¯ä½¿ã??ã?¾ã??ã??ã??</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">許�</string>
-  <string name="wizard_permissions_root_msg1">ã?ªã??ã?·ã?§ã?³ã?¨ã??ã?¦Orbotã?«ã?¹ã?¼ã??ã?¼ã?¦ã?¼ã?¶ã?¼æ¨©é??ã??ä¸?ã??ã??ã??ã?¨ã?§é??é??ã??ã?­ã?­ã?·ã?ªã?©ã?®è¿½å? æ©?è?½ã??使ã??ã?¾ã??ã??</string>
-  <string name="wizard_permissions_root_msg2">ã??ã??ã??å®?è¡?ã??ã?ªã??å ´å??ã??Orbotç?¨ã?«ä½?ã??ã??ã??ã?¢ã??ã?ªã? ã??ã??使ã?£ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_permissions_no_root_msg">ã??使ã??ã?®ç«¯æ?«ã?¯rootå??ã??ã??ã?¦ã??ã?ªã??ã??ã??rootã?¾ã??ã?¯ã??Superuserã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?ªã??ã??ã??ã?§ã??ã?? \n\n代ã??ã??ã?«ã??ã?¡ã?¤ã?³ç?»é?¢ã?®ã??ã?¢ã??ã?ªã??ã?¢ã?¼ã??ã??試ã??ã?¦ã??ã? ã??ã??ã?? </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotã??æ??å?¹å??ã??ã??ã??ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: é??è¨?é?²å¼?æ??å?·ã?«ã??ã??ã?»ã?­ã?¥ã?¢ã?ªã??ã?£ã??ã??ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_orweb">Orfox: Torã??ä»?ã??ã?¦å??ä½?ã??ã??ã??ã?©ã?¤ã??ã?·ã?¼ã??å¼·å??ã??ã??ã??ã?©ã?¦ã?¶</string>
-  <string name="wizard_tips_play">Google Playã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
-  <string name="wizard_tips_fdroid">F-Droidã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org ã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">é??é??ã??ã?­ã?­ã?·</string>
-  <string name="wizard_transproxy_msg">ã??ã??ã?¯ã??ã?ªã??ã?®ã?¢ã??ã?ªã??è?ªå??ç??ã?«Torçµ?ç?±ã?§é??ä¿¡ã??ã??ã?¾ã??ã??</string>
-  <string name="wizard_transproxy_hint">(ä½?ã??è¨?ã?£ã?¦ã??ã??ã?®ã??ã??ã??ã??ã?ªã??ã?¨ã??ã?¯ã??ã??ã??ã??ã?§ã??ã?¯ã??ã?¦ã??ã? ã??ã??)</string>
-  <string name="wizard_transproxy_none">ç?¡ã??</string>
-  <string name="pref_transparent_tethering_title">Torã??ã?¶ã?ªã?³ã?°</string>
-  <string name="pref_transparent_tethering_summary">Toré??é??ã??ã?­ã?¯ã?·ã??Wifiã??USBã??ã?¶ã?ªã?³ã?°ã??ã??ã??ã??ã??ã?¤ã?¹ã?«å¯¾ã??ã?¦æ??å?¹å??(å??èµ·å??ã??å¿?è¦?)</string>
-  <string name="button_grant_superuser">管ç??許å?¯ã?¢ã?¯ã?»ã?¹ã??è¦?æ±?ã??ã?¾ã??</string>
-  <string name="pref_select_apps">ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??é?¸æ??ã??ã?¾ã??</string>
-  <string name="pref_select_apps_summary">Torã??çµ?ç?±ã??ã??ã??ã?¢ã??ã?ªã??é?¸æ??</string>
-  <string name="pref_node_configuration">ã??ã?¼ã??設å®?</string>
+    <!--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="button_proxy_all">ã??ã?¹ã?¦ã??ã?­ã?­ã?·</string>
-  <string name="button_proxy_none">ã??ã?­ã?­ã?·ã?ªã??</string>
-  <string name="button_invert_selection">é?¸æ??ã?®å??転</string>
-  <string name="pref_proxy_title">å¤?æ?¹å??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã?­ã?­ã?· (ã?ªã??ã?·ã?§ã?³)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¹ã?¯ã?¼ã??</string>
   <string name="pref_proxy_password_summary">ã??ã?­ã?­ã?·ã?®ã??ã?¹ã?¯ã?¼ã?? (ã?ªã??ã?·ã?§ã?³)</string>
   <string name="pref_proxy_password_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="status">ç?¶æ??</string>
-  <string name="setting_up_full_transparent_proxying_">å®?å?¨ã?ªé??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
-  <string name="setting_up_app_based_transparent_proxying_">ã?¢ã??ã?ªã??ã?¼ã?¹ã?®é??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
-  <string name="transparent_proxying_enabled">é??é??ã??ã?­ã?­ã?·ã??æ??å?¹</string>
-  <string name="transproxy_enabled_for_tethering_">ã??ã?¶ã?ªã?³ã?°ã?§ã?®é??é??ã??ã?­ã?­ã?·æ??å?¹</string>
-  <string name="warning_error_starting_transparent_proxying_">è­¦å??: é??é??ã??ã?­ã?­ã?·ã?®é??å§?æ??ã?«ã?¨ã?©ã?¼ç?ºç??</string>
-  <string name="transproxy_rules_cleared">é??é??ã??ã?­ã?­ã?·ã??ã?«ã?¼ã?«ã??æ¶?å?»å®?äº?</string>
-  <string name="couldn_t_start_tor_process_">Torã??ã?­ã?»ã?¹ã?®èµ·å??ã?«å¤±æ??:</string>
-  <string name="privoxy_is_running_on_port_">Polipoã??å®?è¡?中ã?®ã??ã?¼ã??: </string>
-  <string name="setting_up_port_based_transparent_proxying_">ã??ã?¼ã??ã??ã?¼ã?¹ã?®é??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
-  <string name="bridge_error">ã??ã?ªã??ã?¸ã??ã?¨ã?©ã?¼</string>
-  <string name="bridge_requires_ip">ã??ã?ªã??ã?¸æ©?è?½ã??å?©ç?¨ã??ã??ã?«ã?¯ã??æ??ä½?ä¸?ã?¤ã?®ã??ã?ªã??ã?¸IPã?¢ã??ã?¬ã?¹ã?®å?¥å??ã??å¿?è¦?ã?§ã??ã??</string>
-  <string name="send_email_for_bridges">gmailã??使ã?£ã?¦ã??æ?¬æ??ã?«ã??get bridgesã??ã?¨æ?¸ã??ã??ã?¡ã?¼ã?«ã??bridges@xxxxxxxxxxxxxxã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="error">���</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">ã??ã??ã?«æ??å®?ã??ã??ã??ã?¼ã??ã?®ã?¿ã??使ç?¨</string>
   <string name="bridges">ã??ã?ªã??ã?¸</string>
   <string name="use_bridges">ã??ã?ªã??ã?¸ã??使ã??</string>
-  <string name="bridges_obfuscated">Obfuså??ã??ã??ã??ã??ã?ªã??ã?¸</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®ä»£æ?¿å?¥å?£ã??æ??å?¹å??</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">設å®?ã??ã??ã??ã?ªã??ã?¸ã??Obfuså??ã??ã??ã??ã??ã?ªã??ã?¸ã?§ã??ã??ã?°æ??å?¹</string>
-  <string name="ip_address_and_port_of_bridges">ã??ã?ªã??ã?¸ã?®IPã?¢ã??ã?¬ã?¹ã?¨ã??ã?¼ã??</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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">å?°é??å?¯è?½ã??ã?¼ã??</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">å?¶é??設å®?ã?®ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¦å?°é??å?¯è?½ã?ªã??ã?¼ã??</string>
   <string name="enter_ports">ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="enable_hidden_services">Hidden Serviceã?®ã??ã?¹ã??ã?£ã?³ã?°</string>
-  <string name="run_servers_accessible_via_the_tor_network">ã??ã??ã?¤ã?¹ä¸?ã?®ã?µã?¼ã??ã?¼ã??Torçµ?ç?±ã?§ã?¢ã?¯ã?»ã?¹å?¯è?½ã?«ã??ã??</string>
-  <string name="enter_localhost_ports_for_hidden_services">Hidden Serviceç?¨ã?®localhostã?®ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="hidden_service_ports">Hidden Serviceã?®ã??ã?¼ã??</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ã??ã?ªã??ã?®Hidden Serviceã?®ã?¢ã??ã?¬ã?¹(è?ªå??ç??æ??ã??ã??ã?¾ã??)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ã??ã??ã??ã?°ã?­ã?°ã?®å?ºå??ã??æ??å?¹å??(é?²è¦§ã?«ã?¯adbã??aLogCatã??å¿?è¦?)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ã??ã??ã??ã?°ã?­ã?°ã?®å?ºå??ã??æ??å?¹å??(é?²è¦§ã?«ã?¯adbã??aLogCatã??å¿?è¦?)</string>
   <string name="project_home">ã??ã?­ã?¸ã?§ã?¯ã??ã?®ã??ã?¼ã? :</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor ã?©ã?¤ã?»ã?³ã?¹æ??æ?¸</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">第ä¸?è??製ã?®ã?½ã??ã??ã?¦ã?§ã?¢</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">hidden service æ??å?¹:</string>
-  <string name="unable_to_read_hidden_service_name">hidden serviceã?®å??å??読込ä¸?è?½</string>
+    <string name="unable_to_read_hidden_service_name">hidden serviceã?®å??å??読込ä¸?è?½</string>
   <string name="unable_to_start_tor">Torã??å®?è¡?ã?§ã??ã?¾ã??ã??ã?§ã??ã??</string>
-  <string name="unable_to_reset_tor">Torã??ã?ªã?»ã??ã??ã?§ã??ã?¾ã??ã??ã??ã??使ã??ã?®ã??ã??ã?¤ã?¹ã??å??èµ·å??ã??ã?¦ã??ã? ã??ã??!</string>
-  <string name="pref_use_sys_iptables_title">ã??ã??ã?©ã?«ã??ã?®lptablesã??使ã??</string>
-  <string name="pref_use_sys_iptables_summary">Orbotã??ã?³ã??ã?«ç??ã?§ã?¯ã?ªã??å??è?µã?®iptablesã??使ã??</string>
-  <string name="error_installing_binares">Torã??ã?¤ã??ã?ªã?®ã?¤ã?³ã?¹ã??ã?¼ã?«ã?¾ã??ã?¯ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã?¯ä¸?å?¯è?½ã?§ã??ã??ã??</string>
-  <string name="pref_use_persistent_notifications">Orbotã??æ?¥ç¶?中ã?¯ã?¢ã?¤ã?³ã?³ã??常ã?«ã??ã?¼ã?«ã??ã?¼ã?«è¡¨ç¤º</string>
+    <string name="pref_use_persistent_notifications">Orbotã??æ?¥ç¶?中ã?¯ã?¢ã?¤ã?³ã?³ã??常ã?«ã??ã?¼ã?«ã??ã?¼ã?«è¡¨ç¤º</string>
   <string name="pref_use_persistent_notifications_title">é??ç?¥ã??常ã?«æ??å?¹å??</string>
   <string name="pref_use_expanded_notifications">æ?¡å¼µé??ç?¥ã?§ã??Torã?®å?ºå?£ã?®å?½ã?¨IPã??表示ã??ã?¾ã??</string>
   <string name="pref_use_expanded_notifications_title">æ?¡å¼µé??ç?¥</string>
-  <string name="notification_using_bridges">ã??ã?ªã??ã?¸ã??æ??å?¹ã?§ã??ï¼?</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">��</string>
-  <string name="set_locale_summary">Orbotã?®å?°å??ã?¨è¨?èª?ã??é?¸æ??</string>
-  <string name="wizard_locale_title">è¨?èª?ã??é?¸æ??</string>
-  <string name="wizard_locale_msg">ä»?ã?®è¨?èª?ã??å¤?æ?´ã??ã??ã??ã??ã??ã?®ã?¾ã?¾ã?«ã??ã??</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">設å®?ã??ä¿?å­?</string>
-  <string name="no_internet_connection_tor">ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?ªã??ã??Torã?¯å¾?æ©?中ã?§ã??...</string>
-  <string name="bandwidth_">帯å??å¹?:</string>
-  <string name="down">ã??ã?¦ã?³</string>
-  <string name="up">ã?¢ã??ã??</string>
-  <string name="pref_disable_network_title">ã??ã??ã??ã?¯ã?¼ã?¯ã?ªã??æ??ã?ªã?¼ã??ã?¹ã?ªã?¼ã??</string>
+    <string name="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="menu_verify_browser">ã??ã?©ã?¦ã?¶</string>
-  <string name="menu_use_chatsecure">ChatSecure ã??使ç?¨</string>
-  <string name="permission_manage_tor_label">Tor ã??管ç??</string>
-  <string name="permission_manage_tor_description">ã??ã?®ã?¢ã??ã?ªã?? Tor ã?µã?¼ã??ã?¹ã??ã?³ã?³ã??ã?¼ã?«ã?§ã??ã??ã??ã??ã?«ã??ã??</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbotã?¯Orfox ã??ã?©ã?¦ã?¶ã?¼ã?§æ??ã??å?¹æ??ã??ç?ºæ?®ã??ã?¾ã??ã??ä»?ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¾ã??ã??ï¼?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbotã?¯Orfox ã??ã?©ã?¦ã?¶ã?¼ã?§æ??ã??å?¹æ??ã??ç?ºæ?®ã??ã?¾ã??ã??ä»?ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¾ã??ã??ï¼?</string>
   <string name="install_apps_">ã??ã?©ã?¦ã?¶ã?¼ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¾ã??ã??ï¼?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??ã??ã??ã?¾ã??ã??ã??Torã?¯ã?¹ã?ªã?¼ã??ã??ã?¾ã??â?¦</string>
   <string name="network_connectivity_is_good_waking_tor_up_">ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã?¯è?¯å¥½ã?§ã??ã??Torã??æ??å?¹ã?«ã??ã?¾ã??â?¦</string>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Torrc ����設�</string>
   <string name="pref_torrc_summary">ä¸?ç´?è??家ã?®ã?¿: ç?´æ?¥torrc設å®?è¡?ã??å?¥å??ã??ã?¾ã??</string>
   <string name="pref_torrc_dialog">Torrcã??ã?«ã?¹ã?¿ã? </string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech 人権æ??æ?¸ã?¢ã??ã?ª</string>
-  <string name="your_tor_public_ips_">ã??ã?ªã??ã?®Torå?¬é??IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotã?§å??é¡?ã??ç?ºç??ã??ã??å ´å??ã?¯ã??Android-&gt;設å®?-&gt;ã?¢ã??ã?ª ã?§ã??ã??ã?®ã?¢ã??ã?ªã??ç?¡å?¹ã?«ã??ã?¦ã??ã? ã??ã??: </string>
-  <string name="app_conflict">ã?¢ã??ã?ªã?®ç«¶å??</string>
-  <string name="pref_transproxy_refresh_title">é??é??ã??ã?­ã?­ã?·è?ªå??ã?ªã??ã?¬ã??ã?·ã?¥</string>
-  <string name="pref_transproxy_refresh_summary">ã??ã??ã??ã?¯ã?¼ã?¯ã?®ç?¶æ??ã??å¤?å??ã??ã??ã?¨ã??ã??é??é??ã??ã?­ã?­ã?·ã?®ã?«ã?¼ã?«ã??å??é?©ç?¨ã??ã?¾ã??</string>
-  <string name="pref_transproxy_flush_title">é??é??ã??ã?­ã?­ã?·å¼·å?¶å??é?¤</string>
-  <string name="pref_transproxy_flush_summary">ã??ã??ã??ã?¿ã??ã??ã??ã??ã?¨ã??ä»?ã??ã??ã??ã?¹ã?¦ã?®é??é??ã??ã?­ã?­ã?· ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?¼ã?«ã??ã??ã?©ã??ã?·ã?¥ã??ã?¾ã??</string>
-  <string name="transparent_proxy_rules_flushed_">é??é??ã??ã?­ã?­ã?·ã?®ã?«ã?¼ã?«ã??ã??ã?©ã??ã?·ã?¥ã??ã?¾ã??ã??!</string>
-  <string name="you_do_not_have_root_access_enabled">ROOT ã?¢ã?¯ã?»ã?¹ã??æ??å?¹ã?§ã?¯ã??ã??ã?¾ã??ã??</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">å¤?æ?´ã??ã??設å®?ã??æ??å?¹ã?«ã??ã??ã??ã??ã?«ã??Orbotã??å??æ­¢ã??ã?¦é??å§?ã??ã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??</string>
-  <string name="menu_vpn">ã?¢ã??ã?ª</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">ã?¢ã?¯ã??ã?£ã??å??</string>
   <string name="apps_mode">VPN ã?¢ã?¼ã??</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Orbotã?®VPNæ©?è?½ã??使ç?¨ã??ã?¦ã??ã??ã??ã?¤ã?¹ä¸?ã?®ã??ã?¹ã?¦ã?®ã?¢ã??ã?ªã??Torã??ã??ã??ã?¯ã?¼ã?¯ã??ä»?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n\nå®?å?¨ã?ªå?¿å??æ?§ã?§ã?¯ã?ªã??ã??ã??ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??æ?¦ã??æ??ã??ã??ã?«ã?¯å½¹ç«?ã?¡ã?¾ã??ã??</string>
-  <string name="send_email">ã?¡ã?¼ã?«é??ä¿¡</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設å®?ã?®ã??ã??ã?ªã??ã?¸ã??設å®?ã?«ã?³ã??ã?¼&amp; è²¼ã??ä»?ã??ã??ã?¦ã??Orbotã??å??èµ·å??ã??ã?¾ã??ã??</string>
   <string name="install_orweb">Orfoxã??ã?¤ã?³ã?¹ã??ã?¼ã?«</string>
-  <string name="standard_browser">æ¨?æº?ã??ã?©ã?¦ã?¶</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注: æ¨?æº?ã?®Torã??ã?ªã??ã?¸ã?¯ã??Intel X86/ATOM ã??ã??ã?¤ã?¹ä¸?ã?§ã?®ã?¿å??ä½?ã??ã?¾ã??</string>
-  <string name="vpn_default_world">ä¸?ç??中 (è?ªå??)</string>
+    <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="ports">ã??ã?¼ã??</string>
-  <string name="local_port">ã?­ã?¼ã?«ã?«ã??ã?¼ã??</string>
+    <string name="local_port">ã?­ã?¼ã?«ã?«ã??ã?¼ã??</string>
   <string name="onion_port">Onion ã??ã?¼ã??</string>
   <string name="name">å??å??</string>
   <string name="done">��</string>
@@ -308,9 +162,7 @@
   <string name="backup_restored">ã??ã??ã?¯ã?¢ã??ã??ã??ã??復å??</string>
   <string name="filemanager_not_available">該å½?ã??ã?¡ã?¤ã?«ã?»ã??ã??ã?¼ã?¸ã?£ã?¼ã?ªã??</string>
   <string name="please_grant_permissions_for_external_storage">å¤?é?¨è¨?æ?¶ã?¸ã?®ã?¢ã?¯ã?»ã?¹è¨±å?¯ã??ä¸?ã??ã?¦ä¸?ã??ã??ã??</string>
-  <string name="permission_granted">権é??ã??å??å¾?ã??ã?¾ã??ã??</string>
-  <string name="permission_denied">権é??ã??æ??å?¦ã??ã??ã?¾ã??ã??</string>
-  <string name="restore_backup">ã??ã??ã?¯ã?¢ã??ã??ã?®å¾©æ?§</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>
@@ -343,10 +195,8 @@
   <string name="pref_connection_padding_summary">ã??ã??種ã?®ã??ã?©ã??ã??ã?¯å??æ??ã??ã??é?²è¡?ã??ã??ã??ã??ã?«ã??常ã?«é??ä¿¡é?£èª­å??ã??æ??å?¹ã?«ã??ã?¾ã??ã??ã??ã??ã?©ã?«ã??ï¼?è?ªå??ç??</string>
   <string name="pref_reduced_connection_padding">æ¸?ã??ã??ã??é??ä¿¡é?£èª­å??</string>
   <string name="pref_reduced_connection_padding_summary">ã??ã?¼ã?¿ã?¨é?»å??æ¶?è²»ã??æ¸?ã??ã??ã??ã??ã?«ã??ã?ªã?¬ã?¼æ?¥ç¶?ã??æ?©ã??ã?«é??ã??é??ä¿¡é?£èª­å??ã??å°?ã?ªã??ã?«å?©ç?¨ã??ã?¾ã??</string>
-  <string name="please_enable_vpn">ã?¢ã??ã?ªã??Torã??ä»?ã?§ã??ã??ã??ã??ã?«ã??VPNã?¢ã?¼ã??ã??æ??å?¹ã?«ã??ã?¦ä¸?ã??ã??ã??</string>
-  <string name="app_shortcuts">Torã??æ??å?¹å??ã??ã??ã??ã?¢ã??ã?ª</string>
-  <string name="title_activity_bridge_wizard">ã??ã?ªã??ã?¸ã?¦ã?£ã?¶ã?¼ã??æ´»å??</string>
-  <string name="testing_bridges">Torã?¸ã?®ã??ã?ªã??ã?¸æ?¥ç¶?ã??æ¤?æ?»ä¸­...</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>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
index 844f834c..49c8dbc4 100644
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ b/app/src/main/res/values-kn-rIN/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index e9655eb6..5d222dbb 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -1,22 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">�ರ�ಬ���</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_about">ಬ����</string>
-  <string name="button_help">Help</string>
-  <string name="button_about">ಬ����</string>
-  <string name="wizard_title">�ರ�ಬ���</string>
-  <string name="btn_cancel">Cancel</string>
+    <string name="menu_about">ಬ����</string>
+    <string name="button_about">ಬ����</string>
+    <string name="btn_cancel">Cancel</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ಭಾಷ�</string>
+    <string name="set_locale_title">ಭಾಷ�</string>
   <string name="name">Name</string>
 </resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b9336955..0de0e3a2 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2,134 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbotì?? ë?¤ë¥¸ ì?±ì?´ ì?¸í?°ë?·ì?? ë?? ì??ì ?í??ê²? ì?´ì?©í?  ì?? ì??ë??ë¡? ë??ì??주ë?? 무ë£? í??ë¡?ì?? ì?±ì??ë??ë?¤. Orbotì?? Tor를 ì?´ì?©í??ì?¬ ì?¬ë?¬ë¶?ì?? ì?¸í?°ë?· í?¸ë??í?½ì?? ì??í?¸í??í??ê³  ì ? ì?¸ê³?ì?? ì?°ê²°ë?? ì»´í?¨í?°ë¥¼ ê±°ì³?ì?? ì?¨ê¹?ë??ë?¤. Torë?? 무ë£? ì??í??í?¸ì?¨ì?´ì?´ë©´ì?? ê°?ë°© ë?¤í?¸ì??í?¬ë¡?ì?? ì?¬ë?¬ë¶?ì?? ê°?ì?¸ì?? ì??ì? , ì?¬ì??í??, ì??ë°?í?? ì?¬ì?? í??ë??, ê´?ê³?, êµ­ê°? ì??보를 ì??í??í??ë?? ë?¤í?¸ì??í?¬ ê°?ì??ì?¸ í?¸ë??í?½ ë¶?ì??ì?¼ë¡?ë¶?í?° ë³´í?¸í?©ë??ë?¤.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor ì??ì?? ë°? ì¤?ì§?</string>
-  <string name="tor_proxy_service_process">Tor í??ë¡?ì?? ì??ë¹?ì?¤</string>
-  <string name="status_starting_up">Orbot ì??ì?? ì¤?â?¦</string>
+    <string name="status_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="tor_process_waiting">ë??기 ì¤?.</string>
-  <string name="not_anonymous_yet">경고: ê·?í??ì?? í?¸ë??í?½ì?? ì??ì§? ì?µëª?ì?´ ì??ë??ë??ë?¤! HTTP í??ë¡?ì?? 127.0.0.1:8118 ë??ë?? SOCKS4A ë??ë?? SOCKS5 í??ë¡?ì?? 127.0.0.1:9050ì?? ì?¬ì?©í??ì?¬ ì??ì?© í??ë¡?ê·¸ë?¨ì?? 구ì?±í??ì?­ì??ì?¤</string>
-  <string name="menu_home">í??</string>
-  <string name="menu_browse">í??ì??</string>
-  <string name="menu_settings">��</string>
+    <string name="menu_settings">��</string>
   <string name="menu_log">ë¡?ê·¸</string>
-  <string name="menu_info">ë??ì??ë§?</string>
-  <string name="menu_start">ì??ì??</string>
+    <string name="menu_start">ì??ì??</string>
   <string name="menu_stop">��</string>
   <string name="menu_about">ì ?ë³´</string>
-  <string name="menu_promo_apps">ë?? ë§?ì?? ì?´í??리ì¼?ì?´ì??ë?¤...</string>
-  <string name="main_layout_download">ë?¤ì?´ë¡?ë??</string>
+    <string name="main_layout_download">ë?¤ì?´ë¡?ë??</string>
   <string name="main_layout_upload">ì??ë¡?ë??</string>
-  <string name="button_help">ë??ì??ë§?</string>
-  <string name="button_close">�기</string>
-  <string name="button_about">ì ?ë³´</string>
-  <string name="button_clear_log">�그 ��기</string>
-  <string name="menu_verify">í??ì?¸</string>
-  <string name="menu_exit">��</string>
+    <string name="button_about">ì ?ë³´</string>
+    <string name="menu_exit">��</string>
   <string name="menu_scan">ë¸?릿ì§? QRì½?ë?? ì?¤ìº?í??기</string>
   <string name="menu_share_bridge">ë¸?릿ì§? QRì½?ë?? ê³µì? í??기</string>
-  <string name="press_to_start">- 길ê²? ë??ë?¬ì?? ì??ì??í??기 -</string>
-  <string name="pref_trans_proxy_group">í?¬ëª?í?? í??ë¡?ì?? (루í?? í??ì??)</string>
-  <string name="pref_trans_proxy_title">í?¬ëª?í?? í??ë¡?ì??</string>
-  <string name="pref_trans_proxy_summary">ì?±ì?? ì??ë??ì ?ì?¸ í? ë¥´í??</string>
-  <string name="pref_transparent_all_title">모ë?? í? ë¥´í??</string>
-  <string name="pref_transparent_all_summary">í? ë¥´ë¥¼ í?µí?? 모ë?  ì??ì?© í??ë¡?ê·¸ë?¨ì?? ë??í?? í??ë¡?ì?? í?¸ë??í?½</string>
-  <string name="pref_transparent_port_fallback_title">ë??ì²´ í??ë¡?ì?? í?¬í?¸</string>
-  <string name="pref_transparent_port_fallback_summary">경고 : í??í?? í?¬í?¸(80,443 ë?±)ë§? ì??í??. ì ?ì²´ 모ë??ë?? ì?± 모ë??ê°? ì??ë??í??ì§? ì??ì?? ê²½ì?°ì??ë§? ì?¬ì?©í?  ê²?.</string>
-  <string name="pref_transparent_port_title">�� 목�</string>
-  <string name="pref_transparent_port_summary">í??ë¡?ì?? ì²?리í?  í?¬í?¸ 목ë¡?. ë§?ì?½ ì ?ì²´ 모ë??ë?? ì?± 모ë??ê°? ì??ë??í??ì§? ì??ì?? ê²½ì?°ì??ë§? ì?¬ì?©í?  ê²?.</string>
-  <string name="pref_transparent_port_dialog">í??ë¡?ì?? í?¬í?¸ ì??ë ¥</string>
-  <string name="pref_has_root">루í?¸ ê¶?í??ì?? ë??í?? ì ?ê·¼ í??ì??</string>
-  <string name="pref_has_root_summary">ëª?ë°±í?? í??ë¡?ì??를 ì??í?´ 루í?¸ ê¶?í?? ì??구</string>
-  <string name="status_install_success">Tor ë°?ì?´ë??리ê°? ì?±ê³µì ?ì?¼ë¡? ì?¤ì¹?ë??ì??ì?µë??ë?¤!</string>
-  <string name="status_install_fail">í? ë¥´ ë°?ì?´ë??리 í??ì?¼ì?? ì?¤ì¹?í?  ì?? ì??ì?µë??ë?¤. ë¡?그를 í??ì?¸í?´ 주ì??ê³  tor-assistants@xxxxxxxxxxxxxx ì?? ì??ë ¤ 주ì?­ì??ì?¤.</string>
-  <string name="title_error">ì? í??리ì¼?ì?´ì?? ì?¤ë¥?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot ì ?ë³´</string>
-  <string name="btn_next">ë?¤ì??</string>
-  <string name="btn_back">��</string>
-  <string name="btn_finish">�침</string>
-  <string name="btn_okay">í??ì?¸</string>
+    <string name="btn_okay">í??ì?¸</string>
   <string name="btn_cancel">ì·¨ì??</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Orbotì?? ë??í?? ëª?ëª? ì??ì?¸ì?¬í?­</string>
-  <string name="wizard_permissions_root">ì?¬ì?© ê¶?í?? ë¶?ì?¬</string>
-  <string name="wizard_permissions_stock">Orbot ì?¬ì?© ê¶?í??</string>
-  <string name="wizard_premissions_msg_root">ì??ë²½í?©ë??ë?¤! Orbotì?? ì??í?´ 루í?¸ ê¶?í??ì?´ í??ì?±í??ë??ê²?ì?? ê°?ì§?í??ì?µë??ë?¤. ì?°ë¦¬ë?? ì?´ í??ì?? í??ëª?í??ê²? ì?¬ì?©í?  ê²?ì??ë??ë?¤.</string>
-  <string name="wizard_permissions_msg_stock">ì?´ê²?ì?? í??ì??ê°? ì??ë?? ë°?ë©´, ê·?í??ì?? ì?¥ì¹?ê°? 루í?¸ ê¶?í??ì?? ê°?ì§?ê³  ì??ë?¤ë©´ Orbotì?? ë?? ê°?ë ¥í?? ë??구ê°? ë?  ì?? ì??ì?µë??ë?¤. Orbotì??ê²? ì??í?¼ì? ì ? ê¶?í??ì?? ë¶?ì?¬í??려면 ì??ë?? ë²?í?¼ì?? ë??르ì?­ì??ì?¤.</string>
-  <string name="wizard_permissions_no_root">루í?¸ ê¶?í??ì?? ê°?ì§?ê³  ì??ì§? ì??ê±°ë?? 무ì??ì?? ë§?í??ë?? ê²?ì?¸ì§? 모르겠ë?¤ë©´, Orbotê³¼ ë??ì??í??ë?? ì? í??리ì¼?ì?´ì??ë§?ì?? ì?¬ì?©í??ì?­ì??ì?¤.</string>
-  <string name="wizard_permissions_consent">ë?´ì?©ì?? ì?´í?´í??ì??ì?¼ë©°, ì??í?¼ì? ì ? ê¶?í?? ì??ì?´ ê³?ì?? ì§?í??í?©ë??ë?¤.</string>
-  <string name="wizard_permission_enable_root">Orbotì??ê²? 루í?¸ê¶?í?? ë¶?ì?¬</string>
-  <string name="wizard_configure">í? ë¥´í?? ì?¤ì ?</string>
-  <string name="wizard_configure_msg">Orbotì?? 모ë?  ì? í??리ì¼?ì?´ì?? ë??ë?? ì? í??ë?? ì? í??리ì¼?ì?´ì??ì?? Tor를 í?µí?´ í?µì? í??ë??ë¡? í?  ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_configure_all">모ë?  ì?±ì?? í? ë¥´ í??ë¡?ì??ë¡? ì?°ê²°í??기</string>
-  <string name="wizard_configure_select_apps">Tor를 ì??í?´ ê°?ê°?ì?? ì?± ì? í??</string>
-  <string name="wizard_tips_tricks">Orbotì?´ í??ì?±í??ë?? ì?±</string>
-  <string name="wizard_tips_msg">ì??ë??ì?? ì?±ì?? Orbotê³¼ ì??ë??ë??ë??ë¡? ê°?ë°?ë??ì??ì?µë??ë?¤. ì§?ê¸? ì?¤ì¹?í??려면 ê°?ê°?ì?? ë²?í?¼ì?? ë??르ì?­ì??ì?¤. ë??ë?? ë??ì¤?ì?? Google Play, GuardianProject.info, F-Droid.org ì??ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ì??ë??ë¡?ì?´ë??를 ì??í?? ì??ì ?í?? ì?¸ì?¤í?´í?¸ ë©?ì?¸ì§? í?´ë?¼ì?´ì?¸í?¸</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Orbotê³¼ ì??ë??í??ë??ë¡? ì?±ì?? ì?¤ì ?í??ë?? ë°©ë²?ì?? ë°°ì?°ê¸°</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ê²?ì?? ì??ì§? ì?±</string>
-  <string name="wizard_tips_twitter">í?¸ì??í?° í??ë¡?ì??를 localhost:8118ë¡? ì?¤ì ?</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ì?¤í? ë¦¬ë?? ë?¹ì? ì?´ ë§?ë?¤ê³  ë³´ì??ì?? Torì?? ë§?기ì?¸ì??!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">í??ë¡?ì?? ì?¤ì ?</string>
-  <string name="wizard_proxy_help_msg">ì?¬ì?©í??ê³  ì??ë?? ì?±ì?´ HTTP / SOCKS í??ë¡?ì??를 ì§?ì??í??ë?¤ë©´ ì§?ê¸? ë?¹ì?¥ Orbotì?? ì?°ê²°í?´ í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ ì?´ì?©í?  ì?? ì??ì?µë??ë?¤.\n\n\n IPë?? 127.0.0.1 ë??ë?? \"localhost\"ë¡? ì?¤ì ?í??ì??ê³ , í?¬í?¸ë?? HTTP:8118/SOCKS:9050ì?¼ë¡? ì?¤ì ?í?´ì£¼ì?¸ì??. ê°?ë?¥í??ë?¤ë©´ SOCKS4Aë?? SOCKS5를 ì?¬ì?©í??ì??기 ë°?ë??ë??ë?¤.\n \n\n\n FAQ를 í?µí?´ ì??ë??ë¡?ì?´ë??ì??ì?? í??ë¡?ì??를 ì?´ì?©í??ë?? ë°©ë²?ì?? ë°°ì?¸ ì?? ì??ì?µë??ë?¤: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbotì?´ ì¤?ë¹?ë??ì??ì?µë??ë?¤!</string>
-  <string name="wizard_final_msg">ì?¸ê³?ì?? ì??ë§?ì?? ì?¬ë??ë?¤ì?´ ë?¤ì??í?? 목ì ?ì?? ì??í?´ í? ë¥´ë¥¼ ì?´ì?©í??ê³  ì??ì?µë??ë?¤.\n\nì ?ë??리ì?¤í?¸ì??ì?? ë¸?ë¡?ê±°, ì?¸ê¶?ì?´ë??ê°?, ë²?무ì?¬, êµ°ì?¸, 기ì??, í??ì??ë°?ê³  ì??ë?? ì?¬ë??ë?¤, 그리고 ë³´í?µì?? ì??민ë?¤ê¹?ì§?â?¦ 그리고 ë?¹ì? ë?? ë§?ì?´ì£ !</string>
-  <string name="wizard_exit_at_first_screen_toast">ì?¬ì?©í??기 ì ? Orbotì?? ì?¤ì ?í?´ì£¼ì?¸ì??!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">ì?±ê³µì ?ì?¼ë¡? í? ë¥´ ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë?¬ì?µë??ë?¤! - í??ì§?ë§? ì?´ê²? ë?¹ì? ì?? ë??ë°?ì?´ì?¤ê°? ì??ì ?í??ë?¤ë?? ì??리ë?? ì??ë??ë??ë?¤. \"ë¸?ë?¼ì?°ì ?\" ë²?í?¼ì?? í?µí?´ ì?°ê²°ì??í??를 ì²´í?¬í?  ì?? ì??ì?µë??ë?¤. \n\në?? ë§?ì??ê²?ì?? ì??ê³ ì?¶ë?¤ë©´ https://guardianproject.info/apps/orbot ì?? 방문í??ê±°ë?? help@xxxxxxxxxxxxxxxxxxxxë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì?¸ì??.</string>
-  <string name="tor_check">Orbotì?´ ì ?ì??ì ?ì?¼ë¡? ì?¤ì ?ë??ì??ê³  Torì?? ì?°ê²°ë??ì??ë??ì§? í??ì?¸í??기 ì??í?´ https://check.torproject.org ì?? ê·?í??ì?? ì?¹ ë¸?ë?¼ì?°ì ?ì?? ì?´ ê²?ì??ë??ë?¤.</string>
-  <string name="pref_hs_group">ì?¨ê²¨ì§? ì??ë¹?ì?¤ í?¸ì?¤í??</string>
-  <string name="pref_general_group">��</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-->
-  <string name="wizard_title_msg">Orbotì?? í? ë¥´ë¥¼ ì??ë??ë¡?ì?´ë??ì??ì?? ì?¬ì?©í?  ì?? ì??ë??ë¡? í?´ì¤?ë??ë?¤!\n\ní? ë¥´ë?? 기ë°?ì??ë£?, ê°?ì?¸ì ?ì?¸ ê´?ê³?를 ë?¤ì¶?ê³  ì?¬ì??í??ì?? ì??í??í??ë?? ê²?ì?´, í?¸ë??í?½ ë¶?ì??, ë?¤í?¸ì??í?¬ ê°?ì??ë¡? ë¶?í?° ë§?ì?? ì?¸ì?¸ ì?? ì??ê²? ë??ì??ë??립ë??ë?¤.\n\nì?´ ë§?ë²?ì?¬ê°? Orbotê³¼ Tor를 구ì?±í?  ì?? ì??ë??ë¡? ë??ì??ì¤?ê²?ì??ë??ë?¤.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">경고</string>
-  <string name="wizard_warning_msg">ë?¨ì??í?? Orbotì?? ì?¤ì¹?í??ë?? ê²?ë§?ì?¼ë¡?ë?? ê·?í??ì?? 모ë°?ì?¼ í?¸ë??í?½ì?? ì??ë??ì?¼ë¡? ì?µëª?í??í?  ì?? ì??ì?µë??ë?¤.\n\nê·?í??ê°? í? ë¥´ë¥¼ ì ?ë??ë¡? ì?¬ì?©í??기 ì??í?´ì??ë?? Orbotê³¼ ê·?í??ì?? ì?¥ì¹?, ë?¤ë¥¸ ì?±ì?? ì??ë§?ê²? ì?¤ì ?í?´ì?¼ë§? í?©ë??ë?¤.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">ê¶?í??</string>
-  <string name="wizard_permissions_root_msg1">í?¬ëª? í??ë¡?ì?? ê°?ì?? ê³ ê¸? 기ë?¥ì?? í??ì?±í??í??기 ì??í?´ ê·?í??ë?? ì? í??ì ?ì?¼ë¡? Orbotì??ê²? \'ì??í?¼ì? ì ?\' ê¶?í??ì?? ì¤? ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_permissions_root_msg2">ì?´ê²?ì?? ì??í??ì§? ì??ì?¼ì? ë?¤ë©´, Orbotê³¼ ì??ë??í??ë??ë¡? ë§?ë?¤ì?´ì§? ì?±ë§?ì?? ì?¬ì?©í??ì?­ì??ì?¤.</string>
-  <string name="wizard_permissions_no_root_msg">ê·?í??ì?? ì?¥ì¹?ê°? 루í??ë??ì??ê±°ë?? ì??í?¼ì? ì ? ê¶?í??ì?? ê°?ì§?ê³  ì??ë?? ê²? ê°?ì§? ì??ì?µë??ë?¤.\n\ní? ë¥´ë¥¼ ì?¬ì?©í??ì?¬ í?¨ê³¼ë¥¼ 보기 ì??í?´ì??ë?? Orbotê³¼ ì??ë??í??ë??ë¡? ë§?ë?¤ì?´ì§? ì?±ì?´ë?? HTTPë?? SOCKS í??ë¡?ì?? ì?¤ì ?ì?? ì§?ì??í??ë?? ì?±ì?? ì?¬ì?©í?´ì?¼ í?©ë??ë?¤.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotì?? ì?¬ì?©í??ë?? ì?±</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ì?¤í?? ë?? ë ?ì½?ë?? ì??í?¸í??를 ì ?ì?©í?? ì??ì ?í?? ì±?í?? ì?±</string>
-  <string name="wizard_tips_orweb">Orfox: 모ë°?ì?¼ì?? í? ë¥´ ë¸?ë?¼ì?°ì ?</string>
-  <string name="wizard_tips_play">구ê¸? í??ë ?ì?´ì??ì?? 모ë?  ê°?ë??ì?¸ í??ë¡?ì ?í?¸ ì?± 찾기</string>
-  <string name="wizard_tips_fdroid"> F-Droidì??ì?? Guardian Projectì?? ì?±ë?¤ì?? ì°¾ì??ë³´ì?¸ì??</string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org ì??ì?? Guardian Projectì?? ì?±ë?¤ì?? ì°¾ì??ë³´ì?¸ì??</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">í?¬ëª? í??ë¡?ì??</string>
-  <string name="wizard_transproxy_msg">ì?´ê²?ì?? ì?´ë? í?? ì?¤ì ? ì??ì?´ë?? ê·?í??ì?? ì?±ì?´ ì??ë??ì ?ì?¼ë¡? í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ í?µí?´ ì??ë??í??ë??ë¡? í?´ ì¤?ë??ë?¤.</string>
-  <string name="wizard_transproxy_hint">(ì?? ë?´ì?©ì?? ì?´í?´í?  ì?? ì??ë?¤ë©´ ì?´ê²?ì?? ì? í??í?´ì£¼ì?­ì??ì?¤.)</string>
-  <string name="wizard_transproxy_none">ì??ì??</string>
-  <string name="pref_transparent_tethering_title">í? ë¥´ í??ë??ë§?</string>
-  <string name="pref_transparent_tethering_summary">í??ë??ë§? ë?? ì??ì?´í??ì?´ì?? USB ì?¥ì¹?ì?? í? ë¥´ í?¬ëª? í??ë¡?ì?? í??ì?±í?? (ì?¬ì??ì?? í??ì??)</string>
-  <string name="button_grant_superuser">ì??í?¼ì? ì ? ê¶?í?? ì??ì²­</string>
-  <string name="pref_select_apps">ì?± ì? í??</string>
-  <string name="pref_select_apps_summary">Tor를 í?µí?? í?µì? ì?? ì?¬ì?©í?  ì?± ì? í??</string>
-  <string name="pref_node_configuration">ë?¸ë?? ì?¤ì ?</string>
+    <!--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="button_proxy_all">모ë?? í??ë¡?ì??</string>
-  <string name="button_proxy_none">ì??무ê²?ë?? ì??í?¨</string>
-  <string name="button_invert_selection">ì? í?? ë°?ì ?</string>
-  <string name="pref_proxy_title">ì?¸ë¶? ë?¤í?¸ì??í?¬ í??ë¡?ì?? (ì? í??)</string>
+    <string name="pref_proxy_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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">ì?¸ë¶? í??ë¡?ì?? ë¹?ë°?ë²?í?¸</string>
   <string name="pref_proxy_password_summary">í??ë¡?ì?? ë¹?ë°?ë²?í?¸ (ì? í??)</string>
   <string name="pref_proxy_password_dialog">í??ë¡?ì?? ë¹?ë°?ë²?í?¸ ì??ë ¥</string>
-  <string name="status">ì??í??</string>
-  <string name="setting_up_full_transparent_proxying_">ì ?ì²´ í?¬ëª? í??ë¡?ì?? ì?¤ì ?ì¤?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">ì?±ì?? 기ë°?í?? í?¬ëª? í??ë¡?ì?? ì?¤ì ?ì¤?...</string>
-  <string name="transparent_proxying_enabled">í?¬ëª? í??ë¡?ì?? í??ì?±í??ë?¨</string>
-  <string name="transproxy_enabled_for_tethering_">í??ë??ë§?ì?? ì??í?? TransProxy í??ì?±í??ë?¨</string>
-  <string name="warning_error_starting_transparent_proxying_">경고 : í?¬ëª? í??ë¡?ì?? ì??ì?? ì?¤ë¥?</string>
-  <string name="transproxy_rules_cleared">TransProxy ê·?ì¹? 모ë?? ì?­ì ?ë?¨</string>
-  <string name="couldn_t_start_tor_process_">Tor í??ë¡?ì?¸ì?¤ ì??ì?? ë¶?ê°?ë?¥:  </string>
-  <string name="privoxy_is_running_on_port_">Polipoê°? ì??ë??ë??ê³  ì??ë?? í?¬í?¸:</string>
-  <string name="setting_up_port_based_transparent_proxying_">í?¬í?¸ì?? 기ë°?í?? í?¬ëª? í??ë¡?ì?? ì?¤ì ?</string>
-  <string name="bridge_error">�릿� ��</string>
-  <string name="bridge_requires_ip">ë¸?릿ì§? 기ë?¥ì?? ì?¬ì?©í??기 ì??í?´ì??, ìµ?ì??í?? 1ê°? ì?´ì??ì?? ë¸?릿ì§? IP 주ì??ê°? í??ì??í?©ë??ë?¤.</string>
-  <string name="send_email_for_bridges">ë©?ì?¼ 본문ì?? get bridgesë?¼ê³  ì ?ì?´ì?? Gmailë¡? bridges@xxxxxxxxxxxxxxì?? ë©?ì?¼ì?? ë³´ë?´ì?­ì??ì?¤.</string>
-  <string name="error">��</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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">ì?´ í?¹ì ?í?? ë?¸ë??*ë§?* ì?¬ì?©í?©ë??ë?¤.</string>
   <string name="bridges">ì¤?ê³?ì??ë²?</string>
   <string name="use_bridges">ì¤?ê³?ì??ë²? ì?¬ì?©</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">ì?¤ì ?ë?? bridgeê°? obfsproxy bridgeë©´ í??ì?±í??</string>
-  <string name="ip_address_and_port_of_bridges">ì¤?ê³?ì??ë²?ì?? IP 주ì??ì?? </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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">ë??ë?¬ ê°?ë?¥í?? í?¬í?¸</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">ì??격í?? ë°©í??ë²½ ë?¤ì??ì?? ì ?ê·¼ ê°?ë?¥í?? í?¬í?¸</string>
   <string name="enter_ports">í?¬í?¸ ì??ë ¥</string>
-  <string name="enable_hidden_services">í??ë?  ì??ë¹?ì?¤ í?¸ì?¤í??</string>
-  <string name="run_servers_accessible_via_the_tor_network">ì?¥ì¹? ë?´ì?? ì??ë²?ê°? Tor ë?¤í?¸ì??í?¬ë¥¼ í?µí?´ ì ?ê·¼ ê°?ë?¥í??ë??ë¡? í??ì?©</string>
-  <string name="enter_localhost_ports_for_hidden_services">í??ë?  ì??ë¹?ì?¤ë¥¼ ì??í?? localhost í?¬í?¸ ì??ë ¥</string>
-  <string name="hidden_service_ports">í??ë?  ì??ë¹?ì?¤ í?¬í?¸</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ê·?í??ì?? í??ë?  ì??ë¹?ì?¤ë¥¼ ì??í?? 주ì??í??ë?? ì?´ë¦?(ì??ë??ì?¼ë¡? ì??ì?±ë?¨)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ë??ë²?ê·¸ ë¡?ê·¸ ì¶?ë ¥ í??ì?±í?? (보기 ì??í?´ì??ë?? adbë?? aLogCatì?? ì?¬ì?©í?´ì?¼ í?¨)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ë??ë²?ê·¸ ë¡?ê·¸ ì¶?ë ¥ í??ì?±í?? (보기 ì??í?´ì??ë?? adbë?? aLogCatì?? ì?¬ì?©í?´ì?¼ í?¨)</string>
   <string name="project_home">í??ë¡?ì ?í?¸ í?? í??ì?´ì§?:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </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="hidden_service_on">í??ë?  ì??ë¹?ì?¤ 목ë¡? :</string>
-  <string name="unable_to_read_hidden_service_name">í??ë?  ì??ë¹?ì?¤ ì?´ë¦?ì?? ì?½ì?? ì?? ì??ì??</string>
+    <string name="unable_to_read_hidden_service_name">í??ë?  ì??ë¹?ì?¤ ì?´ë¦?ì?? ì?½ì?? ì?? ì??ì??</string>
   <string name="unable_to_start_tor">Tor ì??ì?? ë¶?ê°?ë?¥</string>
-  <string name="unable_to_reset_tor">í? ë¥´ë¥¼ 리ì??í?  ì?? ì??ì?µë??ë?¤! ë??ë°?ì?´ì?¤ë¥¼ ì?¬ì??ì??í??ì?¸ì??.</string>
-  <string name="pref_use_sys_iptables_title">기본 iptables ��</string>
-  <string name="pref_use_sys_iptables_summary">Orbotì?? ë??ë´?ë?? ê²? ë??ì? ì?? ë¹?í?¸ì?¸ë?? iptables ë°?ì?´ë??리 ì?¬ì?©</string>
-  <string name="error_installing_binares">Tor ë°?ì?´ë??리ë?? ì?¤ì¹?ë??ê±°ë?? ì??ê·¸ë ?ì?´ë?? ë?  ì?? ì??ì??ì?µë??ë?¤.</string>
-  <string name="pref_use_persistent_notifications">Orbotì?´ ì?°ê²°ë??ì??ì?? ë?? í?´ë°?ì?? ì??ì?´ì½? ë³´ì?´ê¸°</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="notification_using_bridges">bridge í??ì?±í??ë?¨</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">��</string>
-  <string name="set_locale_summary">Orbotì?? ì??í?? ë¡?ì¼?ì?¼ê³¼ ì?¸ì?´ ì? í??</string>
-  <string name="wizard_locale_title">ì?¸ì?´ ì? í??</string>
-  <string name="wizard_locale_msg">기본ê°?ì?¼ë¡? ë??ê±°ë?? í??ì?¬ ì?¸ì?´ ë°?꾸기</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">�� ��</string>
-  <string name="no_internet_connection_tor">ì?¸í?°ë?· ì?°ê²°ì??ë?¨; ë??기ì¤?ì??ë??ë?¤...</string>
-  <string name="bandwidth_">ë??ì?­í?­:</string>
-  <string name="down">ì??ë??ë¡?</string>
-  <string name="up">ì??ë¡?</string>
-  <string name="pref_disable_network_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="menu_verify_browser">����</string>
-  <string name="menu_use_chatsecure">ChatSecure  ��</string>
-  <string name="permission_manage_tor_label">Tor �리</string>
-  <string name="permission_manage_tor_description">Tor ì??ë¹?ì?¤ë¥¼ ì ?ì?´í??기 ì??í?´ ì?´ ì?±ì?? í??ì?±í??í??ì?­ì??ì?¤</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë??ì?´ ì??ì§? ì??ì?µë??ë?¤. í? ë¥´ë¥¼ ì? ì??기 모ë??ë¡? ë³?ê²½í?©ë??ë?¤...</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>
@@ -250,19 +121,7 @@
   <string name="pref_torrc_title">ì?¬ì?©ì?? ì§?ì ? Torrc 구ì?±</string>
   <string name="pref_torrc_summary">ì ?문ê°? ì ?ì?©: torrc 구ì?± ì¤?ì?? ì§?ì ? ì??ë ¥í?©ë??ë?¤</string>
   <string name="pref_torrc_dialog">ë??ë§?ì?? Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetechì?? ì?¸ê¶?ì?´ë?? 문ì??ì§? ì?´í??리ì¼?ì?´ì??</string>
-  <string name="your_tor_public_ips_">�르 공� IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotê³¼ ì?¬ì?©í??ë??ë?° 문ì ?ê°? ì??ë?? ì?±ë?¤ì?´ ì¡´ì?¬í?©ë??ë?¤. ì??ë??ë¡?ì?´ë??-&gt;ì?¤ì ?-&gt;ì?´í??리ì¼?ì?´ì?? ì??ì?? ë?¤ì??ì?? ì?±ë?¤ì?? ë¹?í??ì?±í?? í??ì?­ì??ì?¤: </string>
-  <string name="app_conflict">ì?´í??리ì¼?ì?´ì?? 충ë??</string>
-  <string name="pref_transproxy_refresh_title">í?¬ëª?í??ë¡?ì?? ì??ë?? ê°±ì? </string>
-  <string name="pref_transproxy_refresh_summary">ë?¤í?¸ì??í?¬ ì??í??ê°? ë³?í??ë©´ ì??ë??ì?¼ë¡? í?¬ëª?í??ë¡?ì?? 룰 ë?¤ì?? ì ?ì?©</string>
-  <string name="pref_transproxy_flush_title">í?¬ëª?í??ë¡?ì?? ê°?ì ? ì ?ê±°</string>
-  <string name="pref_transproxy_flush_summary">모ë?  í?¬ëª? í??ë¡?ì?? 룰ì?? ì?­ì ?í??려면 ì?¬ê¸°ë¥¼ ë??르ì?¸ì??</string>
-  <string name="transparent_proxy_rules_flushed_">모ë?  í?¬ëª?í??ë¡?ì?? 룰ì?´ ì ?ê±°ë??ì??ì?µë??ë?¤!</string>
-  <string name="you_do_not_have_root_access_enabled">Root ê¶?í??ì?? í??ì?±í??í??ì§? ì??ì??ì?µë??ë?¤</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">ë³?ê²½ì?? ì??ë£?í??려면 Orbotì?? ì¤?ì§?í??ê³  ì?¬ì??ì??í?´ì?¼ í?©ë??ë?¤.</string>
-  <string name="menu_vpn">ì?±</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,9 +135,7 @@
   <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주ì??를 ì?»ì??ë?¤ë©´, ì?¤ì ?ì?? \"ë¸?릿ì§?\" í?­ëª©ì?? ë³µì?¬ &amp; ë¶?ì?¬ë?£ê¸°í?? ë?¤ Orbotì?? ì?¬ì??ì??í??ì?¸ì??.</string>
   <string name="install_orweb">Orfox ��</string>
-  <string name="standard_browser">í??ì¤? ë¸?ë?¼ì?°ì ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">참고: Standard Tor bridgesë?? ì?¸í?? X86/ATOM í??ë¡?ì?¸ì??ì??ì??ë§? ë??ì??í?©ë??ë?¤.</string>
-  <string name="save">ì ?ì?¥</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>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index 10f830c8..f63feabf 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -1,29 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_home">Ð?аÑ?кÑ? беÑ?</string>
-  <string name="menu_settings">ЫÑ?аÑ?Ñ?оолоÑ?</string>
-  <string name="menu_info">Ð?аÑ?дам</string>
-  <string name="menu_stop">ТокÑ?оо</string>
+    <string name="menu_settings">ЫÑ?аÑ?Ñ?оолоÑ?</string>
+    <string name="menu_stop">ТокÑ?оо</string>
   <string name="menu_about">Ð?Ñ?огÑ?амма жөнүндө</string>
-  <string name="button_help">Ð?аÑ?дам</string>
-  <string name="button_close">Ð?абÑ?Ñ?</string>
-  <string name="button_about">Ð?Ñ?огÑ?амма жөнүндө</string>
+    <string name="button_about">Ð?Ñ?огÑ?амма жөнүндө</string>
   <string name="menu_exit">ЧÑ?гÑ?Ñ?</string>
-  <string name="btn_next">Ð?ийинки</string>
-  <string name="btn_cancel">Ð?йнÑ?Ñ?</string>
+    <string name="btn_cancel">Ð?йнÑ?Ñ?</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Ð?бал</string>
-  <string name="error">Ð?аÑ?а</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Тил</string>
+    <string name="error">Ð?аÑ?а</string>
+    <string name="set_locale_title">Тил</string>
   <string name="save">СакÑ?оо</string>
   <string name="name">Ð?Ñ?Ñ?-жөнү</string>
 </resources>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 844f834c..49c8dbc4 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-lt/poestrings.xml b/app/src/main/res/values-lt/poestrings.xml
index 3e0034c4..46d57c84 100644
--- a/app/src/main/res/values-lt/poestrings.xml
+++ b/app/src/main/res/values-lt/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Tiltai yra Tor mazgai, kurie padeda apeiti cenzÅ«rÄ?. Galima pabandyti naudoti tiltus, jei Tor yra užblokuotas jÅ«sų interneto tiekÄ?jo. Kiekvienas tinklų tilto tipas, tam, kad iÅ¡vengtų cenzÅ«ros, naudoja skirtingÄ? metodÄ?. Jeigu vienas tinklų tiltas neveikia, bandykite dar kartÄ?, naudodami kitÄ? tinklų tiltÄ?.</string>
-
-    <string name="bridges_no">Jokių tiltų: Tiesiai jungtis prie Tor</string>
-    <string name="bridges_provided">Duoti tiltai:</string>
-    <string name="bridges_custom">Pritaikyti tiltai</string>
-
-    <string name="bridges_config">Tiltų konfigūracija</string>
-    <string name="action_done">Atlikta</string>
 
     <string name="bridges_sometimes">Kartais reikia tilto, kad prieiti prie Tor.</string>
     <string name="action_more">SUŽINOTI DAUGIAU</string>
@@ -16,19 +8,6 @@
     <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="status_connected">Prisijungta!</string>
-
-    <string name="loading_claim_1">MÅ«sų įvairi bendruomenÄ? yra tai, kas padaro Tor puikiu!</string>
-    <string name="loading_claim_2">Kasdieniniai žmonÄ?s naudoja Tor, kad iÅ¡vengtų marketingo reklamų sekimo.</string>
-    <string name="loading_claim_3">Kai Facebook yra užblokuotas, žmonÄ?s naudoja Tor, kad susijungtų su savo draugais ir Å¡eima.</string>
-    <string name="loading_claim_4">Aktyvistai naudoja Tor, kad laisvai paskelbtų savo nuomones ir įsitikinimus.</string>
-    <string name="loading_claim_5">Blogeriai naudoja Tor, kad sutelktų žmones dÄ?l socialinių reformų.</string>
-    <string name="loading_claim_6">Žurnalistai naudoja Tor, kad saugiai tirtų savo straipsnių medžiagÄ?.</string>
-    <string name="loading_claim_7">Verslininkai naudoja Tor, kad jų kompanijų planai išliktų privatūs.</string>
-    <string name="loading_claim_8">Darbuotojai naudoja Tor, kad kovotų už teisingumÄ? be darbo praradimo baimÄ?s.</string>
-
-    <string name="status_connecting">Mes jus prijungiame.\" = \"Mes jus prijungiame.</string>
-
     <string name="hello">Sveiki</string>
     <string name="welcome">Sveiki atvykÄ? į Tor ant mobiliųjų prietaisų.</string>
 
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 0b798a52..24ffde66 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -2,97 +2,40 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">paleisti ir stabdyti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Paleidžiama Orbot�</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="tor_process_waiting">laukiama.</string>
-  <string name="not_anonymous_yet">DÄ?MESIO: jÅ«sų tinklo srautas dar neapsaugotas! Nustatykite programÄ?les naudoti HTTP tarpinį serverį į 127.0.0.1:8118 arba SOCKS4A ar SOCKS5 tarpinį serverį į 127.0.0.1:9050</string>
-  <string name="menu_home">Pradžia</string>
-  <string name="menu_browse">Naršyti</string>
-  <string name="menu_settings">Nustatymai</string>
+    <string name="menu_settings">Nustatymai</string>
   <string name="menu_log">Žurnalas</string>
-  <string name="menu_info">Pagalba</string>
-  <string name="menu_apps">ProgramÄ?lÄ?s...</string>
-  <string name="menu_start">PradÄ?ti</string>
+    <string name="menu_start">PradÄ?ti</string>
   <string name="menu_stop">Baigti</string>
   <string name="menu_about">Apie</string>
-  <string name="menu_promo_apps">Daugiau programÄ?lių...</string>
-  <string name="main_layout_download">Parsiuntimas</string>
+    <string name="main_layout_download">Parsiuntimas</string>
   <string name="main_layout_upload">IÅ¡siuntimas</string>
-  <string name="button_help">Pagalba</string>
-  <string name="button_close">Uždaryti</string>
-  <string name="button_about">Apie</string>
-  <string name="button_clear_log">Valyti žurnalÄ?</string>
-  <string name="menu_verify">Tikrinti</string>
-  <string name="menu_exit">IÅ¡eiti</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="press_to_start">-ilgai palaikyti, kad paleisti-</string>
-  <string name="pref_trans_proxy_group">Permatomas tarpininkavimas (reikalinga Root prieiga)</string>
-  <string name="pref_trans_proxy_title">Permatomas tarpininkavimas</string>
-  <string name="pref_trans_proxy_summary">Priverstinai naudoti Tor programÄ?lÄ?ms </string>
-  <string name="pref_transparent_all_title">Tor viskam</string>
-  <string name="pref_transparent_all_summary">Tarpininkauti duomenų srautÄ? visoms programÄ?lÄ?ms per Tor</string>
-  <string name="pref_transparent_port_fallback_summary">DÄ?MESIO: sujungimui naudoti įprastus (80, 443, ar kt.) portus. *JEIGU* \'Visos\' ar \'ProgramÄ?lÄ?ms\' režimas neveikia.</string>
-  <string name="pref_transparent_port_title">Portų sÄ?raÅ¡as</string>
-  <string name="pref_transparent_port_summary">Portų sÄ?raÅ¡as tinklo užkardai. *JEIGU* </string>
-  <string name="pref_transparent_port_dialog">Įveskite portus tinklo užkardai</string>
-  <string name="pref_has_root">Reikalauti Root prieigos</string>
-  <string name="pref_has_root_summary">Reikalauti Root prieigos permatomai tinklo užkardai</string>
-  <string name="status_install_success">Tor failai įrašyti!</string>
-  <string name="status_install_fail">Tor failų nepavyko įraÅ¡yti, patikrinkite žurnalÄ? ir praneÅ¡kite tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ProgramÄ?lÄ?s klaida</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Apie Orbot</string>
-  <string name="btn_next">Kitas</string>
-  <string name="btn_back">Atgal</string>
-  <string name="btn_finish">Baigti</string>
-  <string name="btn_okay">Gerai</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>
-  <string name="wizard_permissions_root">Leidimas suteiktas</string>
-  <string name="wizard_permissions_stock">Orbot leidimai</string>
-  <string name="wizard_premissions_msg_root">Puiku! JÅ«s suteikÄ?te Root teises Orbot programÄ?lei, mes panaudosime Å¡iÄ? galiÄ? iÅ¡mintingai.</string>
-  <string name="wizard_permissions_msg_stock">Kas neprivaloma, bet Orbot taptų galingesniu įrankiu, jei programÄ?lÄ? turÄ?tų Root priegÄ?. Mygtuku apaÄ?ioje galite suteikti Orbot super-galių!</string>
-  <string name="wizard_permissions_no_root">Jei neturite root prieigos arba nesuprantate, apie kÄ? mes kalbame, tiesiog įsitikinkite kad naudosite programÄ?les, sukurtas veikti su Orbot.</string>
-  <string name="wizard_permissions_consent">AÅ¡ suprantu ir norÄ?Ä?iau tÄ?sti be Supernaudotojo</string>
-  <string name="wizard_permission_enable_root">Suteikti Orbot root privilegijas</string>
-  <string name="wizard_configure">Konfiguruoti TorifikacijÄ?</string>
-  <string name="wizard_configure_msg">Orbot duoda jums parinktis siųsti visÄ? programÄ?lių duomenų srautÄ? per Tor ARBA pasirinkti savo programÄ?les indvidualiai. </string>
-  <string name="wizard_configure_all">Tarpininkauti duomenų srautÄ? visoms programÄ?lÄ?ms per Tor</string>
-  <string name="wizard_configure_select_apps">Pasirinkti savas programÄ?les Tor</string>
-  <string name="wizard_tips_tricks">Orbot-įjungtos programÄ?lÄ?s</string>
-  <string name="wizard_proxy_help_info">Proxy nustatymai</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Bendra</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Ä®spÄ?jimas</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Permatoma tinklo užkarda</string>
-  <string name="wizard_transproxy_none">Joks</string>
-  <string name="status">Statusas</string>
-  <string name="error">Klaida</string>
+    <string name="error">Klaida</string>
   <string name="bridges">Tinklų tiltai</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Kalba</string>
-  <string name="btn_save_settings">IÅ¡saugoti nustatymus</string>
-  <string name="bandwidth_">Siuntimo sparta:</string>
-  <string name="get_bridges_email">El. paštas</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>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 7c222d67..327e1f6b 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -2,134 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespÄ?ju citÄ?m lietotnÄ?m droÅ¡Ä?k lietot internetu. Orbot izmanto Tor, lai Å¡ifrÄ?tu JÅ«su interneta datplÅ«smu, tad to paslÄ?pj, pÄ?rsÅ«tot to caur daudziem datoriem visÄ? pasaulÄ?. Tor ir bezmaksas programmatÅ«ra un atvÄ?rts tÄ«kls, kas palÄ«dz Jums aizsargÄ?ties pret tÄ«kla uzraudzÄ«bas veidu - datplÅ«smas analÄ«zi -, ar kuras palÄ«dzÄ«bu tiek apdraudÄ?ta personiskÄ? brÄ«vÄ«ba un privÄ?tums, konfidenciÄ?las lietiÅ¡Ä·as darbÄ«bas un attiecÄ«bas, kÄ? arÄ« valsts droÅ¡Ä«ba.  </string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">startÄ?t un apturÄ?t Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startÄ?...</string>
+    <string name="status_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="tor_process_waiting">gaida.</string>
-  <string name="not_anonymous_yet">BRĪDINÄ?JUMS: JÅ«su datplÅ«sma vÄ?l nav anonÄ«ma! LÅ«dzu konfigurÄ?jiet savas lietotnes, lai tÄ?s izmantotu HTTP starpnieku 127.0.0.1:8118 vai SOCKS4A , vai SOCKS5 starpnieku 127.0.0.1:9050</string>
-  <string name="menu_home">MÄ?jas</string>
-  <string name="menu_browse">PÄ?rlÅ«kot</string>
-  <string name="menu_settings">Iestatījumi</string>
+    <string name="menu_settings">Iestatījumi</string>
   <string name="menu_log">ŽurnÄ?ls</string>
-  <string name="menu_info">Palīdzība</string>
-  <string name="menu_start">StartÄ?t</string>
+    <string name="menu_start">StartÄ?t</string>
   <string name="menu_stop">ApturÄ?t</string>
   <string name="menu_about">Par</string>
-  <string name="menu_promo_apps">SaÅ?emt lietotnes...</string>
-  <string name="main_layout_download">LejupielÄ?de</string>
+    <string name="main_layout_download">LejupielÄ?de</string>
   <string name="main_layout_upload">AugÅ¡upielÄ?de</string>
-  <string name="button_help">Palīdzība</string>
-  <string name="button_close">AizvÄ?rt</string>
-  <string name="button_about">Par</string>
-  <string name="button_clear_log">NotÄ«rÄ«t žurnÄ?lu</string>
-  <string name="menu_verify">PÄ?rbaudÄ«t</string>
-  <string name="menu_exit">Iziet</string>
+    <string name="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="press_to_start">Lai startÄ?tu, nospiediet ilgi</string>
-  <string name="pref_trans_proxy_group">PÄ?rredzama starpniekoÅ¡ana (nepiecieÅ¡amas saknes pilnvaras)</string>
-  <string name="pref_trans_proxy_title">PÄ?rredzama starpniekoÅ¡ana</string>
-  <string name="pref_trans_proxy_summary">LietotÅ?u automÄ?tiska torificÄ?Å¡ana</string>
-  <string name="pref_transparent_all_title">Tor\'Ä?t visu</string>
-  <string name="pref_transparent_all_summary">Visu lietotÅ?u starpnieku datplÅ«sma caur Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porta starpnieka atkÄ?pnorÄ?de</string>
-  <string name="pref_transparent_port_fallback_summary">BRĪDINÄ?JUMS: Apiet parastos portus (80., 443., u.tml.). *IZMANTOJIET VIENĪGI* ja nestrÄ?dÄ? \'All\' vai \'App\' režīmi.</string>
-  <string name="pref_transparent_port_title">Portu saraksts</string>
-  <string name="pref_transparent_port_summary">Saraksts portiem uz starpnieku. *IZMANTOJIET VIENĪGI* ja nestrÄ?dÄ? \'All\' vai \'App\' režīmi.</string>
-  <string name="pref_transparent_port_dialog">Ievadiet portus uz starpnieku</string>
-  <string name="pref_has_root">Pieprasīt piekļuves saknes tiesības</string>
-  <string name="pref_has_root_summary">PieprasÄ«t piekļuves saknes tiesÄ«bas pÄ?rredzamai starniekoÅ¡anai</string>
-  <string name="status_install_success">SekmÄ«gi instalÄ?tas Tor binÄ?rÄ?s datnes!</string>
-  <string name="status_install_fail">Nebija iespÄ?jams instalÄ?t Tor binÄ?rÄ?s datnes. LÅ«dzu pÄ?rbaudiet žurnÄ?lu, un informÄ?jiet tor-assistants@xxxxxxxxxxxxxx </string>
-  <string name="title_error">Lietojumprogrammas kļūda</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Par Orbot</string>
-  <string name="btn_next">TÄ?lÄ?k</string>
-  <string name="btn_back">Atpakaļ</string>
-  <string name="btn_finish">Beigt</string>
-  <string name="btn_okay">Labi</string>
+    <string name="btn_okay">Labi</string>
   <string name="btn_cancel">Atcelt</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">VairÄ?k informÄ?cijas par Orbot</string>
-  <string name="wizard_permissions_root">Tiesības piešķirtas</string>
-  <string name="wizard_permissions_stock">Orbot tiesības</string>
-  <string name="wizard_premissions_msg_root">Ä»oti labi! MÄ?s konstatÄ?jÄ?m, ka Orbot\'am ir iespÄ?jotas saknes tiesÄ«bas. MÄ?s apdomÄ«gi izmantosim Å¡Ä«s tiesÄ«bas.</string>
-  <string name="wizard_permissions_msg_stock">Lai gan tas nav obligÄ?ti, Orbot kļūst par vÄ?l ietekmÄ«gÄ?ku rÄ«ku, ja JÅ«su ierÄ«cei ir saknes piekļuves tiesÄ«bas. Izmantojiet zemÄ?k atrodoÅ¡os pogu, lai pieÅ¡Ä·irtu Orbot\'am Ä«paÅ¡u spÄ?ku!  </string>
-  <string name="wizard_permissions_no_root">Ja Jums nav saknes piekļuves tiesÄ«bu vai Jums nav nojausmas par ko te ir runa, pÄ?rliecinieties, ka izmantojat lietotnes, kuras paredzÄ?tas darbam ar Orbot.</string>
-  <string name="wizard_permissions_consent">Es saprotu un vÄ?los turpinÄ?t bez superlietotÄ?ja tiesÄ«bÄ?m.</string>
-  <string name="wizard_permission_enable_root">Piešķirt Orbot saknes tiesības</string>
-  <string name="wizard_configure">KonfigurÄ?t torifikÄ?ciju</string>
-  <string name="wizard_configure_msg">Orbot sniedz iespÄ?ju marÅ¡rutÄ?t visu lietojumu datplÅ«smu caur Tor\'u vai izvÄ?lÄ?ties lietojumprogrammas tÄ?s norÄ?dot individuÄ?li.</string>
-  <string name="wizard_configure_all">Visas lietotnes izmantot starpniecÄ«bas režīmÄ? caur Tor</string>
-  <string name="wizard_configure_select_apps">IzvÄ?lÄ?ties individuÄ?las lietotnes Tor\'am</string>
-  <string name="wizard_tips_tricks">Orbot-iespÄ?jotas lietotnes</string>
-  <string name="wizard_tips_msg">ZemÄ?k norÄ?dÄ«tÄ?s lietotnes ir izveidotas darbam ar Orbot. NoklikÅ¡Ä·iniet katru no pogÄ?m, lai instalÄ?tu tÅ«liÅ?, vai varat tÄ?s uzmeklÄ?t vÄ?lÄ?k Android TirgÅ«.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - DroÅ¡s Android\'a tÅ«lÄ«tÄ?jÄ?s ziÅ?ojumapmaiÅ?as klients</string>
-  <string name="wizard_tips_proxy">Starpnieka iestatÄ«jumi - Uzzini kÄ? konfigurÄ?t lietotnes, lai tÄ?s strÄ?dÄ?tu ar Orbot</string>
-  <string name="wizard_tips_duckgo">MeklÄ?tÄ?jprogrammas Duckduckgo lietotne</string>
-  <string name="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Sagatavojiet stÄ?stu un, lai uzlabotu droÅ¡Ä«bu, atstÄ?jiet to Tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Starpnieka iestatījumi</string>
-  <string name="wizard_proxy_help_msg">Ja JÅ«su lietotÄ? Android lietotne spÄ?j nodroÅ¡inÄ?t HTTP vai SOCKS starpniekserveri, tad varat to nokonfigurÄ?t tÄ?, lai tÄ? savienotos ar Orbot un lietotu Tor. ViesotÄ?ja iestatÄ«jumi ir 127.0.0.1 vai â??localhostâ??. HTTP porta iestatÄ«jums ir 8118. SOCKS starpniekserveris ir 9050. PÄ?c iespÄ?jas izmantojiet SOCKS4A vai SOCKS5. Uzziniet vairÄ?k par starpniekoÅ¡anu Android platformÄ? un tÄ«mekļa vietnÄ? lasiet atbildes, kuras sagatavotas biežÄ?k uzdotiem jautÄ?jumiem jeb FAQ: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot ir gatavs darbam!</string>
-  <string name="wizard_final_msg">Miljoniem ļaužu visÄ? pasaulÄ? lieto Tor dažÄ?diem mÄ?rÄ·iem. ŽurnÄ?listi un emuÄ?ru autori, cilvÄ?ktiesÄ«bu aizstÄ?vji, likumsargi, karavÄ«ri, korporÄ?cijas, apspiestÄ«bÄ? dzÄ«vojuÅ¡i iedzÄ«votÄ?ji, un vienkÄ?rÅ¡i parasti cilvÄ?ki ... un tagad arÄ« JÅ«s esat tam gatavs!</string>
-  <string name="wizard_exit_at_first_screen_toast">LÅ«dzu nokonfigurÄ?jiet Orbot pirms sÄ?kat to lietot!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">JÅ«s esat sekmÄ«gi pievienojies tÄ«klam Tor - taÄ?u tas NEnozÄ«mÄ?, ka JÅ«su ierÄ«ce ir droÅ¡a. JÅ«s varat izmantot pogu â??PÄ?rlÅ«ksâ??, lai pÄ?rbaudÄ«tu savu savienojumu. \n\nApmeklÄ?jiet mÅ«s https://guardianproject.info/apps/orbot vai sÅ«tiet e-pastu uz help@xxxxxxxxxxxxxxxxxxxx , lai uzzinÄ?tu vairÄ?k.</string>
-  <string name="tor_check">Å Ä« darbÄ«ba tÄ«mekļa pÄ?rlÅ«kÄ? atvÄ?rs https://check.torproject.org , lai redzÄ?tu vai Orbot ir konfigurÄ?ts un esat izveidojies savienojumu ar Tor.</string>
-  <string name="pref_hs_group">SlÄ?ptu pakalpojumu viesoÅ¡ana</string>
-  <string name="pref_general_group">VispÄ?rÄ«gi</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot ieved Tor Android\'u pasaulÄ?! Tor palÄ«dz aizsargÄ?ties pret satura filtrÄ?Å¡anu, datplÅ«smas analÄ«zi un tÄ«kla novÄ?roÅ¡anu, kuras apdraud privÄ?tumu, konfidenciÄ?lu informÄ?ciju un personiskÄ?s attiecÄ«bas. Å is vednis palÄ«dzÄ?s JÅ«su iekÄ?rtÄ? nokonfigurÄ?t Orbot\'u un Tor\'u.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">BrÄ«dinÄ?jums</string>
-  <string name="wizard_warning_msg">Pati Orbot instalÄ?Å¡ana vÄ?l nepadarÄ«s anonÄ«mu JÅ«su mobilo datplÅ«smu.\n\nJums pareizi jÄ?nokonfigurÄ? Orbot, sava ierÄ«ce un citas lietotnes, lai sekmÄ«gi lietotu Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Tesības</string>
-  <string name="wizard_permissions_root_msg1">PÄ?c izvÄ?les variet pieÅ¡Ä·irt Orbot\'am \'SuperlietotÄ?ja\' piekļuves tiesÄ«bas, lai iespÄ?ju lietpratÄ«gus lÄ«dzekļus, tÄ?dus kÄ? Transparent Proxying jeb PÄ?rredzamÄ? .</string>
-  <string name="wizard_permissions_root_msg2">Ja nevÄ?laties Å¡o darÄ«t, lÅ«dzu, pÄ?rliecinieties, ka izmantojat lietotnes, kuras paredzÄ?tas darbam ar Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Å Ä·iet, ka JÅ«su ierÄ«ce nav saknÄ?ta vai arÄ« nenodroÅ¡ina saknes jeb superlietotÄ?ja piekļuvi.\n\nLÅ«dzu pamÄ?Ä£iniet citÄ?di - galvenajÄ? ekrÄ?nÄ? lietojiet režīmu â??Lietotnesâ??.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot\'a iespÄ?jotas lietotnes</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: PadarÄ«t tÄ?rzÄ?Å¡anas lietotni droÅ¡Ä?ku ar Off-the-Record Å¡ifrÄ?Å¡anu</string>
-  <string name="wizard_tips_orweb">Orfox: Tor izmantojoÅ¡s pÄ?rlÅ«ks ar uzlabotu privÄ?tumu</string>
-  <string name="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'Ä?</string>
-  <string name="wizard_tips_fdroid">Atrodiet visas Guardian Project lietotnes F-Droid\'Ä?</string>
-  <string name="wizard_tips_fdroid_org">Atrodiet visas Guardian Project lietotnes https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">PÄ?rredzama starpniekoÅ¡ana</string>
-  <string name="wizard_transproxy_msg">Å is ļauj JÅ«su lietotnÄ?m automÄ?tiski, bez jebkÄ?das papildu konfigurÄ?cijas darboties caur Tor tÄ«klu.</string>
-  <string name="wizard_transproxy_hint">(AtzÄ«mÄ?jiet Å¡o kastÄ«ti gadÄ«jumÄ? ja Jums nav ne mazÄ?kÄ?s nojausmas par to, ko mÄ?s te runÄ?jam)</string>
-  <string name="wizard_transproxy_none">Neviens</string>
-  <string name="pref_transparent_tethering_title">Tor valgošana</string>
-  <string name="pref_transparent_tethering_summary">IespÄ?jot Tor PÄ?rredzamo starpniekoÅ¡anu Wifi\'m un USB valgoÅ¡anas ierÄ«cÄ?m (nepiecieÅ¡ams pÄ?rstartÄ?t)</string>
-  <string name="button_grant_superuser">PieprasÄ«t superlietotÄ?ja piekļuvi</string>
-  <string name="pref_select_apps">IzvÄ?lÄ?ties lietotnes</string>
-  <string name="pref_select_apps_summary">IzvÄ?lÄ?ties lietotnes, lai marÅ¡rutÄ?tu caur Tor</string>
-  <string name="pref_node_configuration">Mezglu konfigurÄ?cija</string>
+    <!--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="button_proxy_all">Lietot starpniekserveri visam</string>
-  <string name="button_proxy_none">Nekam nelietot starpniekserveri</string>
-  <string name="button_invert_selection">MainÄ«t atlasi uz pretÄ?jo</string>
-  <string name="pref_proxy_title">TÄ«kla Ä?rejoÅ¡ais starpnieks (neobligÄ?ts)</string>
+    <string name="pref_proxy_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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">Ä?rvÄ?rstÄ? starpnieka parole</string>
   <string name="pref_proxy_password_summary">Starpnieka parole (neobligÄ?ti)</string>
   <string name="pref_proxy_password_dialog">Ievadīt starpnieka paroli</string>
-  <string name="status">Statuss</string>
-  <string name="setting_up_full_transparent_proxying_">Iestata pilnÄ«bÄ? pÄ?rredzamu starpniekoÅ¡anu...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Iestata lietotÅ?u nodroÅ¡inÄ?tu starpniekoÅ¡anu...</string>
-  <string name="transparent_proxying_enabled">PÄ?rredzama starpniekoÅ¡ana IESPÄ?JOTA</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy iespÄ?jots valgoÅ¡anai!</string>
-  <string name="warning_error_starting_transparent_proxying_">BRĪDINÄ?JUMS: kļūda uzsÄ?kot pÄ?rredzamu starpniekoÅ¡anu!</string>
-  <string name="transproxy_rules_cleared">TransProxy kÄ?rtulas notÄ«rÄ«tas</string>
-  <string name="couldn_t_start_tor_process_">NeizdevÄ?s palaist Tor\'a procesu:</string>
-  <string name="privoxy_is_running_on_port_">Polipo strÄ?dÄ? caur portu: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Iestata portu nodroÅ¡inÄ?tu pÄ?rredzamu starpniekoÅ¡anu...</string>
-  <string name="bridge_error">Tilta kļūda</string>
-  <string name="bridge_requires_ip">Lai izmantotu tilta lÄ«dzekli, jÄ?ievada vismaz viena tilta IP adrese.</string>
-  <string name="send_email_for_bridges">No Gmail konta sÅ«tiet e-pastu uz bridges@xxxxxxxxxxxxxx ar rindu \"get bridges\" e-pasta ziÅ?ojuma korpusÄ?.</string>
-  <string name="error">Kļūda</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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Izmantojiet *vienÄ«gi* Å¡os norÄ?dÄ«tos mezglus</string>
   <string name="bridges">Tilti</string>
   <string name="use_bridges">Lietot tiltus</string>
-  <string name="bridges_obfuscated">NomaskÄ?tie tilti</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">IespÄ?jot, ja konfigurÄ?tie tilti ir nomaskÄ?tie tilti</string>
-  <string name="ip_address_and_port_of_bridges">Tiltu ports un IP addrese</string>
+    <string name="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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Sasniedzamie porti</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
   <string name="enter_ports">Ievadiet portus</string>
-  <string name="enable_hidden_services">SlÄ?ptu pakalpojumu viesoÅ¡ana</string>
-  <string name="run_servers_accessible_via_the_tor_network">ļaut no tÄ«kla Tor piekļūt serverim, kurÅ¡ ir ierÄ«cÄ?.  </string>
-  <string name="enter_localhost_ports_for_hidden_services">ievadiet slÄ?pto pakalpojumu localhost portus</string>
-  <string name="hidden_service_ports">SlÄ?ptu pakalpojumu porti</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">JÅ«su slÄ?ptÄ? pakalpojuma adresÄ?jams vÄ?rds (tiek Ä£enerÄ?ts automÄ?tiski)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">iespÄ?jot atkļūdoÅ¡anas žurnÄ?lu izvadei (jÄ?lieto adb vai aLogCat , lai skatÄ«tu)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">iespÄ?jot atkļūdoÅ¡anas žurnÄ?lu izvadei (jÄ?lieto adb vai aLogCat , lai skatÄ«tu)</string>
   <string name="project_home">Projekta mÄ?jas:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor licence</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Trešo personu programmatūra:</string>
+    <string name="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="hidden_service_on">SlÄ?pts pakalpojums uz:</string>
-  <string name="unable_to_read_hidden_service_name">NespÄ?j lasÄ«t slÄ?pta pakalpojuma nosaukumu</string>
+    <string name="unable_to_read_hidden_service_name">NespÄ?j lasÄ«t slÄ?pta pakalpojuma nosaukumu</string>
   <string name="unable_to_start_tor">Nevar startÄ?t Tor:</string>
-  <string name="unable_to_reset_tor">NespÄ?ja atiestatÄ«t Tor, sÄ?knÄ?jiet ierÄ«ci atkÄ?rtoti!</string>
-  <string name="pref_use_sys_iptables_title">Izmantot noklusÄ?juma Iptables</string>
-  <string name="pref_use_sys_iptables_summary">lietot iebÅ«vÄ?to binÄ?ro datni iptables nevis to, kura ir Orbot komplektÄ?cijÄ?</string>
-  <string name="error_installing_binares">Tor binÄ?rÄ?s datnes nebija iespÄ?jams ne instalÄ?t, ne jauninÄ?t.</string>
-  <string name="pref_use_persistent_notifications">VienmÄ?r paturÄ?t ikonu rÄ«kjoslÄ?, kad Orbot ir savienots</string>
+    <string name="pref_use_persistent_notifications">VienmÄ?r paturÄ?t ikonu rÄ«kjoslÄ?, kad Orbot ir savienots</string>
   <string name="pref_use_persistent_notifications_title">VienmÄ?r ieslÄ?gtie paziÅ?ojumi</string>
   <string name="pref_use_expanded_notifications">RÄ?dÄ«t paplaÅ¡inÄ?tus paziÅ?ojumus, kur norÄ?dÄ«ts IP un Tor izejas valsts</string>
   <string name="pref_use_expanded_notifications_title">PaplaÅ¡inÄ?ti paziÅ?ojumi</string>
-  <string name="notification_using_bridges">Tilti ir iespÄ?joti!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Valoda</string>
-  <string name="set_locale_summary">Iestatiet Orbot lokalizÄ?ciju un valodu</string>
-  <string name="wizard_locale_title">IzvÄ?lÄ?ties valodu</string>
-  <string name="wizard_locale_msg">AtstÄ?jiet noklusÄ?juma vÄ?rtÄ«bas, vai pÄ?rslÄ?dziet paÅ¡reizÄ?jo valodu.</string>
-  <string name="powered_by">strÄ?dÄ? ar Tor</string>
-  <string name="btn_save_settings">SaglabÄ?t iestatÄ«jumus</string>
-  <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstÄ?vÄ?...</string>
-  <string name="bandwidth_">Joslas platums:</string>
-  <string name="down">lejup</string>
-  <string name="up">augšup</string>
-  <string name="pref_disable_network_title">Neizmantot tÄ«kla automÄ?tiskÄ? miega režīmu</string>
+    <string name="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="menu_verify_browser">PÄ?rlÅ«ks</string>
-  <string name="menu_use_chatsecure">Lietot ChatSecure</string>
-  <string name="permission_manage_tor_label">PÄ?rvaldÄ«t Tor\'u</string>
-  <string name="permission_manage_tor_description">IespÄ?jot Å¡o lietotni kontrolÄ?t pakalpojumu Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nav tīkla savienojuma. Tor\'am iestata miega režīmu...</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>
@@ -250,19 +121,7 @@
   <string name="pref_torrc_title">Torrc pielÄ?gota konfigurÄ?Å¡ana</string>
   <string name="pref_torrc_summary">VIENĪGI EKSPERTIEM: tieÅ¡i ievadÄ«t torrc konfigurÄ?Å¡anas rindas</string>
   <string name="pref_torrc_dialog">PielÄ?got Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech\'a cilvÄ?ktiesÄ«bu dokumentÄ?cijas lietotne</string>
-  <string name="your_tor_public_ips_">JÅ«su Tor publiskÄ?s IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">LÅ«dzu atspÄ?jojiet Å¡o lietotni Android-&gt;Settings-&gt;Apps , ja rodas ar Orbot saistÄ«tas problÄ?mas: </string>
-  <string name="app_conflict">LietotÅ?u konflikts</string>
-  <string name="pref_transproxy_refresh_title">PÄ?rredzamÄ? starpniekservera automÄ?tiska atsvaidzinÄ?Å¡ana</string>
-  <string name="pref_transproxy_refresh_summary">Kad mainÄ?s tÄ«kla stÄ?voklis, atkÄ?rtoti lietot PÄ?rredzamÄ? starpniekserva kÄ?rtulas</string>
-  <string name="pref_transproxy_flush_title">PÄ?rredzamÄ? starpniekservera  PIESPIEDU NOÅ?EMÅ ANA</string>
-  <string name="pref_transproxy_flush_summary">Pieskarties te, lai TŪLĪT iztÄ«rÄ«tu visas pÄ?rredzamÄ? starpniekservera tÄ«kla kÄ?rtulas</string>
-  <string name="transparent_proxy_rules_flushed_">PÄ?rredzamÄ? starpniekservera kÄ?rtulas ir iztÄ«rÄ«tas!</string>
-  <string name="you_do_not_have_root_access_enabled">SAKNES piekļuve nav iespÄ?jota</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Lai iestatÄ«jumu maiÅ?a tiktu iespÄ?jota, Jums var nÄ?kties apturÄ?t un startÄ?t Orbot.</string>
-  <string name="menu_vpn">Lietotnes</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,9 +135,7 @@
   <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="install_orweb">InstalÄ?t Orfox</string>
-  <string name="standard_browser">Standarta pÄ?rlÅ«ks</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">PIEZĪME: Uz Intel X86/ATOM ierÄ«cÄ?m darbosies tikai standarta Tor tilti</string>
-  <string name="hidden_services">SlÄ?ptie pakalpojumi</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>
diff --git a/app/src/main/res/values-mk/poestrings.xml b/app/src/main/res/values-mk/poestrings.xml
index f9c65fea..d553557e 100644
--- a/app/src/main/res/values-mk/poestrings.xml
+++ b/app/src/main/res/values-mk/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Ð?оÑ?Ñ?овиÑ?е за Tor Ñ?елеаÑ?а помагааÑ? за заобиколÑ?ваÑ?е на Ñ?ензÑ?Ñ?аÑ?а. Ð?ожеÑ?е да ги пÑ?обаÑ?е моÑ?Ñ?овиÑ?е ако Tor е блокиÑ?ан од ваÑ?иоÑ? инÑ?еÑ?неÑ? Ñ?еÑ?виÑ? пÑ?оваÑ?деÑ?; Ñ?екоÑ? Ñ?ип на моÑ?Ñ? коÑ?иÑ?Ñ?и Ñ?азлиÑ?ен меÑ?од
-за избегнÑ?ваÑ?е на Ñ?ензÑ?Ñ?аÑ?а: ако еден Ñ?ип не Ñ?абоÑ?и пÑ?обаÑ?Ñ?е да коÑ?иÑ?Ñ?иÑ?е дÑ?Ñ?г.</string>
-
-    <string name="bridges_no">Ð?ема моÑ?Ñ?ови: Ð?иÑ?екÑ?но повÑ?зи Ñ?е на Tor</string>
-    <string name="bridges_provided">Ð?возможени моÑ?Ñ?ови:</string>
-    <string name="bridges_custom">Ð?Ñ?илагодени моÑ?Ñ?ови</string>
-
-    <string name="bridges_config">Ð?оÑ?Ñ?авки за моÑ?Ñ?</string>
-    <string name="action_done">Ð?авÑ?Ñ?ено</string>
 
     <string name="bridges_sometimes">Ð?онекогаÑ? е поÑ?Ñ?ебен моÑ?Ñ? да доÑ?деÑ?е до Tor.</string>
     <string name="action_more">Ð?Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">Ð?ва нема да ве напÑ?ави анонимни, но Ñ?е ви помогне да поминеÑ?е низ заÑ?Ñ?иÑ?ниÑ?е Ñ?идови.</string>
     <string name="action_vpn_choose">Ð?Ð?Ð?Ð?РÐ? Ð?Ð?Ð?Ð?Ð?Ð?ЦÐ?Ð?</string>
 
-    <string name="status_connected">Ð?овÑ?зано!</string>
-
-    <string name="loading_claim_1">Ð?аÑ?аÑ?а Ñ?азновидна заедниÑ?а е Ñ?оа Ñ?Ñ?о го пÑ?ави Tor одлиÑ?ен!</string>
-    <string name="loading_claim_2">СекоÑ?дневно лÑ?Ñ?еÑ?о го коÑ?иÑ?Ñ?аÑ? Tor за да избегнаÑ? да бидаÑ? Ñ?ледени од Ñ?еклами.</string>
-    <string name="loading_claim_3">Ð?ога ФеÑ?Ñ?бÑ?к е блокиÑ?ан, лÑ?Ñ?еÑ?о коÑ?иÑ?Ñ?аÑ? Tor за да Ñ?е повÑ?заÑ? Ñ?о нивноÑ?о Ñ?емеÑ?Ñ?Ñ?во и нивниÑ?е пÑ?иÑ?аÑ?ели.</string>
-    <string name="loading_claim_4">Ð?кÑ?ивиÑ?Ñ?иÑ?е го коÑ?иÑ?Ñ?аÑ? Tor за Ñ?лободно да Ñ?виÑ?ааÑ? нивни миÑ?леÑ?а и веÑ?Ñ?ваÑ?а.</string>
-    <string name="loading_claim_5">Ð?логеÑ?иÑ?е го коÑ?иÑ?Ñ?аÑ? Tor за да Ñ?оÑ?миÑ?ааÑ? инÑ?еÑ?неÑ? миÑ?инзи за Ñ?еÑ?оÑ?ми.</string>
-    <string name="loading_claim_6">Ð?овинаÑ?иÑ?е го коÑ?иÑ?Ñ?аÑ? Tor за безбедно иÑ?Ñ?Ñ?ажÑ?ваÑ?е на Ñ?Ñ?оÑ?ии за кои пиÑ?Ñ?вааÑ?.</string>
-    <string name="loading_claim_7">Ð?изниÑ?мени го коÑ?иÑ?Ñ?аÑ? Tor за да Ñ?а заÑ?Ñ?вааÑ? пÑ?иваÑ?ноÑ?Ñ?а на Ñ?воиÑ?е деловни Ñ?аÑ?ни.</string>
-    <string name="loading_claim_8">РабоÑ?ниÑ?иÑ?е го коÑ?иÑ?Ñ?аÑ? Tor за да Ñ?е боÑ?аÑ? за пÑ?авдаÑ?а без Ñ?Ñ?Ñ?ав од гÑ?беÑ?е на Ñ?воÑ?аÑ?а Ñ?абоÑ?а.</string>
-
-    <string name="status_connecting">Ð?ие Ñ?е повÑ?зÑ?ваме Ñ?о Ñ?ебе.\"=\"Ð?ие Ñ?е повÑ?зÑ?ваме Ñ?о Ñ?ебе.</string>
-
     <string name="hello">Ð?дÑ?аво</string>
     <string name="welcome">Ð?обÑ?едоÑ?довÑ?е на Tor на мобилен.</string>
 
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index e73b8a0e..afb79259 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -2,125 +2,38 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot е Ñ?лободна пÑ?окÑ?и апликаÑ?иÑ?а коÑ?а им овозможÑ?ва на дÑ?Ñ?гиÑ?е апликаÑ?ии да го коÑ?иÑ?Ñ?аÑ? Ð?нÑ?еÑ?неÑ?оÑ? побезбедно. Orbot коÑ?иÑ?Ñ?и Tor за енкÑ?ипÑ?иÑ?аÑ?е на инÑ?еÑ?неÑ? Ñ?ообÑ?аÑ?аÑ?оÑ?, а поÑ?оа го Ñ?окÑ?ива и го поÑ?Ñ?кокнÑ?ва пÑ?екÑ? Ñ?еÑ?иÑ?а компÑ?Ñ?Ñ?еÑ?и низ Ñ?елиоÑ? Ñ?веÑ?. Tor е Ñ?лободен Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ? ви помага да Ñ?е одбаÑ?ниÑ?е од Ñ?оÑ?ми на надзоÑ? на мÑ?ежаÑ?а коÑ? им Ñ?е заканÑ?ва на ваÑ?аÑ?а лиÑ?на Ñ?лобода и пÑ?иваÑ?ноÑ?Ñ?, довеÑ?ливиÑ?е деловни акÑ?ивноÑ?Ñ?и и одноÑ?и, и дÑ?жавнаÑ?а безбедноÑ?Ñ? познаÑ?а како анализа на Ñ?ообÑ?аÑ?аÑ?оÑ?.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ? и Ñ?Ñ?опиÑ?аÑ? го Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
   <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва...</string>
   <string name="status_activated">Ð?овÑ?зан на мÑ?ежаÑ?а на Tor</string>
   <string name="status_disabled">Ð?Ñ?боÑ? е деакÑ?ивиÑ?ан</string>
   <string name="status_shutting_down">Tor-СеÑ?виÑ?оÑ? Ñ?е иÑ?клÑ?Ñ?Ñ?ва</string>
   <string name="tor_process_starting">СÑ?аÑ?Ñ?Ñ?ваÑ?е на Tor клиенÑ?оÑ?...</string>
   <string name="tor_process_complete">завÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">Ñ?екаÑ?е.</string>
-  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аÑ?иоÑ? Ñ?ообÑ?аÑ?аÑ? Ñ?è Ñ?Ñ?Ñ?е не е анонимен! Ð?оÑ?Ñ?ебно е да ги конÑ?игÑ?Ñ?иÑ?аÑ?е ваÑ?иÑ?е апликаÑ?ии за да го коÑ?иÑ?Ñ?аÑ? HTTP пÑ?окÑ?и 127.0.0.1:8118, или пÑ?окиÑ?аÑ?а SOCKS4A или SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?ома</string>
-  <string name="menu_browse">Ð?дбеÑ?и</string>
   <string name="menu_settings">Ð?оÑ?Ñ?авки</string>
   <string name="menu_log">Ð?невник</string>
-  <string name="menu_info">Ð?омоÑ?</string>
-  <string name="menu_apps">Ð?пликаÑ?ии...</string>
   <string name="menu_start">Ð?апоÑ?ни</string>
   <string name="menu_stop">Ð?апÑ?и</string>
   <string name="menu_about">Ð?а</string>
-  <string name="menu_promo_apps">Ð?Ñ?еземи аппликаÑ?ии...</string>
   <string name="main_layout_download">Ð?Ñ?еземи</string>
   <string name="main_layout_upload">Ð?Ñ?икаÑ?и</string>
-  <string name="button_help">Ð?омоÑ?</string>
-  <string name="button_close">Ð?аÑ?воÑ?и</string>
   <string name="button_about">Ð?а</string>
-  <string name="button_clear_log">Ð?збÑ?иÑ?и дневник на акÑ?ивноÑ?Ñ?и</string>
-  <string name="menu_verify">Ð?Ñ?овеÑ?и</string>
   <string name="menu_exit">Ð?злез</string>
   <string name="menu_scan">СкениÑ?аÑ? QR на моÑ?Ñ?</string>
   <string name="menu_share_bridge">Сподели QR на моÑ?Ñ?</string>
-  <string name="press_to_start">- пÑ?иÑ?Ñ?иÑ?ни подолго за Ñ?Ñ?аÑ?Ñ? -</string>
-  <string name="pref_trans_proxy_group">ТÑ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е (баÑ?а root пÑ?иÑ?Ñ?ап)</string>
-  <string name="pref_trans_proxy_title">ТÑ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?Ñ?ки Tor-поÑ?Ñ?авки на апликаÑ?ииÑ?е</string>
-  <string name="pref_transparent_all_title">ЦелоÑ?ни Tor-поÑ?Ñ?авки</string>
-  <string name="pref_transparent_all_summary">Ð?Ñ?енаÑ?оÑ?и го Ñ?ообÑ?аÑ?аÑ?оÑ? на Ñ?иÑ?е апликаÑ?ии пÑ?екÑ? Tor</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?вна поÑ?Ñ?а за пÑ?окÑ?и</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аобиколи ги Ñ?еÑ?Ñ?о коÑ?иÑ?Ñ?ениÑ?е поÑ?Ñ?и (80, 443, иÑ?н). *Ð?Ð?РÐ?СТÐ? СÐ?Ð?Ð?* ако Ñ?ежимиÑ?е \'All\' или \'App\' не Ñ?абоÑ?аÑ?.</string>
-  <string name="pref_transparent_port_title">Ð?иÑ?Ñ?а на поÑ?Ñ?и</string>
-  <string name="pref_transparent_port_summary">Ð?иÑ?Ñ?а на поÑ?Ñ?и за пÑ?окÑ?и. *Ð?Ð?РÐ?СТÐ? СÐ?Ð?Ð?* ако Ñ?ежимиÑ?е \'All\' или \'App\' не Ñ?абоÑ?аÑ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?неÑ?еÑ?е поÑ?Ñ?и за пÑ?окÑ?и</string>
-  <string name="pref_has_root">Ð?аÑ?аÑ?е за ROOT пÑ?иÑ?Ñ?ап</string>
-  <string name="pref_has_root_summary">Ð?аÑ?аÑ?е за ROOT пÑ?иÑ?Ñ?ап за Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е</string>
-  <string name="status_install_success">Ð?звÑ?Ñ?ниÑ?е пÑ?огÑ?ами на Tor Ñ?е Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ани!</string>
-  <string name="status_install_fail">Ð?звÑ?Ñ?ниÑ?е даÑ?оÑ?еки на Tor не можаÑ? да Ñ?е инÑ?Ñ?алиÑ?ааÑ?. Ð?Ñ?овеÑ?еÑ?е во дневникоÑ? и извеÑ?Ñ?еÑ?е нè на tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?еÑ?ка во апликаÑ?иÑ?аÑ?а</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?а Orbot</string>
-  <string name="btn_next">Следно</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?Ñ?аÑ?</string>
   <string name="btn_okay">OK</string>
   <string name="btn_cancel">Ð?Ñ?кажи</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ð?еколкÑ? деÑ?али за Orbot</string>
   <string name="wizard_details_msg">Orbot e апликаÑ?иÑ?а Ñ?о оÑ?воÑ?ен код коÑ?а Ñ?одÑ?жи Tor Obfs4Proxy, BadVPN Tun2Socks, LibEvent и Polipo. Ð?возможÑ?ва локален HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) во Tor мÑ?ежаÑ?а. Orbot иÑ?Ñ?о Ñ?ака има можноÑ?Ñ?, на Ñ?Ñ?ед Ñ?о root пÑ?иÑ?Ñ?ап, да го иÑ?пÑ?аÑ?а Ñ?елиоÑ? инÑ?еÑ?неÑ? Ñ?ообÑ?аÑ?аÑ? пÑ?екÑ? Tor.</string>
-  <string name="wizard_permissions_root">Ð?маÑ?е дозвола</string>
-  <string name="wizard_permissions_stock">Ð?озволи на Orbot</string>
-  <string name="wizard_premissions_msg_root">Ð?длиÑ?но! Ð?Ñ?кÑ?ивме дека овозможивÑ?е root пÑ?иÑ?Ñ?ап за Orbot. Ð?нимаÑ?елно Ñ?е Ñ?а коÑ?иÑ?Ñ?име оваа опÑ?иÑ?а.</string>
-  <string name="wizard_permissions_msg_stock">Ð?ако не е задолжиÑ?елно, Orbot може да Ñ?Ñ?ане помоÑ?на алаÑ?ка доколкÑ? ваÑ?иоÑ? Ñ?Ñ?ед има root пÑ?иÑ?Ñ?ап. Ð?оÑ?иÑ?Ñ?еÑ?е го копÑ?еÑ?о подолÑ? за да мÑ? дадеÑ?е на Orbot Ñ?Ñ?пеÑ?-моÑ?и!.</string>
-  <string name="wizard_permissions_no_root">Ð?ко немаÑ?е root пÑ?иÑ?Ñ?ап или ако не Ñ?азбиÑ?аÑ?е за Ñ?Ñ?о збоÑ?Ñ?ваме, оÑ?игÑ?Ñ?аÑ?Ñ?е Ñ?е дека коÑ?иÑ?Ñ?иÑ?е апликаÑ?ии кои Ñ?Ñ?о Ñ?абоÑ?аÑ? Ñ?о Orbot.</string>
-  <string name="wizard_permissions_consent">РазбиÑ?ам и Ñ?акам да пÑ?одолжам без админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?ивилегии</string>
-  <string name="wizard_permission_enable_root">Ð?одели root за Orbot</string>
-  <string name="wizard_configure">Ð?Ñ?илагодÑ?ваÑ?е на Tor-поÑ?Ñ?авкиÑ?е</string>
-  <string name="wizard_configure_msg">Orbot овозможÑ?ва да Ñ?е Ñ?Ñ?Ñ?иÑ?а Ñ?елиоÑ? Ñ?ообÑ?аÑ?аÑ? на Ñ?иÑ?е апликаÑ?ии или на Ñ?екоÑ?а апликаÑ?иÑ?а одделно пÑ?екÑ? Tor.</string>
-  <string name="wizard_configure_all">Ð?Ñ?енаÑ?оÑ?и ги Ñ?иÑ?е апликаÑ?ии пÑ?екÑ? Tor</string>
-  <string name="wizard_configure_select_apps">Ð?збеÑ?и поÑ?ебни апликаÑ?ии за Tor</string>
-  <string name="wizard_tips_tricks">Ð?возможени Orbot апликаÑ?ии</string>
-  <string name="wizard_tips_msg">Ð?пликаÑ?ииÑ?е подолÑ? Ñ?е напÑ?авени да Ñ?абоÑ?аÑ? Ñ?о Orbot. Ð?Ñ?иÑ?иÑ?ни го Ñ?екое копÑ?е за инÑ?Ñ?алаÑ?иÑ?а или може да Ñ?е наÑ?даÑ? на Google Play, на веб-Ñ?Ñ?Ñ?анаÑ?а GuardianProject.info  или пÑ?екÑ? F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?езбедноÑ?ен инÑ?Ñ?анÑ? клиенÑ? меÑ?инÑ?еÑ? за Android</string>
-  <string name="wizard_tips_proxy">Ð?оÑ?Ñ?авки за пÑ?окÑ?и - Ð?аÑ?Ñ?еÑ?е како да ги конÑ?игÑ?Ñ?иÑ?аÑ?е апликаÑ?ииÑ?е да Ñ?абоÑ?аÑ? Ñ?о Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo инÑ?еÑ?неÑ? пÑ?ебаÑ?Ñ?ваÑ?</string>
-  <string name="wizard_tips_twitter">Ð?оÑ?Ñ?авеÑ?е Twitter пÑ?окÑ?и за да Ñ?оÑ?Ñ?иÑ?аÑ?е \"localhost\" и поÑ?Ñ?а 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Ð?апÑ?ави пÑ?иказна и оÑ?Ñ?ави Ñ?а на Tor за да биде безбедна!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?оÑ?Ñ?авки за пÑ?окÑ?и</string>
-  <string name="wizard_proxy_help_msg">Ð?околкÑ? Android апликаÑ?иÑ?аÑ?а Ñ?Ñ?о Ñ?а коÑ?иÑ?Ñ?иÑ?е поддÑ?жÑ?ва HTTP или SOCKS пÑ?окÑ?и, Ñ?огаÑ? може да Ñ?е поÑ?Ñ?ави за да Ñ?е повÑ?зе Ñ?о Orbot и да коÑ?иÑ?Ñ?и Tor.\n\n\n ХоÑ?Ñ? поÑ?Ñ?авкиÑ?е Ñ?е 127.0.0.1 или \"localhost\". Ð?а HTTP подеÑ?Ñ?ваÑ?аÑ?а на поÑ?Ñ?а Ñ?е 8118. Ð?а SOCKS пÑ?окÑ?иÑ?о е 9050. Ð?околкÑ? е возможно коÑ?иÑ?Ñ?еÑ?е SOCKS4A или SOCKS5.\n \n\n\n Ð?оже да дознаеÑ?е повеÑ?е за пÑ?енаÑ?оÑ?Ñ?ваÑ?е на Android пÑ?екÑ? ЧÐ?Ð? на: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot е Ñ?пÑ?емен!</string>
-  <string name="wizard_final_msg">Ð?илиони лÑ?Ñ?е низ Ñ?елиоÑ? Ñ?веÑ? го коÑ?иÑ?Ñ?аÑ? Tor за наÑ?Ñ?азлиÑ?ни пÑ?иÑ?ини.\n\nÐ?овинаÑ?и и блогеÑ?и, боÑ?Ñ?и за Ñ?овекови пÑ?ава, пÑ?ипадниÑ?и на оÑ?ганиÑ?е на пÑ?огоноÑ?, воÑ?ниÑ?и, коÑ?поÑ?аÑ?ии, гÑ?аÑ?ани на Ñ?епÑ?еÑ?ивни полиÑ?иÑ?ки Ñ?ежими и обиÑ?ни гÑ?аÑ?ани... а од Ñ?ега и вие!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?е молиме конÑ?игÑ?Ñ?иÑ?аÑ?Ñ?е ги Orbot поÑ?Ñ?авкиÑ?е пÑ?ед да запоÑ?неÑ?е да го коÑ?иÑ?Ñ?иÑ?е!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">УÑ?пеÑ?но Ñ?е повÑ?завÑ?е на Tor мÑ?ежаÑ?а - но Ñ?оа Ð?Ð? знаÑ?и дека ваÑ?иоÑ? Ñ?Ñ?ед е безбеден. Ð?ожеÑ?е да го коÑ?иÑ?Ñ?иÑ?е \'Ð?Ñ?елиÑ?Ñ?Ñ?ваÑ?\' копÑ?еÑ?о за да Ñ?а Ñ?еÑ?Ñ?иÑ?аÑ?е ваÑ?аÑ?а конекÑ?иÑ?а. \n\nÐ?оÑ?еÑ?еÑ?е не на: https://guardianproject.info/apps/orbot или пÑ?аÑ?еÑ?е е-поÑ?Ñ?а на help@xxxxxxxxxxxxxxxxxxxx за да дознаеÑ?е повеÑ?е.</string>
-  <string name="tor_check">Ð?ва Ñ?е Ñ?а оÑ?воÑ?и веб Ñ?Ñ?Ñ?анаÑ?а https://check.torproject.org во ваÑ?иоÑ? пÑ?елиÑ?Ñ?Ñ?ваÑ? за да видеÑ?е дали Orbot е пÑ?авилно конÑ?игÑ?Ñ?иÑ?ан и дали Ñ?Ñ?е повÑ?зани на ТоÑ?.</string>
-  <string name="pref_hs_group">СкÑ?иени Ñ?оÑ?Ñ? Ñ?еÑ?виÑ?и</string>
   <string name="pref_general_group">Ð?пÑ?Ñ?о</string>
   <string name="pref_start_boot_title">СÑ?аÑ?Ñ?Ñ?ваÑ? го Orbot на бÑ?Ñ?иÑ?аÑ?е</string>
   <string name="pref_start_boot_summary">Ð?вÑ?омаÑ?Ñ?ки Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?Ñ?е го Orbot и повÑ?зеÑ?е го Tor кога ваÑ?иоÑ? Android Ñ?Ñ?ед Ñ?е Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot го овозможÑ?ва Tor за Android!\n\nTor ви помага пÑ?оÑ?ив Ñ?илÑ?Ñ?иÑ?аÑ?е на Ñ?одÑ?жинаÑ?а, анализа на Ñ?ообÑ?аÑ?аÑ?оÑ? и надзоÑ? на мÑ?ежаÑ?а кои и  Ñ?е заканÑ?вааÑ? на ваÑ?аÑ?а пÑ?иваÑ?ноÑ?Ñ?, довеÑ?ливиÑ?е инÑ?омаÑ?ии и лиÑ?ниÑ?е одноÑ?и.\n\nÐ?воÑ? волÑ?ебник помага за поÑ?Ñ?авÑ?ваÑ?е на Orbot и Tor на ваÑ?иоÑ? Ñ?Ñ?ед.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?нимание</string>
-  <string name="wizard_warning_msg">Само инÑ?Ñ?алиÑ?аÑ?е на Orbot нема авÑ?омаÑ?Ñ?ки да го напÑ?ави ваÑ?иоÑ? мобилен Ñ?ообÑ?аÑ?аÑ? анонимен.\n\nÐ?оÑ?аÑ?е пÑ?авилно да ги конÑ?игÑ?Ñ?иÑ?аÑ?е Orbot, ваÑ?иоÑ? Ñ?Ñ?едоÑ? и дÑ?Ñ?ги апликаÑ?ии, за Ñ?Ñ?пеÑ?но да го коÑ?иÑ?Ñ?иÑ?е Tor.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?озволи</string>
-  <string name="wizard_permissions_root_msg1">Ð?пÑ?ионално може да добиеÑ?е админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?иÑ?Ñ?ап за Orbot коÑ? овозможÑ?ва напÑ?едни Ñ?Ñ?нкÑ?ии, како Ñ?Ñ?о е Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е.</string>
-  <string name="wizard_permissions_root_msg2">Ð?околкÑ? не Ñ?акаÑ?е да го напÑ?авиÑ?е ова, оÑ?игÑ?Ñ?аÑ?Ñ?е Ñ?е дека ваÑ?иÑ?е апликаÑ?ии Ñ?абоÑ?аÑ? Ñ?о Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Ð?аÑ?иоÑ? Ñ?Ñ?ед не Ñ?е поÑ?авÑ?ва како ROOT или не овозможÑ?ва ROOT или админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?иÑ?Ñ?ап.\n\nÐ?Ñ?обаÑ?Ñ?е го Ñ?ежимоÑ? \'Ð?пликаÑ?ии\' на главниоÑ? екÑ?ан.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?возможени Orbot апликаÑ?ии</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ð?езбедноÑ?на апликаÑ?иÑ?а за Ñ?еÑ?Ñ?ваÑ?е Ñ?о енкÑ?ипÑ?иÑ?а \'Off-the-Record\' </string>
-  <string name="wizard_tips_orweb">Ð?rfox: Ð?Ñ?елиÑ?Ñ?Ñ?ваÑ? Ñ?о Ñ?напÑ?едена-пÑ?иваÑ?ноÑ?Ñ? коÑ? Ñ?абоÑ?и пÑ?екÑ? Tor</string>
-  <string name="wizard_tips_play">Ð?аÑ?ди ги Ñ?иÑ?е Guardian Project апликаÑ?ии на Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?аÑ?ди ги Ñ?иÑ?е Guardian Project апликаÑ?ии на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?аÑ?ди ги Ñ?иÑ?е Guardian Project апликаÑ?ии на https://f-droid.org</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">ТÑ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е</string>
-  <string name="wizard_transproxy_msg">Ð?ва овозможÑ?ва ваÑ?иÑ?е апликаÑ?ии авÑ?омаÑ?Ñ?ки да Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?вааÑ? пÑ?екÑ? мÑ?ежаÑ?а Tor без конÑ?игÑ?Ñ?иÑ?аÑ?е.</string>
-  <string name="wizard_transproxy_hint">(СелекÑ?иÑ?аÑ?Ñ?е го ова поле ако не Ñ?азбиÑ?аÑ?е за Ñ?Ñ?о збоÑ?Ñ?ваме)</string>
-  <string name="wizard_transproxy_none">Ð?иÑ?Ñ?о</string>
-  <string name="pref_transparent_tethering_title">Tor повÑ?зÑ?ваÑ?е</string>
-  <string name="pref_transparent_tethering_summary">Ð?возможи Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е на Tor за Ñ?Ñ?еди повÑ?зани пÑ?екÑ? Wifi и USB  (баÑ?а Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аÑ?е)</string>
-  <string name="button_grant_superuser">Ð?аÑ?аÑ?е за админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?иÑ?Ñ?ап</string>
-  <string name="pref_select_apps">Ð?збеÑ?еÑ?е апликаÑ?ии</string>
-  <string name="pref_select_apps_summary">Ð?дбеÑ?и апликаÑ?ии кои Ñ?е Ñ?е повÑ?зÑ?вааÑ? пÑ?екÑ? Tor</string>
   <string name="pref_node_configuration">Ð?Ñ?илагодÑ?ваÑ?е на Ñ?азол</string>
   <string name="pref_node_configuration_summary">Ð?ва Ñ?е напÑ?едни поÑ?Ñ?авÑ?ваÑ?а кои можаÑ? да Ñ?а намалаÑ? ваÑ?аÑ?а анонимноÑ?Ñ?</string>
   <string name="pref_entrance_node">Ð?лезни Ñ?азли</string>
@@ -128,9 +41,6 @@
   <string name="pref_entrance_node_dialog">Ð?неÑ?еÑ?е влезни Ñ?азли</string>
   <string name="pref_allow_background_starts_title">Ð?озволи позадинÑ?ко Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?е</string>
   <string name="pref_allow_background_starts_summary">Ð?озволи било коÑ?а апликаÑ?иÑ?а да мÑ? каже на Orbot да го Ñ?Ñ?аÑ?Ñ?Ñ?ва Tor и Ñ?еÑ?виÑ?иÑ?е повÑ?зани Ñ?о него</string>
-  <string name="button_proxy_all">Се за пÑ?окÑ?и</string>
-  <string name="button_proxy_none">Ð?иÑ?Ñ?о за пÑ?окÑ?и</string>
-  <string name="button_invert_selection">Ð?бÑ?аÑ?на Ñ?елекÑ?иÑ?а</string>
   <string name="pref_proxy_title">Ð?злезен пÑ?окÑ?и на мÑ?ежаÑ?а (незадолжиÑ?елно)</string>
   <string name="pref_proxy_type_title">Тип на излезен пÑ?окÑ?и</string>
   <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол за коÑ?иÑ?Ñ?еÑ?е на пÑ?окÑ?и-Ñ?еÑ?веÑ?: HTTP, HTTPS, Socks4, Socks5</string>
@@ -147,19 +57,7 @@
   <string name="pref_proxy_password_title">Ð?озинка на излезен пÑ?окÑ?и</string>
   <string name="pref_proxy_password_summary">Ð?озинка на пÑ?окÑ?и (незадолжиÑ?елно)</string>
   <string name="pref_proxy_password_dialog">Ð?неÑ?еÑ?е лозинка на пÑ?окÑ?и</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?оÑ?Ñ?авÑ?ваÑ?е на Ñ?елоÑ?но Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?оÑ?Ñ?авÑ?ваÑ?е Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е базиÑ?ано на апликаÑ?иÑ?а...</string>
-  <string name="transparent_proxying_enabled">TÑ?анÑ?паÑ?енÑ?ноÑ?о пÑ?енаÑ?оÑ?Ñ?ваÑ?е е Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy е овозможен за повÑ?зÑ?ваÑ?е!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?е на Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е!</string>
-  <string name="transproxy_rules_cleared">Ð?збÑ?иÑ?ани пÑ?авила за TransProxy </string>
   <string name="couldn_t_start_tor_process_">Ð?е може да запоÑ?не Tor-пÑ?оÑ?еÑ?оÑ?:</string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?абоÑ?и на поÑ?Ñ?а:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?оÑ?Ñ?авÑ?ваÑ?е на Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?енаÑ?оÑ?Ñ?ваÑ?е базиÑ?ано на поÑ?Ñ?а...</string>
-  <string name="bridge_error">Ð?Ñ?еÑ?ка во моÑ?Ñ?оÑ?</string>
-  <string name="bridge_requires_ip">Ð?а да Ñ?а коÑ?иÑ?Ñ?иÑ?е моÑ?Ñ? Ñ?Ñ?нкÑ?иÑ?аÑ?а, моÑ?аÑ?е да внеÑ?еÑ?е баÑ?ем една моÑ?Ñ? IP-адÑ?еÑ?а.</string>
-  <string name="send_email_for_bridges">Ð?Ñ?пÑ?аÑ?еÑ?е е-поÑ?Ñ?а од ваÑ?аÑ?а gmail Ñ?меÑ?ка на bridges@xxxxxxxxxxxxxx Ñ?о Ñ?одÑ?жина \"get bridges\".</string>
   <string name="error">Ð?Ñ?еÑ?ка</string>
   <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?иÑ?е поÑ?Ñ?авки за доÑ?Ñ?апниÑ?е адÑ?еÑ?и пÑ?едизвикаа гÑ?еÑ?ка!</string>
   <string name="your_relay_settings_caused_an_exception_">Ð?аÑ?иÑ?е поÑ?Ñ?авки за Ñ?еле пÑ?едизвикаа гÑ?еÑ?ка!</string>
@@ -173,9 +71,7 @@
   <string name="use_only_these_specified_nodes">Ð?оÑ?иÑ?Ñ?еÑ?е ги *Ñ?амо* овие наведени Ñ?азли</string>
   <string name="bridges">Ð?оÑ?Ñ?ови</string>
   <string name="use_bridges">Ð?оÑ?иÑ?Ñ?и моÑ?Ñ?ови</string>
-  <string name="bridges_obfuscated">СкÑ?иени моÑ?Ñ?ови</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?возможи алÑ?еÑ?наÑ?ивен влезови на Tor мÑ?ежаÑ?а</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?возможи, ако поÑ?Ñ?авениÑ?е моÑ?Ñ?ови Ñ?е Ñ?кÑ?иени моÑ?Ñ?ови</string>
   <string name="ip_address_and_port_of_bridges">IP-адÑ?еÑ?а и поÑ?Ñ?а на моÑ?Ñ?овиÑ?е</string>
   <string name="enter_bridge_addresses">Ð?неÑ?еÑ?е адÑ?еÑ?и на моÑ?Ñ?овиÑ?е</string>
   <string name="relays">Релеи</string>
@@ -192,16 +88,9 @@
   <string name="reachable_ports">Ð?оÑ?Ñ?апни поÑ?Ñ?и</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?и доÑ?Ñ?апни позади огÑ?аниÑ?ениоÑ? заÑ?Ñ?иÑ?ен Ñ?ид</string>
   <string name="enter_ports">Ð?неÑ?еÑ?е поÑ?Ñ?и</string>
-  <string name="enable_hidden_services">СкÑ?иени Ñ?еÑ?виÑ?и за Ñ?оÑ?Ñ?иÑ?аÑ?е</string>
-  <string name="run_servers_accessible_via_the_tor_network"> Ð?возможеÑ?е on-device Ñ?еÑ?веÑ?оÑ? да биде доÑ?Ñ?апен пÑ?екÑ? мÑ?ежаÑ?а на Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ð?неÑ?еÑ?е ги поÑ?Ñ?иÑ?е за localhost за Ñ?кÑ?иени Ñ?Ñ?лÑ?ги</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?и на Ñ?кÑ?иени Ñ?Ñ?лÑ?ги</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">доÑ?Ñ?апно име за ваÑ?аÑ?а Ñ?кÑ?иена Ñ?Ñ?лÑ?га (Ñ?е генеÑ?иÑ?а авÑ?омаÑ?Ñ?ки)</string>
   <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">акÑ?ивиÑ?аÑ?Ñ?е го дневникоÑ? за оÑ?Ñ?Ñ?Ñ?анÑ?ваÑ?е гÑ?еÑ?ки за излез (за да Ñ?е пÑ?икаже моÑ?а да Ñ?е коÑ?иÑ?Ñ?и adb или aLogCat)</string>
   <string name="project_home">Ð?оÑ?еÑ?на Ñ?Ñ?Ñ?аниÑ?а(и):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor Ð?иÑ?енÑ?а </string>
-  <string name="https_torproject_org">https://torproject.org</string>
   <string name="third_party_software">СоÑ?Ñ?веÑ? од пÑ?оизводиÑ?ел од 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>
@@ -211,36 +100,17 @@
   <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="hidden_service_on">Ð?клÑ?Ñ?ен е Ñ?кÑ?иениоÑ? Ñ?еÑ?виÑ?:</string>
   <string name="unable_to_read_hidden_service_name">не може да Ñ?е пÑ?оÑ?иÑ?а имеÑ?о на Ñ?кÑ?иениоÑ? Ñ?еÑ?виÑ?</string>
   <string name="unable_to_start_tor">Tor не може да Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва:</string>
-  <string name="unable_to_reset_tor">СÑ?аÑ?Ñ?Ñ?ваÑ?Ñ?е го повÑ?оÑ?но ваÑ?иоÑ? Ñ?Ñ?ед, Tor не може да Ñ?е Ñ?еÑ?еÑ?иÑ?а! </string>
-  <string name="pref_use_sys_iptables_title">Ð?оÑ?иÑ?Ñ?еÑ?е Ñ?Ñ?андаÑ?ден Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Ð?оÑ?иÑ?Ñ?еÑ?е ги вгÑ?адениÑ?е бинаÑ?ни IP Ñ?абели намеÑ?Ñ?о Ñ?аа Ñ?Ñ?о доаÑ?а Ñ?о Orbot</string>
-  <string name="error_installing_binares">Ð?звÑ?Ñ?ниÑ?е даÑ?оÑ?еки на Tor не можаÑ? да Ñ?е инÑ?Ñ?алиÑ?ааÑ? или надгÑ?адаÑ?</string>
   <string name="pref_use_persistent_notifications">СекогаÑ? Ñ?Ñ?ваÑ?Ñ?е Ñ?а иконаÑ?а во ленÑ?аÑ?а Ñ?о алаÑ?ки кога Orbot е повÑ?зан</string>
   <string name="pref_use_persistent_notifications_title">Ð?звеÑ?Ñ?Ñ?ваÑ?а Ñ?екогаÑ? вклÑ?Ñ?ени</string>
   <string name="pref_use_expanded_notifications">Ð?Ñ?икажи пÑ?оÑ?иÑ?ено извеÑ?Ñ?Ñ?ваÑ?е Ñ?о излезнаÑ?а дÑ?жава и IP на Tor</string>
   <string name="pref_use_expanded_notifications_title">Ð?Ñ?оÑ?иÑ?ени извеÑ?Ñ?Ñ?ваÑ?а</string>
-  <string name="notification_using_bridges">Ð?возможени моÑ?Ñ?ови!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">Ð?азик</string>
-  <string name="set_locale_summary">Ð?збеÑ?еÑ?е локални поÑ?Ñ?авки и Ñ?азик за Orbot</string>
-  <string name="wizard_locale_title">Ð?збеÑ?еÑ?е Ñ?азик</string>
-  <string name="wizard_locale_msg">Ð?Ñ?Ñ?авеÑ?е го Ñ?Ñ?андаÑ?дниоÑ? или пÑ?оменеÑ?е го поÑ?Ñ?оеÑ?киоÑ? Ñ?азик</string>
-  <string name="powered_by">Ð?возможено од Tor</string>
-  <string name="btn_save_settings">Ð?аÑ?Ñ?ваÑ? поÑ?Ñ?авки</string>
   <string name="no_internet_connection_tor">Ð?ема инÑ?еÑ?неÑ? вÑ?Ñ?ка; Tor е во миÑ?Ñ?ваÑ?е...</string>
-  <string name="bandwidth_">СообÑ?аÑ?аÑ?:</string>
-  <string name="down">доле</string>
-  <string name="up">гоÑ?е</string>
   <string name="pref_disable_network_title">Ð?ема Ð?вÑ?омаÑ?Ñ?ко-Ñ?пиеÑ?е на мÑ?ежаÑ?а</string>
   <string name="pref_disable_network_summary">СÑ?авеÑ?е го ТоÑ? на Ñ?ежим на Ñ?пиеÑ?е кога Ð?нÑ?еÑ?неÑ?оÑ? не е доÑ?Ñ?апен</string>
   <string name="newnym">Се пÑ?еÑ?Ñ?ливÑ?е на нов иденÑ?иÑ?еÑ? на Tor!</string>
-  <string name="menu_verify_browser">Ð?Ñ?елиÑ?Ñ?Ñ?ваÑ?</string>
-  <string name="menu_use_chatsecure">Ð?оÑ?иÑ?Ñ?и ChatSecure</string>
-  <string name="permission_manage_tor_label">УпÑ?авÑ?ваÑ? Ñ?о Tor</string>
-  <string name="permission_manage_tor_description">Ð?озволеÑ?е оваа апликаÑ?иÑ?а да Ñ?пÑ?авÑ?ва Ñ?о Tor Ñ?Ñ?лÑ?гаÑ?а</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot Ñ?абоÑ?и наÑ?добÑ?о Ñ?о Orbot пÑ?елиÑ?Ñ?Ñ?ваÑ?оÑ?. Ð?нÑ?Ñ?алиÑ?аÑ? Ñ?ега?</string>
   <string name="install_apps_">Ð?нÑ?Ñ?алиÑ?аÑ? пÑ?елиÑ?Ñ?Ñ?ваÑ??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?ема мÑ?ежно повÑ?зÑ?ваÑ?е. СÑ?авеÑ?е го Tor на Ñ?ежим на Ñ?пиеÑ?е...</string>
@@ -258,18 +128,6 @@
   <string name="pref_torrc_title">Ð?Ñ?илагодено поÑ?Ñ?авÑ?ваÑ?е на torrc</string>
   <string name="pref_torrc_summary">СÐ?Ð?Ð? Ð?Ð? Ð?Ð?СÐ?Ð?РТÐ?: внеÑ?еÑ?е диÑ?екÑ?ни команди за поÑ?Ñ?авÑ?ваÑ?е на torrc</string>
   <string name="pref_torrc_dialog">Ð?Ñ?илагоден torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech апликаÑ?иÑ?а за докÑ?менÑ?иÑ?аÑ?е на Ñ?овековиÑ?е пÑ?ава</string>
-  <string name="your_tor_public_ips_">Ð?аÑ?иÑ?е Ñ?авни Tor IP-адÑ?еÑ?и:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?е молиме иÑ?клÑ?Ñ?еÑ?е Ñ?а оваа апликаÑ?иÑ?а во Android-&gt;Settings-&gt;Apps ако имаÑ?е пÑ?облем Ñ?о Orbot:</string>
-  <string name="app_conflict">Ð?онÑ?ликÑ? Ñ?о апликаÑ?иÑ?аÑ?а</string>
-  <string name="pref_transproxy_refresh_title">Ð?вÑ?омаÑ?Ñ?ко оÑ?вежÑ?ваÑ?е на Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Ð?Ñ?имени ги повÑ?оÑ?но пÑ?авилаÑ?а за TransProxy кога Ñ?е менÑ?ва Ñ?оÑ?Ñ?оÑ?баÑ?а на мÑ?ежаÑ?а</string>
-  <string name="pref_transproxy_flush_title">Ð?РÐ?СÐ?Ð?Ð?Ð? Ð?ТСТРÐ?Ð?УÐ?Ð?Ð?Ð? на Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ð?опÑ?еÑ?е овде за да Ñ?е избÑ?иÑ?аÑ? Ñ?иÑ?е transproxy пÑ?авила на мÑ?ежаÑ?а СÐ?Ð?Ð?</string>
-  <string name="transparent_proxy_rules_flushed_">Ð?збÑ?иÑ?ани Ñ?Ñ?анÑ?паÑ?енÑ?ни пÑ?окÑ?и пÑ?авила!</string>
-  <string name="you_do_not_have_root_access_enabled">Ð?емаÑ?е овозможено root пÑ?иÑ?Ñ?ап</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?ожеби Ñ?е Ñ?Ñ?еба да го Ñ?Ñ?опиÑ?аÑ?е и Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?е Orbot од поÑ?еÑ?ок за да бидаÑ? овозможени пÑ?омениÑ?е во поÑ?Ñ?авкиÑ?е.</string>
-  <string name="menu_vpn">Ð?пликаÑ?ии</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
@@ -283,18 +141,14 @@
   <string name="get_bridges_web">Ð?еб</string>
   <string name="activate">Ð?кÑ?ивиÑ?аÑ?</string>
   <string name="apps_mode">VPN мод</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?ожеÑ?е да овозможиÑ?е апликаÑ?ииÑ?е да комÑ?ниÑ?иÑ?ааÑ? пÑ?екÑ? Tor коÑ?иÑ?Ñ?еÑ?Ñ?и го вгÑ?адениоÑ? Orbot VPN.\n\nÐ?ва нема да ве напÑ?ави анонимни, но Ñ?е ви помогне да поминеÑ?е пÑ?екÑ? заÑ?Ñ?иÑ?ниÑ?е Ñ?идови.</string>
   <string name="send_email">Ð?Ñ?пÑ?аÑ?еÑ?е е-поÑ?Ñ?а</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">AдÑ?еÑ?а на моÑ?Ñ?ови можеÑ?е да добиваÑ?е пÑ?екÑ? е-поÑ?Ñ?а, веб или Ñ?о Ñ?кениÑ?аÑ?е на QR кодоÑ? на моÑ?Ñ?оÑ?. Ð?збеÑ?еÑ?е подолÑ? \'Ð?-поÑ?Ñ?а\' или \'Web\', за да побаÑ?аÑ?е адÑ?еÑ?а за моÑ?Ñ?оÑ?. \n\nÐ?Ñ?како Ñ?е Ñ?а добиеÑ?е адÑ?еÑ?аÑ?а, копиÑ?аÑ?Ñ?е Ñ?а &amp; и залепеÑ?е Ñ?а во делоÑ? \"Ð?оÑ?Ñ?ови\" во подеÑ?Ñ?ваÑ?еÑ?о на Orbot и повÑ?оÑ?но Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?Ñ?е.</string>
   <string name="install_orweb">Ð?нÑ?Ñ?алиÑ?аÑ? Orfox</string>
-  <string name="standard_browser">СÑ?андаÑ?ден пÑ?елиÑ?Ñ?Ñ?ваÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?Ð?Ð?Ð?Ð?Ð?ШÐ?Ð?: Само Ñ?Ñ?андаÑ?дниÑ?е моÑ?Ñ?ови на Tor Ñ?Ñ?нкÑ?иониÑ?ааÑ? на Ñ?Ñ?едиÑ?е Intel X86/ATOM</string>
   <string name="vpn_default_world">Ð?лобално (Ð?вÑ?омаÑ?Ñ?ки)</string>
   <string name="hidden_services">СкÑ?иени Ñ?еÑ?виÑ?и</string>
   <string name="title_activity_hidden_services">СкÑ?иени Ñ?еÑ?виÑ?и</string>
   <string name="menu_hidden_services">СкÑ?иени Ñ?еÑ?виÑ?и</string>
   <string name="save">Ð?аÑ?Ñ?ваÑ?</string>
-  <string name="ports">Ð?оÑ?Ñ?и</string>
   <string name="local_port">Ð?окална поÑ?Ñ?а</string>
   <string name="onion_port">Onion поÑ?Ñ?а</string>
   <string name="name">Ð?ме</string>
@@ -308,8 +162,6 @@
   <string name="backup_restored">Ð?Ñ?аÑ?ено од Ñ?езеÑ?вна копиÑ?а</string>
   <string name="filemanager_not_available">Ð?енаÑ?еÑ?оÑ? на даÑ?оÑ?еки не е доÑ?Ñ?апен</string>
   <string name="please_grant_permissions_for_external_storage">Ð?е молиме дадеÑ?е дозволи за надвоÑ?еÑ?на мемоÑ?иÑ?а</string>
-  <string name="permission_granted">Ð?озволено</string>
-  <string name="permission_denied">Ð?дбиено</string>
   <string name="restore_backup">Ð?Ñ?аÑ?и Ñ?езеÑ?вна копиÑ?а</string>
   <string name="create_a_backup_first">Создади Ñ?езеÑ?вна копиÑ?а</string>
   <string name="name_can_t_be_empty">Ð?меÑ?о не може да биде пÑ?азно</string>
@@ -343,9 +195,7 @@
   <string name="pref_connection_padding_summary">СекогаÑ? овозможи повÑ?зÑ?ваÑ?е Ñ?о камÑ?Ñ?лажа пÑ?оÑ?ив некои Ñ?оÑ?ми на анализиÑ?аÑ?е на инÑ?еÑ?неÑ? Ñ?ообÑ?аÑ?аÑ?оÑ?. СÑ?андаÑ?дно: Ð?вÑ?омаÑ?Ñ?ки</string>
   <string name="pref_reduced_connection_padding">РедÑ?Ñ?иÑ?аÑ? повÑ?зÑ?ваÑ?е Ñ?о камÑ?Ñ?лажа</string>
   <string name="pref_reduced_connection_padding_summary">Ð?Ñ?клÑ?Ñ?еÑ?е ги вÑ?Ñ?киÑ?е на Ñ?елеаÑ?а поÑ?коÑ?о и иÑ?пÑ?аÑ?аÑ?еÑ?о на камÑ?Ñ?лиÑ?ани пакеÑ?и за да го намалиÑ?е коÑ?иÑ?Ñ?еÑ?еÑ?о на подаÑ?оÑ?и и поÑ?Ñ?оÑ?Ñ?ваÑ?каÑ?а на баÑ?еÑ?иÑ?аÑ?а</string>
-  <string name="please_enable_vpn">Ð?кÑ?ивиÑ?аÑ?Ñ?е го VPN модоÑ? да овозможиÑ?е апликаÑ?ииÑ?е да го коÑ?иÑ?Ñ?аÑ? Tor</string>
   <string name="app_shortcuts">Tor-овозможени апликаÑ?ии</string>
-  <string name="title_activity_bridge_wizard">Ð?оÑ?Ñ?Ð?олÑ?ебникÐ?кÑ?ивноÑ?Ñ?</string>
   <string name="testing_bridges">ТеÑ?Ñ?иÑ?аÑ?е на моÑ?Ñ? повÑ?зÑ?ваÑ?еÑ?о кон Tor...</string>
   <string name="testing_bridges_success">УÑ?пеÑ?но. Ð?оÑ?Ñ? поÑ?Ñ?авкиÑ?е Ñ?е добÑ?и!</string>
   <string name="testing_bridges_fail">Ð?Ð?УСÐ?Ð?ШÐ?Ð?. Ð?Ñ?обаÑ?Ñ?е дÑ?Ñ?га опÑ?иÑ?а</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 28e79de0..0a582739 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -1,18 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_info">സഹായ�</string>
-  <string name="menu_start">�ര�ഭി�����</string>
+    <string name="menu_start">�ര�ഭി�����</string>
   <string name="menu_stop">നിരàµ?â??à´¤àµ?à´¤àµ?à´?</string>
   <string name="menu_about">വിവര�</string>
-  <string name="button_help">സഹായ�</string>
-  <string name="button_close">�������</string>
-  <string name="button_about">വിവര�</string>
-  <string name="btn_next">���ത�തത�</string>
-  <string name="btn_back">പിന�ന�����</string>
-  <string name="btn_cancel">റദ�ദാ����� </string>
+    <string name="button_about">വിവര�</string>
+    <string name="btn_cancel">റദ�ദാ����� </string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">പ�ര�ാ��സി ��രമ��രണ���ൾ</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">പ�ത�വായത�</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -20,10 +14,8 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">സ�ഥിതിവിവര�</string>
-  <string name="error">പിശ��</string>
-  <string name="default_bridges"></string>
-  <string name="save">സ�ര��ഷി�����</string>
+    <string name="error">പിശ��</string>
+    <string name="save">സ�ര��ഷി�����</string>
   <string name="name">Name</string>
   <string name="disable">പ�രവർത�തനരഹിതമാ���� </string>
 </resources>
diff --git a/app/src/main/res/values-mn/strings.xml b/app/src/main/res/values-mn/strings.xml
index f04ca492..29345090 100644
--- a/app/src/main/res/values-mn/strings.xml
+++ b/app/src/main/res/values-mn/strings.xml
@@ -1,20 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_info">ТÑ?Ñ?ламж</string>
-  <string name="menu_about">ТÑ?Ñ?ай</string>
-  <string name="button_help">ТÑ?Ñ?ламж</string>
-  <string name="button_about">ТÑ?Ñ?ай</string>
+    <string name="menu_about">ТÑ?Ñ?ай</string>
+    <string name="button_about">ТÑ?Ñ?ай</string>
   <string name="btn_cancel">Cancel</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Төлөв</string>
-  <string name="default_bridges"></string>
-  <string name="name">Ð?Ñ?Ñ?</string>
+    <string name="name">Ð?Ñ?Ñ?</string>
 </resources>
diff --git a/app/src/main/res/values-mr-rIN/strings.xml b/app/src/main/res/values-mr-rIN/strings.xml
index 3eb48141..af3eee19 100644
--- a/app/src/main/res/values-mr-rIN/strings.xml
+++ b/app/src/main/res/values-mr-rIN/strings.xml
@@ -2,8 +2,7 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">�र�ब�� �� विनाम�ल�य प�र���स� ��प �ह� �� �तर ��प�सना ���रन���ा �धि� स�र��षितपण� वापर �रण�यास स��षम �रत�. �र�ब�� �पल�या ���रन�� रहदार��� �न���रिप�� �रण�यासाठ� ��र�ा वापर �रत� �णि न�तर ��भरात�ल स��ण�ा���या मालि��द�वार� �ड� मार�न लपवत�. ��र हा �� विनाम�ल�य स�फ��व��र �णि �� ��ला न��वर�� �ह� �� �पल�याला न��वर�� स�वत�त�रता �णि ��पन�यता, ��पन�य व�यवसाय ��रिया�लाप 
 �णि नात�स�ब�ध �णि रहदार� विश�ल�षणास म�हण�न �ळ�ल�या �ाणार�या रा��य स�र��ष�स धम�� द�णार�या न��वर�� निर���षणा�� र��षण �रण�यास मदत �रत�.</string>
-  <string name="wizard_title">Orbot</string>
-  <!--Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -11,5 +10,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml
index e929c97b..8b0fff9d 100644
--- a/app/src/main/res/values-ms-rMY/strings.xml
+++ b/app/src/main/res/values-ms-rMY/strings.xml
@@ -1,107 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mula dan henti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot telah dimulakan..</string>
+    <string name="status_starting_up">Orbot telah dimulakan..</string>
   <string name="status_activated">Bersambung ke rangkaian Tor</string>
   <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
   <string name="tor_process_starting">Memulakan klien Tor..</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Rumah</string>
-  <string name="menu_browse">Carian</string>
-  <string name="menu_settings">Tetapan</string>
+    <string name="menu_settings">Tetapan</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_start">Mula</string>
+    <string name="menu_start">Mula</string>
   <string name="menu_stop">Henti</string>
   <string name="menu_about">Tentang</string>
   <string name="main_layout_download">Muat turun</string>
   <string name="main_layout_upload">Muat naik</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Padam Log</string>
-  <string name="menu_verify">Semak</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
-  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Telus</string>
-  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
-  <string name="pref_transparent_all_title">Tor segalanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
-  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
-  <string name="pref_transparent_port_title">Senarai Port</string>
-  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
-  <string name="status_install_success">Tor berjaya dipasang!</string>
-  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ralat Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Seterusnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Tamat</string>
-  <string name="btn_okay">Okay</string>
+    <string name="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>
-  <string name="wizard_permissions_root">Kebenaran disahkan</string>
-  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
-  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
-  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torification</string>
-  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
-  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
-  <string name="wizard_tips_msg">Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market.</string>
-  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Enjin Carian</string>
-  <string name="wizard_tips_twitter">Tetapkan proxy twitter kepada hos \"localhost\" dan pada port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Tetapan proxy</string>
-  <string name="wizard_final">Orbot sudah sedia!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
-  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
-  <string name="pref_general_group">Umum</string>
+    <!--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-->
-  <string name="wizard_warning_title">Amaran</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">kebenaran</string>
-  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
-  <string name="wizard_tips_play">Cari semua projek Guardian di Google play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Telus</string>
-  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
-  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
-  <string name="wizard_transproxy_none">Tiada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
-  <string name="button_grant_superuser">Minta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Nod</string>
+    <!--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>
@@ -122,19 +50,8 @@
   <string name="pref_proxy_password_title">Laluan keluar kata laluan proxy</string>
   <string name="pref_proxy_password_summary">Kata laluan proxy (tambahan)</string>
   <string name="pref_proxy_password_dialog">Masukkan kata laluan proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
-  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
-  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
-  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
-  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
-  <string name="bridge_error">Ralat jambatan</string>
-  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
-  <string name="send_email_for_bridges">Hantar e-mel kepada bridges@xxxxxxxxxxxxxx dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
-  <string name="error">Ralat</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>
@@ -147,9 +64,7 @@
   <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
   <string name="bridges">Jambatan</string>
   <string name="use_bridges">Guna Jambatan</string>
-  <string name="bridges_obfuscated">Jambatan Keliru</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+    <string name="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>
@@ -165,36 +80,17 @@
   <string name="reachable_ports">Port yang dapat dicapai</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
   <string name="enter_ports">Masukkan port</string>
-  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
-  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
-  <string name="hidden_service_ports">Port servis tersembunyi</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
   <string name="project_home">Rumah Projek(s):</string>
-  <string name="the_tor_license">Lesen Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
+    <string name="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="hidden_service_on">port tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
-  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
-  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
-  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+    <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
-  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Bahasa</string>
-  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
-  <string name="btn_save_settings">Simpan Tetapan</string>
-  <string name="bandwidth_">Jalur Lebar:</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="hidden_services">Perkhidmatan tersembunyi</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>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 3caddf4a..f9169742 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -1,111 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mula dan henti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot telah dimulakan..</string>
+    <string name="status_starting_up">Orbot telah dimulakan..</string>
   <string name="status_activated">Bersambung ke rangkaian Tor</string>
   <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
   <string name="status_shutting_down">Orbot sedang ditutup</string>
   <string name="tor_process_starting">Memulakan klien Tor..</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Rumah</string>
-  <string name="menu_browse">Carian</string>
-  <string name="menu_settings">Tetapan</string>
+    <string name="menu_settings">Tetapan</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_start">Mula</string>
+    <string name="menu_start">Mula</string>
   <string name="menu_stop">Henti</string>
   <string name="menu_about">Tentang</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Padam Log</string>
-  <string name="menu_verify">Semak</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
-  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Telus</string>
-  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
-  <string name="pref_transparent_all_title">Tor segalanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
-  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
-  <string name="pref_transparent_port_title">Senarai Port</string>
-  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
-  <string name="status_install_success">Tor berjaya dipasang!</string>
-  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ralat Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Seterusnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Tamat</string>
-  <string name="btn_okay">Okay</string>
+    <string name="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>
-  <string name="wizard_permissions_root">Kebenaran disahkan</string>
-  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
-  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
-  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torification</string>
-  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
-  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
-  <string name="wizard_tips_msg">Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Klien mesej ringkas selamat untuk Android</string>
-  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_proxy_help_info">Tetapan proxy</string>
-  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan boleh menyokong penggunaan proksi HTTP atau SOCKS, kemudian anda boleh menatarajah untuk menyambung kepada Orbot dan menggunakan Tor. â??\nâ??\nâ??\n    Tetapan tuan rumah adalah 127.0.0.1 atau \"localhost\". Untuk HTTP, tetapan pelabuhan 8118. Untuk SOCKS, proksi adalah 9050. Anda harus menggunakan SOCKS4A atau socks5 jika boleh. â??\n    â??\nâ??\nâ??\n    Anda boleh mengetahui lebih lanjut tentang proxying pada Android melalui FAQ di: http://tinyurl.com/proxyandroid â??</string>
-  <string name="wizard_final">Orbot sudah sedia!</string>
-  <string name="wizard_final_msg">Beratus-ratus ribu orang di seluruh dunia menggunakan Tor untuk pelbagai sebab-sebab yang luas. â??\nâ??\nWartawan dan blogger, pembela hak asasi manusia, pegawai penguatkuasa undang-undang, tentera, perbadanan, rakyat rejim menindas, dan warganegara sahaja, biasa â?¦ dan kini anda bersedia untuk, juga!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Anda telah berjaya disambungkan kepada rangkaian Tor - tetapi ini bukanlah bermakna peranti anda adalah selamat. Anda boleh menggunakan pilihan \'Check\' daripada menu untuk menguji pelayar anda. â??\nâ??\nMelawat kami pada https://guardianproject.info/apps/orbot atau menghantar e-mel ke help@xxxxxxxxxxxxxxxxxxxx untuk mengetahui lebih lanjut.</string>
-  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
-  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
-  <string name="pref_general_group">Umum</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot membawa Tor untuk Android! â??\nâ??\nTor membantu anda mempertahankan terhadap penapisan kandungan, analisis dan pengawasan trafik rangkaian yang mengancam privasi, maklumat sulit dan hubungan peribadi. â??\nâ??\nWizard ini akan membantu anda mengkonfigurasi Orbot dan Tor pada peranti anda.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Amaran</string>
-  <string name="wizard_warning_msg">Hanya memasang Orbot tidak secara automatik akan anonymize trafik mudah alih anda. â??\nâ??\nAnda betul mesti menatarajah Orbot, peranti anda dan aplikasi lain untuk berjaya menggunakan Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">kebenaran</string>
-  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Peranti anda tidak perlu berakar umbi atau menyediakan \'SuperUser\' akses. â??\nâ??\nDalam untuk anda mendapat manfaat daripada Tor, anda akan perlu menggunakan aplikasi yang dibina untuk bekerja dengan Orbot, atau yang HTTP sokongan atau tetapan proksi SOCKS. â??\n</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: sembang app selamat dengan Penyulitan Off-the-Rekod</string>
-  <string name="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Telus</string>
-  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
-  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
-  <string name="wizard_transproxy_none">Tiada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wifi dan USB Devices terikat (memerlukan restart)</string>
-  <string name="button_grant_superuser">Minta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Nod</string>
+    <!--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>
@@ -119,20 +42,8 @@
   <string name="pref_proxy_port_title">Port Proxy</string>
   <string name="pref_proxy_port_summary">Port pelayan proxy</string>
   <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
-  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
-  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
-  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
-  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
-  <string name="privoxy_is_running_on_port_">Privoxy sedang berjalan pada port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
-  <string name="bridge_error">Ralat jambatan</string>
-  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
-  <string name="send_email_for_bridges">Hantar e-mel kepada bridges@xxxxxxxxxxxxxx dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
-  <string name="error">Ralat</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>
@@ -145,9 +56,7 @@
   <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
   <string name="bridges">Jambatan</string>
   <string name="use_bridges">Guna Jambatan</string>
-  <string name="bridges_obfuscated">Jambatan Keliru</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
+    <string name="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>
@@ -163,35 +72,17 @@
   <string name="reachable_ports">Port yang dapat dicapai</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
   <string name="enter_ports">Masukkan port</string>
-  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
-  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
-  <string name="hidden_service_ports">Port servis tersembunyi</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
   <string name="project_home">Rumah Projek(s):</string>
   <string name="project_urls">https://www.torproject.org/docs/androidâ;?? https://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Lesen Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
+    <string name="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="hidden_service_on">port tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
-  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
-  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
-  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
+    <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
   <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
-  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Tetapan Tempatan</string>
-  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
-  <string name="powered_by">Dijana oleh Projek Tor</string>
-  <string name="btn_save_settings">Simpan Tetapan</string>
-  <string name="save">Simpan</string>
+    <string name="set_locale_title">Tetapan Tempatan</string>
+    <string name="save">Simpan</string>
   <string name="name">Nama</string>
 </resources>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index 8916fd74..6f1e25b9 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -1,39 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_home">á??á??á?ºá?? á??á?¬á??á?»á??á?ºá??á?¾á?¬</string>
-  <string name="menu_browse">á??á?½á??á?ºá?·á??á?¼á??á?ºá?·á??á??á?º</string>
-  <string name="menu_settings">á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸</string>
-  <string name="menu_info">á?¡á??á?°á?¡á??á?®</string>
-  <string name="menu_start">á??á??á??á?ºá??á??á?º</string>
+    <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_help">á?¡á??á?°á?¡á??á?®</string>
-  <string name="button_close">á??á?­á??á?ºá??á??á?º</string>
-  <string name="button_about">á?¡á??á?¼á?±á?¬á??á?ºá?¸</string>
+    <string name="button_about">á?¡á??á?¼á?±á?¬á??á?ºá?¸</string>
   <string name="menu_exit">á??á?½á??á?ºá??á??á?º</string>
-  <string name="btn_next">á??á?¾á?±á?·á??á??á?ºá??á??á?º</string>
-  <string name="btn_back">á??á?±á?¬á??á?ºá??á?­á?¯á?·</string>
-  <string name="btn_cancel">á??á?»á??á?ºá??á?­á??á?ºá?¸á??á??á?º</string>
+    <string name="btn_cancel">á??á?»á??á?ºá??á?­á??á?ºá?¸á??á??á?º</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">á??á??á?±á?¬á??á?ºá??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">á??á?±á??á?¯á??á?»</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">á??á??á?­á??á?±á?¸á??á?»á??á?º</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">á??á?¬á??á?¾á??á??á?¾á?­</string>
-  <string name="status">á?¡á??á?±á?¡á??á?¬á?¸</string>
-  <string name="error">á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">á??á?¬á??á?¬á??á??á?¬á?¸</string>
-  <string name="btn_save_settings">á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á??á?ºá?¸á??á??á?º</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="kb">á??á?®á??á?­á?¯á??á?­á?¯á??á?º</string>
+    <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>
diff --git a/app/src/main/res/values-nb/poestrings.xml b/app/src/main/res/values-nb/poestrings.xml
index 73cc391d..1805065d 100644
--- a/app/src/main/res/values-nb/poestrings.xml
+++ b/app/src/main/res/values-nb/poestrings.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_no">Ingen broer: Koble direkte til Tor</string>
-    <string name="bridges_provided">Angitte broer:</string>
-    <string name="bridges_custom">Egendefinerte broer</string>
-
-    <string name="bridges_config">"Brooppsett"</string>
-    <string name="action_done">"Ferdig"</string>
 
     <string name="bridges_sometimes">"Noen ganger trenger du en bro for å komme til Tor."</string>
     <string name="action_more">"FORTELL MEG MER"</string>
@@ -14,17 +8,6 @@
     <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="status_connected">"Tilkoblet!"</string>
-
-    <string name="loading_claim_1">"Vår mangeslugne gemenskap er det som gjør Tor storslått!"</string>
-    <string name="loading_claim_2">"Hverdagsmennesker bruker Tor for å unngå å bli forfulgt av reklame."</string>
-    <string name="loading_claim_3">Når Facebook er blokkert, bruker folk Tor til å koble til venner og familie.</string>
-    <string name="loading_claim_4">Aktivister bruker Tor til å fritt tweet deres meninger og overbevisninger.</string>
-    <string name="loading_claim_5">Bloggere bruker Tor til å samle folk mot sosial reform.</string>
-    <string name="loading_claim_6">Journalister bruker Tor for å undersøke saker de rapporterer om på en trygg måte.</string>
-    <string name="loading_claim_7">Forretningsfolk bruker Tor for å holde strategiene sine hemmelige.</string>
-    <string name="loading_claim_8">Arbeidere bruker Tor til å kjempe for rettferdighet, uten frykt for å miste jobben sin.</string>
-
     <string name="hello">"Hei"</string>
     <string name="welcome">"Velkommen til Tor på Mobilen."</string>
 
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 2c644b43..a4f4aacc 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -2,135 +2,45 @@
 <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="internal_web_url">https://torproject.org</string>
-  <string name="default_web_url">https://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start, og stopp Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot starterâ?¦</string>
+    <string name="status_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="tor_process_waiting">venter.</string>
-  <string name="not_anonymous_yet">ADVARSEL: Trafikken din er enda ikke anonym! Sett opp programmene dine til å bruke HTTP-mellomtjener 127.0.0.1:8118, eller SOCKS4A, eller SOCKS5-mellomtjener 127.0.0.1:9050</string>
-  <string name="menu_home">Hjem</string>
-  <string name="menu_browse">Surf</string>
-  <string name="menu_settings">Innstillinger</string>
+    <string name="menu_settings">Innstillinger</string>
   <string name="menu_log">Logg</string>
-  <string name="menu_info">Hjelp</string>
-  <string name="menu_apps">Apper...</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">Om</string>
-  <string name="menu_promo_apps">Hent programmerâ?¦</string>
-  <string name="main_layout_download">Nedlasting</string>
+    <string name="main_layout_download">Nedlasting</string>
   <string name="main_layout_upload">Opplasting</string>
-  <string name="button_help">Hjelp</string>
-  <string name="button_close">Steng</string>
-  <string name="button_about">Om</string>
-  <string name="button_clear_log">Tøm logg</string>
-  <string name="menu_verify">Kontroller</string>
-  <string name="menu_exit">Avslutt</string>
+    <string name="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="press_to_start">- langt trykk for å starte -</string>
-  <string name="pref_trans_proxy_group">Transparent mellomtjening (Krever Root)</string>
-  <string name="pref_trans_proxy_title">Transparent mellomtjening</string>
-  <string name="pref_trans_proxy_summary">Automatisk torifisering av programmer</string>
-  <string name="pref_transparent_all_title">Tor alt</string>
-  <string name="pref_transparent_all_summary">Mellomtjentrafikk for alle programmer via Tor</string>
-  <string name="pref_transparent_port_fallback_title">Tilbakestill mellomtjeningsport</string>
-  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, osv). *BRUKES KUN* hvis \'alle\', eller \'Program\'-modus ikke virker.</string>
-  <string name="pref_transparent_port_title">Portliste</string>
-  <string name="pref_transparent_port_summary">Liste over porter som skal gå gjennom mellomtjener. *BRUKES KUN* hvis \'Alle\', eller \'Program\'-modus ikke virker.</string>
-  <string name="pref_transparent_port_dialog">Angi porter som skal gå gjennom mellomtjener</string>
-  <string name="pref_has_root">Be om Root-tilgang</string>
-  <string name="pref_has_root_summary">Be om root-tilgang for transparent mellomtjening</string>
-  <string name="status_install_success">Kjørbare Tor-filer installert!</string>
-  <string name="status_install_fail">Kjørbare Tor-filer filer kunne ikke installeres. Sjekk loggen og varsle tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Programfeil</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Om Orbot</string>
-  <string name="btn_next">Neste</string>
-  <string name="btn_back">Tilbake</string>
-  <string name="btn_finish">Ferdig</string>
-  <string name="btn_okay">Ok</string>
+    <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Avbryt</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Noen Orbot-detaljer</string>
-  <string name="wizard_permissions_root">Tillatelse gitt</string>
-  <string name="wizard_permissions_stock">Orbot-tillatelser</string>
-  <string name="wizard_premissions_msg_root">Utmerket! Vi har oppdaget at du har root-rettigheter aktivert for Orbot. Vi vil bruke denne makten med omhu.</string>
-  <string name="wizard_permissions_msg_stock">Selv om det ikke er er nødvendig, kan Orbot bli et mer kraftig verktøy hvis enheten har root-tilgang. Bruk knappen nedenfor til å innvilge Orbot superkrefter!</string>
-  <string name="wizard_permissions_no_root">Hvis du ikke har root-tilgang, eller ikke har noen anelse om hva vi snakker om, bare sørg for å bruke programmer laget for å fungere med Orbot.</string>
-  <string name="wizard_permissions_consent">Jeg forstår, og ønsker å fortsette uten superbruker</string>
-  <string name="wizard_permission_enable_root">Gi Orbot root-tilgang</string>
-  <string name="wizard_configure">Sett opp Torification</string>
-  <string name="wizard_configure_msg">Orbot gir deg muligheten til å rute all programtrafikk gjennom Tor, ELLER å velge programmene individuelt.</string>
-  <string name="wizard_configure_all">Mellomtjen alle programmer gjennom Tor</string>
-  <string name="wizard_configure_select_apps">Velg individuelle programmer som skal brukes med Tor</string>
-  <string name="wizard_tips_tricks">Orbot-aktiverte programmer</string>
-  <string name="wizard_tips_msg">Programmene nedenfor ble utviklet for å fungere med Orbot. Klikk på hver knapp for å installere nå, eller du kan finne dem senere på Google Play, på GuardianProject.info-nettsiden, eller via F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Sikret lynmeldingsklient for Android</string>
-  <string name="wizard_tips_proxy">Mellomtjenings-innstillinger - Lær hvordan du setter opp programmer til å fungere med Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo søkemotor-app</string>
-  <string name="wizard_tips_twitter">Sett Twitters mellomtjener til \"localhost\", og port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Lag en historie og la Tor ta seg av sikkerheten! </string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Mellomtjeningsinnstillinger</string>
-  <string name="wizard_proxy_help_msg">Hvis din Android app kan støtte bruken av en HTTP eller SOCKS proxy, kan du konfigurere den til å koble til Orbot og bruke Tor. Vertsinnstillingene er (127.0.01) eller \"lokalvert\". For HTTP er portinnstillingen 8118. For SOCKS er proxyen 9050. Du bør bruke SOCKS4A eller SOCKS5 om mulig. Lær mer om proxying på Android via FAQ på: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot er klar!</string>
-  <string name="wizard_final_msg">Millioner av mennesker over hele verden bruker Tor av en rekke grunner.\n\ nJournalistter og bloggere, menneskerettighetsforkjempere, politi, soldater, bedrifter, borgere i undertrykkende regimer, og bare vanlige borgere� og deg når du er klar!</string>
-  <string name="wizard_exit_at_first_screen_toast">Du må sette opp Orbot før du kan begynne å bruke det.</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Det har lyktes deg å koble til Tor-nettverket - det betyr dog IKKE at din enhet er sikker. Du kan bruke \'Nettleser\'-knappen til å teste din forbindelse. \n\nBesøk oss på https://guardianproject.info/apps/orbot eller send en e-post til help@xxxxxxxxxxxxxxxxxxxx for å lære mer.</string>
-  <string name="tor_check">Dette vil åpne nettleseren din med adressen https://check.torproject.org for å se om Orbot er satt opp rett, og at du er koblet til Tor.</string>
-  <string name="pref_hs_group">Skjult tjenestevertskap</string>
-  <string name="pref_general_group">Generelt</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-->
-  <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg å forsvare deg mot innholdsfiltrering, trafikkanalyse og overvåking som truer personvern, konfidensiell informasjon og personlige relasjoner. \ N \ nDenne veiviseren vil hjelpe deg med å sette opp Orbot og Tor på enheten.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Advarsel</string>
-  <string name="wizard_warning_msg">� installere Orbot alene vil ikke automatisk anonymisere mobiltrafikk .\n\nDu må sette opp Orbot, enheten og andre programmer til å kunne bruke Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Tillatelser</string>
-  <string name="wizard_permissions_root_msg1">Du kan eventuelt gi Orbot \'Superbruker\'-adgang til å aktivere avanserte funksjoner, for eksempel Transparent mellomtjening.</string>
-  <string name="wizard_permissions_root_msg2">Hvis du ikke ønsker å gjøre dette, må du sørge for å bruke programmer som er laget for å fungere med Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Enheten ser ikke ut til å være root-et, dvs gi root- eller \"superbruker\"-tilgang.\n\n Prøv \"Program\"-modus på hovedskjermen i stedet.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-aktiverte programmer</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Sikret sludreprogram med OTR-kryptering</string>
-  <string name="wizard_tips_orweb">Orfox: Personverns-forbedret nettleser som virker gjennom Tor</string>
-  <string name="wizard_tips_play">Finn programmene fra Guardian-prosjektet på Google Play</string>
-  <string name="wizard_tips_fdroid">Finn alle programmene fra Guardian-prosjektet på F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Finn alle programmene fra Guardian-prosjektet på https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent mellomtjening</string>
-  <string name="wizard_transproxy_msg">Dette tillater dine programmer å kjøre automatisk gjennom Tor-nettverket uten noe oppsett.</string>
-  <string name="wizard_transproxy_hint">(Marker denne boksen hvis du ikke har noen anelse om hva vi snakker om)</string>
-  <string name="wizard_transproxy_none">Ingen</string>
-  <string name="pref_transparent_tethering_title">Tor-deling</string>
-  <string name="pref_transparent_tethering_summary">Aktiver Tor transparent mellomtjening for Wi-Fi, og USB delte enheter (krever omstart)</string>
-  <string name="button_grant_superuser">Be om Superbruker-tilgang</string>
-  <string name="pref_select_apps">Velg programmer</string>
-  <string name="pref_select_apps_summary">Velg programmer som skal rutes gjennom Tor</string>
-  <string name="pref_node_configuration">Node-oppsett</string>
+    <!--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="button_proxy_all">Mellomtjen alt</string>
-  <string name="button_proxy_none">Mellomtjen ingenting</string>
-  <string name="button_invert_selection">Inverter utvalg</string>
-  <string name="pref_proxy_title">Utgående nettverksmellomtjener (valgfritt)</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>
@@ -146,20 +56,8 @@
   <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="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setter opp full transparent mellomtjeningâ?¦</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setter opp programbasert transparent mellomtjeningâ?¦</string>
-  <string name="transparent_proxying_enabled">Transparent mellomtjening AKTIVERT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for nettdeling!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent mellomtjening!</string>
-  <string name="transproxy_rules_cleared">TransProxy regler fjernet</string>
-  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</string>
-  <string name="privoxy_is_running_on_port_">Polipo kjører på port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Setter opp portbasert transparent mellomtjeningâ?¦</string>
-  <string name="bridge_error">Brofeil</string>
-  <string name="bridge_requires_ip">For å kunne bruke bro-funksjonen, må du oppgi minst én bro IP-adresse.</string>
-  <string name="send_email_for_bridges">Send en e-post til bridges@xxxxxxxxxxxxxx med teksten \"get bridges\" alene som eneste tekst i selve e-posten fra en Gmail-konto.</string>
-  <string name="error">Feil</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>
@@ -172,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Bruk *bare* disse angitte nodene</string>
   <string name="bridges">Broer</string>
   <string name="use_bridges">Bruk broer</string>
-  <string name="bridges_obfuscated">Maskerte broer</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
-  <string name="ip_address_and_port_of_bridges">IP-adresser og broporter</string>
+    <string name="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>
@@ -190,17 +86,10 @@
   <string name="reachable_ports">Antreffbare porter</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Antreffbare porter bak en restriktiv brannmur</string>
   <string name="enter_ports">Skriv inn porter</string>
-  <string name="enable_hidden_services">Skjult tjenestevertsskap</string>
-  <string name="run_servers_accessible_via_the_tor_network">Tillat enhetsserveren å være tilgjengelig via Tor-nettverket</string>
-  <string name="enter_localhost_ports_for_hidden_services">Skriv inn localhost-porter for skjulte tjenester</string>
-  <string name="hidden_service_ports">Skjulte tjenesteporter</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Det adresserbare navnet på din skjulte tjeneste (generert automatisk)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
   <string name="project_home">Prosjektets nettside(r):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor-lisensen</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Tredjepartsprogramvare:</string>
+    <string name="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>
@@ -208,37 +97,18 @@
   <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="hidden_service_on">skjult tjeneste på:</string>
-  <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
+    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
   <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
-  <string name="unable_to_reset_tor">Gjør en omstart av din enhet, kan ikke tilbakestille Tor!</string>
-  <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
-  <string name="pref_use_sys_iptables_summary">bruk de innebygde kjørbare iptables-filene istedenfor de som kommer med Orbot</string>
-  <string name="error_installing_binares">Kunne ikke installere eller oppgradere kjørbare Tor-filer.</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">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="notification_using_bridges">Broer slått på!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Språk</string>
-  <string name="set_locale_summary">Velg nasjonale innstillinger og språk for Orbot</string>
-  <string name="wizard_locale_title">Velg språk</string>
-  <string name="wizard_locale_msg">Bruk standard, eller endre det gjeldende språket</string>
-  <string name="powered_by">levert av Tor</string>
-  <string name="btn_save_settings">Lagre innstillinger</string>
-  <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodusâ?¦</string>
-  <string name="bandwidth_">BÃ¥ndbredde:</string>
-  <string name="down">ned</string>
-  <string name="up">opp</string>
-  <string name="pref_disable_network_title">Inget automatisk hvilemodus for nettverk</string>
+    <string name="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="menu_verify_browser">Nettleser</string>
-  <string name="menu_use_chatsecure">Bruk ChatSecure</string>
-  <string name="permission_manage_tor_label">HÃ¥ndter Tor</string>
-  <string name="permission_manage_tor_description">La dette programmet kontrollere Tor-tjenesten</string>
-  <string name="install_apps_">Installer nettleser?</string>
+    <string name="install_apps_">Installer nettleser?</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>
@@ -254,19 +124,7 @@
   <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="wizard_tips_martus">Mobilmartus - Program for menneskerettighetsdokumentasjon fra Benetech</string>
-  <string name="your_tor_public_ips_">Dine offentlige Tor- IP-er:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Skru av dette programmet i Android-&gt;innstillinger-&gt; hvis du har problemer med Orbot:</string>
-  <string name="app_conflict">Programkonflikt</string>
-  <string name="pref_transproxy_refresh_title">Automatisk gjenoppfrisking av Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Håndhev Transproxy-regelsett igjen når nettverkstilstanden endres</string>
-  <string name="pref_transproxy_flush_title">Transproxy TVUNGEN FJERNING</string>
-  <string name="pref_transproxy_flush_summary">Trykk her for å viske ut alle Transproxy-nettverksreglene N�</string>
-  <string name="transparent_proxy_rules_flushed_">Transparente mellomtjeningsregler visket ut!</string>
-  <string name="you_do_not_have_root_access_enabled">Du har ikke ROOT-tilgang påslått</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Det kan hende du må stoppe og starte Orbot for at den nye innstillingene skal trå i kraft.</string>
-  <string name="menu_vpn">Programmer</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -281,14 +139,11 @@
   <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="install_orweb">Installer Orfox</string>
-  <string name="standard_browser">Forvalgt nettleser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Merk: Bare vanlige Tor-broer fungerer på Intel X86/Atom-enheter</string>
-  <string name="hidden_services">Hidden Services</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="ports">Porter</string>
-  <string name="local_port">Lokalt port</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>
@@ -297,9 +152,7 @@
   <string name="backup_service">Sikkerhetskopieringstjeneste</string>
   <string name="delete_service">Slett tjeneste</string>
   <string name="backup_restored">Sikkerhetskopi gjenopprettet</string>
-  <string name="permission_granted">Tilgang innvilget</string>
-  <string name="permission_denied">Tilgang nektet</string>
-  <string name="restore_backup">Gjenopprett sikkerhetskopi</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>
diff --git a/app/src/main/res/values-nl/poestrings.xml b/app/src/main/res/values-nl/poestrings.xml
index 8e4b20cd..113ba126 100644
--- a/app/src/main/res/values-nl/poestrings.xml
+++ b/app/src/main/res/values-nl/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Bridges zijn Tor-relays die censuur omzeilen. Je kan bridges uitproberen als je internetprovider Tor blokkeert; elk type bridge gebruikt een verschillende methode
-om censuur te vermijden. Als een type niet werkt, probeer dan een ander.</string>
-
-    <string name="bridges_no">Geen bridges: rechtstreeks verbinden met Tor</string>
-    <string name="bridges_provided">Aangeboden bridges:</string>
-    <string name="bridges_custom">Aangepaste bridges</string>
-
-    <string name="bridges_config">Bridgeconfiguratie</string>
-    <string name="action_done">Klaar</string>
 
     <string name="bridges_sometimes">Soms heb je een bridge nodig om Tor te gebruiken.</string>
     <string name="action_more">VERTEL ME MEER</string>
@@ -17,19 +8,6 @@ om censuur te vermijden. Als een type niet werkt, probeer dan een ander.</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="status_connected">Verbonden!</string>
-
-    <string name="loading_claim_1">Tor is zo goed dankzij onze diverse gemeenschap!</string>
-    <string name="loading_claim_2">Elke dag gebruiken mensen Tor om niet gevolgd te worden door advertenties.</string>
-    <string name="loading_claim_3">Wanneer Facebook geblokkeerd is, gebruiken mensen Tor om met vrienden en familie in contact te blijven.</string>
-    <string name="loading_claim_4">Activisten gebruiken Tor om vrij te tweeten over hun opvattingen en opinies.</string>
-    <string name="loading_claim_5">Bloggers gebruiken Tor om mensen te scharen achter sociale hervormingen.</string>
-    <string name="loading_claim_6">Journalisten gebruiken Tor om veilig de verhalen waarover ze nieuws uitbrengen te onderzoeken.</string>
-    <string name="loading_claim_7">Businessmensen gebruiken Tor om de strategieën van hun bedrijf privé te houden.</string>
-    <string name="loading_claim_8">Werknemers gebruiken Tor om te strijden voor gerechtigheid zonder vrees voor hun job.</string>
-
-    <string name="status_connecting">We maken verbinding.\" = \"We maken verbinding.</string>
-
     <string name="hello">Hallo</string>
     <string name="welcome">Welkom bij de mobiele versie van Tor.</string>
 
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 939112d2..b74ccddf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2,136 +2,46 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org/?lang=nl</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=nl</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start en stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is bezig met startenâ?¦</string>
+    <string name="status_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="tor_process_waiting">wachten.</string>
-  <string name="not_anonymous_yet">WAARSCHUWING: je verkeer is nog niet anononiem! Stel je programma\'s in om gebruik te maken van HTTP-proxy 127.0.0.1:8118 of SOCKS4A- of SOCKS5-proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Thuis</string>
-  <string name="menu_browse">Bladeren</string>
-  <string name="menu_settings">Instellingen</string>
+    <string name="menu_settings">Instellingen</string>
   <string name="menu_log">Logboek</string>
-  <string name="menu_info">Hulp</string>
-  <string name="menu_apps">Apps...</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Over</string>
-  <string name="menu_promo_apps">Applicaties ophalen...</string>
-  <string name="main_layout_download">Download</string>
+    <string name="main_layout_download">Download</string>
   <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Hulp</string>
-  <string name="button_close">Afsluiten</string>
-  <string name="button_about">Over</string>
-  <string name="button_clear_log">Logboek wissen</string>
-  <string name="menu_verify">Controleren</string>
-  <string name="menu_exit">Sluiten</string>
+    <string name="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="press_to_start">- lang indrukken om te starten -</string>
-  <string name="pref_trans_proxy_group">Transparant proxyen (vereist root)</string>
-  <string name="pref_trans_proxy_title">Transparant proxyen</string>
-  <string name="pref_trans_proxy_summary">Automatisch Torificeren van applicaties</string>
-  <string name="pref_transparent_all_title">Tor alles</string>
-  <string name="pref_transparent_all_summary">Proxy verkeer van alle applicaties door Tor</string>
-  <string name="pref_transparent_port_fallback_title">Poort proxy fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WAARSCHUWING: omzeilt veel voorkomende poorten (80, 443, etc). *GEBRUIK ENKEL* indien de \'Alles\' of \'Applicaties\'-modus niet werkt.</string>
-  <string name="pref_transparent_port_title">Poortlijst</string>
-  <string name="pref_transparent_port_summary">Lijst van poorten om te proxyen. *GEBRUIK ENKEL* indien de \'Alles\' of \'Applicaties\'-modus niet werkt</string>
-  <string name="pref_transparent_port_dialog">Voer poorten in voor proxy</string>
-  <string name="pref_has_root">Vraag root-toegang aan</string>
-  <string name="pref_has_root_summary">Vraag root-toegang aan voor transparant proxyen</string>
-  <string name="status_install_success">Binaire bestanden van Tor succesvol geïnstalleerd!</string>
-  <string name="status_install_fail">De binaire bestanden konden niet worden geïnstalleerd. Gelieve de log te raadplegen en tor-assistants@xxxxxxxxxxxxxx op de hoogte te stellen</string>
-  <string name="title_error">Toepassingsfout</string>
-  <string name="wizard_title">Welkom bij Orbot</string>
-  <string name="wizard_btn_tell_me_more">Over Orbot</string>
-  <string name="btn_next">Volgende</string>
-  <string name="btn_back">Vorige</string>
-  <string name="btn_finish">Einde</string>
-  <string name="btn_okay">Oké</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Rechten toegewezen</string>
-  <string name="wizard_permissions_stock">Orbot-rechten</string>
-  <string name="wizard_premissions_msg_root">Uitstekend! We hebben gedetecteerd dat je root-rechten hebt aangezet voor Orbot. We gebruiken deze kracht met verstand.</string>
-  <string name="wizard_permissions_msg_stock">Hoewel het niet noodzakelijk is kan Orbot nog krachtiger worden als je toestel root-rechten heeft. Gebruik de knop onderaan om Orbot superkrachten te geven!</string>
-  <string name="wizard_permissions_no_root">Als je niet over root-toegang beschikt en geen idee hebt waarmee we bezig zijn, let er dan op dat je applicaties gebruikt die geschikt zijn voor Orbot.</string>
-  <string name="wizard_permissions_consent">Ik begrijp dit en wil verdergaan zonder Superuser</string>
-  <string name="wizard_permission_enable_root">Root toestaan voor Orbot</string>
-  <string name="wizard_configure">Torificatie instellen</string>
-  <string name="wizard_configure_msg">Orbot geeft je de mogelijkheid om al het verkeer via Tor te laten gaan OF om individueel je applicaties te kiezen.</string>
-  <string name="wizard_configure_all">Proxy alle applicaties door Tor</string>
-  <string name="wizard_configure_select_apps">Selecteer individuele applicaties voor Tor</string>
-  <string name="wizard_tips_tricks">Orbot-geschikte applicaties</string>
-  <string name="wizard_tips_msg">De applicaties hieronder zijn gemaakt om met Orbot te werken. Klik op de knoppen om ze te installeren, of vind ze later op GuardianProject.info, F-Droid.org of Google Play.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Beveiligde instant messaging-cliënt voor Android</string>
-  <string name="wizard_tips_proxy">Proxy-instellingen - Leer hoe je applicaties te configureren voor Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo zoekmachine-applicatie</string>
-  <string name="wizard_tips_twitter">Stel Twitter-proxy in als host \"localhost\" en poort 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Maak een verhaal en laat de veiligheid aan Tor over!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-instellingen</string>
-  <string name="wizard_proxy_help_msg">Als de Android-applicatie die je gebruikt het gebruik van een HTTP- of SOCKS-proxy ondersteunt kan je het instellen om te verbinden met Orbot en Tor te gebruiken.\n\n\n De hostinstelling is 127.0.0.1 of \"localhost\". Voor HTTP is de poort 8118, voor SOCKS is de proxy 9050. Indien mogelijk zou je SOCKS4A of SOCKS5 moeten gebruiken.\n \n\n\n Je kan meer te weten komen over proxyen op Android in de VGV op: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot is klaar!</string>
-  <string name="wizard_final_msg">Miljoenen mensen de wereld rond gebruiken Tor voor uiteenlopende redenen.\n\nJournalisten en bloggers, verdedigers van mensenrechten, politie, soldaten, bedrijven, burgers van onderdrukkende regimes, en gewone burgersâ?¦ en nu ben jij er ook klaar voor!</string>
-  <string name="wizard_exit_at_first_screen_toast">Je moet Orbot eerst configureren vooraleer je het kan gebruiken!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">De verbinding met het Tor netwerk is gelukt - maar dit betekent NIET dat je apparaat veilig is. Je kunt de \'Browser\' knop gebruiken om je verbinding te testen. \n\nBezoek ons op https://guardianproject.info/apps/orbot of stuur een email aan help@xxxxxxxxxxxxxxxxxxxx om meer te weten te komen.</string>
-  <string name="tor_check">Dit opent je standaardbrowser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor-netwerk.</string>
-  <string name="pref_hs_group">Verborgen diensten hosten</string>
-  <string name="pref_general_group">Algemeen</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je te verdedigen tegen het filteren van inhoud, verkeersanalyse en netwerktoezicht die je privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\nDeze wizard helpt je bij het instellen van Orbot en Tor op je toestel.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Waarschuwing</string>
-  <string name="wizard_warning_msg">Gewoonweg Orbot installeren zal je mobiele verkeer niet automatisch anonimiseren.\n\nJe moet Orbot, je toestel en andere applicaties juist instellen om Tor succesvol te gebruiken.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Rechten</string>
-  <string name="wizard_permissions_root_msg1">Je kan optioneel Orbot \'Superuser\'-toegang geven om geavanceerde functies beschikbaar te stellen, zoals transparant proxyen.</string>
-  <string name="wizard_permissions_root_msg2">Als je dit niet wil doen, let er dan op dat je applicaties gebruikt die geschikt zijn voor Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Je toestel is niet geroot of biedt geen root of \'Superuser\'-toegang.\n\nProbeer de \'Applicaties\'-modus op het hoofdscherm.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-geschikte applicaties</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: beveiligde chat-applicatie met Off-the-Record-versleuteling</string>
-  <string name="wizard_tips_orweb">Orfox: Browser met pricavy functies die werkt met Tor</string>
-  <string name="wizard_tips_play">Vind alle Guardian Project-applicaties op Google Play</string>
-  <string name="wizard_tips_fdroid">Vind alle Guardian Project-applicaties op F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Vind alle Guardian Project-applicaties op https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparant proxyen</string>
-  <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw applicaties om automatisch via het Tor-netwerk te draaien zonder enige configuratie.</string>
-  <string name="wizard_transproxy_hint">(Vink dit aan als je geen idee hebt waarover we het hebben)</string>
-  <string name="wizard_transproxy_none">Geen</string>
-  <string name="pref_transparent_tethering_title">Tor tetheren</string>
-  <string name="pref_transparent_tethering_summary">Schakel Tor transparante proxy voor WiFi en USB-getheterde toestellen in (vereist herstart)</string>
-  <string name="button_grant_superuser">Vraag Superuser-toegang aan</string>
-  <string name="pref_select_apps">Kies applicaties</string>
-  <string name="pref_select_apps_summary">Kies applicaties om via Tor te draaien</string>
-  <string name="pref_node_configuration">Node-configuratie</string>
+    <!--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="button_proxy_all">Proxy alles</string>
-  <string name="button_proxy_none">Proxy niets</string>
-  <string name="button_invert_selection">Selectie omkeren</string>
-  <string name="pref_proxy_title">Uitgaande netwerk-proxy (facultatief)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Uitgaande proxywachtwoord</string>
   <string name="pref_proxy_password_summary">Proxywachtwoord (facultatief)</string>
   <string name="pref_proxy_password_dialog">Voer proxywachtwoord in</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Bezig met opzetten van volledig transparante proxyâ?¦</string>
-  <string name="setting_up_app_based_transparent_proxying_">Bezig met opzetten van per-applicatie transparante proxyâ?¦</string>
-  <string name="transparent_proxying_enabled">Transparante proxy INGESCHAKELD</string>
-  <string name="transproxy_enabled_for_tethering_">Transparante proxy ingeschakeld voor tetheren!</string>
-  <string name="warning_error_starting_transparent_proxying_">WAARSCHUWING: fout tijdens starten van transparante proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy-regels gewist</string>
-  <string name="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </string>
-  <string name="privoxy_is_running_on_port_">Polipo wordt uitgevoerd op poort:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Bezig met opzetten van per-poort transparante proxyâ?¦</string>
-  <string name="bridge_error">Bridge-fout</string>
-  <string name="bridge_requires_ip">Om de bridge-functie te gebruiken moet je minstens één bridge IP-adres invoeren.</string>
-  <string name="send_email_for_bridges">Stuur een e-mail met een Gmail-account naar bridges@xxxxxxxxxxxxxx met enkel de regel \"get bridges\" als de tekst van de e-mail.</string>
-  <string name="error">Fout</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Gebruik *enkel* deze opgegeven nodes</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Gebruik bridges</string>
-  <string name="bridges_obfuscated">Versluierde bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatieve toegangen tot het Tor-netwerk inschakelen</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string>
-  <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Bereikbare poorten</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Poorten bereikbaar achter een beperkende firewall</string>
   <string name="enter_ports">Voer poorten in</string>
-  <string name="enable_hidden_services">Verborgen diensten hosten</string>
-  <string name="run_servers_accessible_via_the_tor_network">maak server-op-toestel toegankelijk via het Tor-netwerk</string>
-  <string name="enter_localhost_ports_for_hidden_services">voer localhost-poorten in voor verborgen diensten</string>
-  <string name="hidden_service_ports">Verborgen dienst-poort</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">de adresseerbare naam voor je verborgen dienst (automatisch gegenereerd)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">schakel debug log naar uitvoer in (adb of aLogCat is nodig om dit te bekijken)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">schakel debug log naar uitvoer in (adb of aLogCat is nodig om dit te bekijken)</string>
   <string name="project_home">Project homepagina(\'s): </string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">De Tor-licentie</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software van 3e partijen: </string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">verborgen dienst op:</string>
-  <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
+    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
   <string name="unable_to_start_tor">Kan Tor niet starten:</string>
-  <string name="unable_to_reset_tor">Herstart je toestel, kan Tor niet opnieuw instellen!</string>
-  <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string>
-  <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables-binary in plaats van de in Orbot geïntegreerde</string>
-  <string name="error_installing_binares">De Tor-binaries konden niet worden geïnstalleerd of bijgewerkt.</string>
-  <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
+    <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
   <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
   <string name="pref_use_expanded_notifications">Toon uitgebreide melding met Tor-exitland en IP</string>
   <string name="pref_use_expanded_notifications_title">Uitgebreide meldingen</string>
-  <string name="notification_using_bridges">Bridges ingeschakeld!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Taal</string>
-  <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
-  <string name="wizard_locale_title">Kies taal</string>
-  <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string>
-  <string name="powered_by">aangedreven door Tor</string>
-  <string name="btn_save_settings">Sla instellingen op</string>
-  <string name="no_internet_connection_tor">Geen internetverbinding; Tor is in de slaapstand...</string>
-  <string name="bandwidth_">Bandbreedte:</string>
-  <string name="down">omlaag</string>
-  <string name="up">omhoog</string>
-  <string name="pref_disable_network_title">Geen netwerk automatisch slapen</string>
+    <string name="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="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Gebruik ChatSecure</string>
-  <string name="permission_manage_tor_label">Tor beheren</string>
-  <string name="permission_manage_tor_description">Deze applicatie toestaan om de Tor-dienst te bedienen</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot werkt best met de Orfox-browser. Nu installeren?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot werkt best met de Orfox-browser. Nu installeren?</string>
   <string name="install_apps_">Browser installeren?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Geen internetverbinding. Tor wordt te slapen gelegdâ?¦</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Netwerkverbinding is in orde. Tor wordt wakker gemaaktâ?¦</string>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Torrc aangepaste configuratie</string>
   <string name="pref_torrc_summary">ENKEL VOOR GEVORDERDEN: voer rechtstreeks torrc-configuratieregels in</string>
   <string name="pref_torrc_dialog">Aangepaste Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Je Tor publieke IP\'s:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Schakel deze applicatie uit in Android-&gt;Instellingen-&gt;Applicaties als je problemen ondervindt met Orbot:</string>
-  <string name="app_conflict">Applicatie-conflict</string>
-  <string name="pref_transproxy_refresh_title">Transproxy automatisch verversen</string>
-  <string name="pref_transproxy_refresh_summary">Transproxy-regels opnieuw toepassen wanneer de status van het netwerk verandert</string>
-  <string name="pref_transproxy_flush_title">Transproxy VERWIJDEREN DWINGEN</string>
-  <string name="pref_transproxy_flush_summary">Tik hier om alle transproxy-netwerkregels NU te spoelen</string>
-  <string name="transparent_proxy_rules_flushed_">Transparante proxy-regels gespoeld!</string>
-  <string name="you_do_not_have_root_access_enabled">Je hebt ROOT-toegang niet ingeschakeld</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Het kan nodig zijn Orbot te stoppen en opnieuw te starten opdat wijzigingen in de instellingen worden ingeschakeld.</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Activeren</string>
   <string name="apps_mode">VPN-modus</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Je kan instellen dat apps gebruik maken van het Tor-netwerk met de ingebouwde Orbot-VPN.\n\nDit zal je niet anoniem maken, maar helpt je wel door firewalls te geraken.</string>
-  <string name="send_email">E-mail versturen</string>
+    <string name="send_email">E-mail versturen</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Je kan een bridge-adres verkrijgen door e-mail, het web of door een bridge-QR-code te scannen. Kies \'E-mail\' of \'Web\' hieronder om een bridge-adres aan te vragen.\n\nEenmaal je een adres hebt kopieer en plak je het in de \"Bridges\"-optie in de Orbot-instellingen, waarna je Orbot herstart.</string>
   <string name="install_orweb">Orfox installeren</string>
-  <string name="standard_browser">Standaardbrowser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LET OP: enkel standaard Tor-bridges werken op Intel x86/Atom-toestellen</string>
-  <string name="vpn_default_world">Algemeen (automatisch)</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="ports">Poorten</string>
-  <string name="local_port">Lokale poort</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Toestemming verleend</string>
-  <string name="permission_denied">Toestemming geweigerd</string>
-  <string name="restore_backup">Back-up herstellen</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Schakel de VPN-modus in om apps gebruik te laten maken van Tor</string>
-  <string name="app_shortcuts">Tor-gebruikende apps</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActiviteit</string>
-  <string name="testing_bridges">Bridgeverbinding met Tor testen....</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>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index 02c13bd1..8b163418 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -1,28 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_browse">�ਰਨਾ</string>
-  <string name="menu_settings">ਪਰਿਸਥਿਤ�</string>
-  <string name="menu_info">ਸਹਾ�ਤਾ</string>
-  <string name="menu_about">�ਸ ਬਾਰ�</string>
-  <string name="button_help">ਸਹਾ�ਤਾ</string>
-  <string name="button_about">�ਸ ਬਾਰ�</string>
-  <string name="menu_verify">��ੱ�</string>
-  <string name="menu_exit">ਬੰਦ �ਰ�</string>
+    <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)-->
-  <string name="wizard_proxy_help_info">ਪਰਾ�ਸ� ਸ��ਿੰ�</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">�ਾਲ�</string>
-  <string name="status">ਸਥਿਤ�</string>
-  <string name="error">�ਲਤ�:</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ਭਾਸ਼ਾ</string>
+    <string name="error">�ਲਤ�:</string>
+    <string name="set_locale_title">ਭਾਸ਼ਾ</string>
   <string name="save">ਸੰਭਾਲ�</string>
   <string name="name">ਨਾ�</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 192e8773..2ff7f67b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2,135 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot jest darmowÄ? aplikacjÄ? proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i nastÄ?pnie przepuszczania go przez wiele innych komputereów pororzucanych na caÅ?ym Å?wiecie. Tor jest darmowym oprogramowaniem i otwartÄ? sieciÄ? która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolnoÅ?ci i prywatnoÅ?ci, poufnym biznesowym aktywnoÅ?ciom.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">wÅ?Ä?cz i wyÅ?Ä?cz Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startuje...</string>
+    <string name="status_starting_up">Orbot startuje...</string>
   <string name="status_activated">PodÅ?Ä?czony do sieci Tor</string>
   <string name="status_disabled">Orbot wyÅ?Ä?czony</string>
   <string name="status_shutting_down">TorService wyÅ?Ä?cza siÄ?</string>
   <string name="tor_process_starting">Uruchamianie klienta sieci Tor...</string>
   <string name="tor_process_complete">gotowe.</string>
-  <string name="tor_process_waiting">czekaj.</string>
-  <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! ProszÄ? skonfiguruj aplikacje aby używaÅ?y serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Start</string>
-  <string name="menu_browse">PrzeglÄ?daj</string>
-  <string name="menu_settings">Ustawienia</string>
+    <string name="menu_settings">Ustawienia</string>
   <string name="menu_log">Logi</string>
-  <string name="menu_info">Pomoc</string>
-  <string name="menu_apps">Aplikacje...</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">O programie</string>
-  <string name="menu_promo_apps">ZdobÄ?dź aplikacje</string>
-  <string name="main_layout_download">Pobieranie (prÄ?dkoÅ?Ä?/suma)</string>
+    <string name="main_layout_download">Pobieranie (prÄ?dkoÅ?Ä?/suma)</string>
   <string name="main_layout_upload">WysyÅ?anie (prÄ?dkoÅ?Ä?/suma)</string>
-  <string name="button_help">Pomoc</string>
-  <string name="button_close">Zamknij</string>
-  <string name="button_about">O programie</string>
-  <string name="button_clear_log">CzyÅ?Ä? dziennik</string>
-  <string name="menu_verify">Sprawdź</string>
-  <string name="menu_exit">WyjÅ?cie</string>
+    <string name="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="press_to_start">- wciÅ?nij na dÅ?użej, by uruchomiÄ? -</string>
-  <string name="pref_trans_proxy_group">Przekierowanie przezroczyste (Wymaga uprawnieÅ? administratora)</string>
-  <string name="pref_trans_proxy_title">Przekierowanie przezroczyste</string>
-  <string name="pref_trans_proxy_summary">Automatyczne toryfikowanie aplikacji</string>
-  <string name="pref_transparent_all_title">PrzepuÅ?Ä? wszystko przez Tora</string>
-  <string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
-  <string name="pref_transparent_port_fallback_title">Zapasowy Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">UWAGA: Unika powszechnych portów (80, 443, etc). *UÅ»YWAÄ? TYLKO* gdy \'All\' lub tryb \'App\' nie dziaÅ?a.</string>
-  <string name="pref_transparent_port_title">Lista Portów</string>
-  <string name="pref_transparent_port_summary">Lista portów, które przechwytywaÄ?. *UÅ»YWAÄ? TYLKO* gdy \'All\' lub tryb \'App\' nie dziaÅ?a.</string>
-  <string name="pref_transparent_port_dialog">Wpisz porty do przechwytywania</string>
-  <string name="pref_has_root">Å»Ä?daj dostÄ?pu administratora</string>
-  <string name="pref_has_root_summary">Å»Ä?daj dostÄ?pu administratora dla przezroczystego przekierowania</string>
-  <string name="status_install_success">Binarki Tora pomyÅ?lnie zainstalowane!</string>
-  <string name="status_install_fail">Nie można zainstalowaÄ? plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">BÅ?Ä?d Aplikacji</string>
-  <string name="wizard_title">Witamy w Orbocie</string>
-  <string name="wizard_btn_tell_me_more">O Orbocie</string>
-  <string name="btn_next">Dalej</string>
-  <string name="btn_back">wstecz</string>
-  <string name="btn_finish">Koniec</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_okay">OK</string>
   <string name="btn_cancel">Anuluj</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Niektóre szczegóÅ?y o Orbocie</string>
-  <string name="wizard_permissions_root">DostÄ?p zezwolony</string>
-  <string name="wizard_permissions_stock">Prawa dostepu Orbota</string>
-  <string name="wizard_premissions_msg_root">Doskonale! OdkryliÅ?my, że masz uprawnienia administratora wÅ?Ä?czone dla Orbota. BÄ?dziemy mÄ?drze korzystaÄ? z tej wÅ?adzy.</string>
-  <string name="wizard_permissions_msg_stock">Podczas gdy nie jest to wymagane, Orbot może staÄ? siÄ? znacznie potÄ?żniejszym narzÄ?dziem, gdy masz prawa administratora na swoim urzÄ?dzeniu. Użyj przycisku poniżej, by daÄ? Orbotowi duży uprawnienia.</string>
-  <string name="wizard_permissions_no_root">JeÅ?li nie masz uprawnieÅ? administratora lub nie masz pojÄ?cia, o czym mówimy, używaj aplikacji skonfigurowanych do pracy z Orbotem.</string>
-  <string name="wizard_permissions_consent">Rozumiem i chcÄ? kontynuowaÄ? bez uprawnieÅ? administratora</string>
-  <string name="wizard_permission_enable_root">Nadaj uprawnienia administratora Orbotowi</string>
-  <string name="wizard_configure">Skonfiguruj ToryfikacjÄ?</string>
-  <string name="wizard_configure_msg">Orbot daje Ci możliwoÅ?Ä? przekierowania caÅ?ego ruchu aplikacji przez Tora albo wybrania aplikacji pojedynczo.</string>
-  <string name="wizard_configure_all">Przekierowuj wszystkie aplikacje przez Tora</string>
-  <string name="wizard_configure_select_apps">Wybierz poszczególne aplikacje dla Tora</string>
-  <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
-  <string name="wizard_tips_msg">ZachÄ?camy do pobierania i używania aplikacji, które wiedzÄ?, jak Å?Ä?czyÄ? siÄ? bezpoÅ?rednio z Orbotem. Kliknij na poniższe przyciski, by zainstalowaÄ?.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Bezpieczny komunikator pod Androida</string>
-  <string name="wizard_tips_proxy">Ustawienia Proxy - Dowiedz siÄ?, jak konfigurowaÄ? aplikacje do wspóÅ?pracy z Orbotem</string>
-  <string name="wizard_tips_duckgo">Aplikacja Duckduckgo Search Engine</string>
-  <string name="wizard_tips_twitter">Twitter obsÅ?uguje proxy http \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Napisz artukuÅ?, historiÄ?, a bezpieczeÅ?stwo pozostaw Torowi.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ustawienia Proxy</string>
-  <string name="wizard_proxy_help_msg">JeÅ?li aplikacja na Androida, której używasz obsÅ?uguje proxy HTTP lub SOCKS proxy, to możesz skonfigurowaÄ? jÄ? do Å?Ä?czenia siÄ? z Orbotem i używania Tora. Ustawienie hosta to 127.0.0.1 lub \"localhost\". Dla HTTP, numer portu to 8118. Dla SOCKS proxy to 9050. Powinno siÄ? używaÄ? SOCKS4A lub SOCKS5, jeÅ?li to możliwe.\n \n\n\n Możesz dowiedzieÄ? siÄ? wiÄ?cej o przekierowaniu ruchu na Androidzie z FAQ pod adresem: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot jest gotowy!</string>
-  <string name="wizard_final_msg">Miliony ludzi na caÅ?ym Å?wiecie używajÄ? Tora z różnych powodów.\n\nDziennikarze i blogerzy, dziaÅ?acze na rzecz praw czÅ?owieka, stróże prawa, żoÅ?nierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
-  <string name="wizard_exit_at_first_screen_toast">ProszÄ? skonfiguruj Orbot zanim zaczniesz go uzywaÄ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">PomyÅ?lnie poÅ?Ä?czyÅ?eÅ? siÄ? do sieci Tor - ale to nie oznacza, że Twoje urzÄ?dzenie jest bezpieczne. Możesz użyÄ? przycisku \'PrzeglÄ?darka\' aby sprawdziÄ? swoje poÅ?Ä?czenie. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyÅ?lij nam maila na help@xxxxxxxxxxxxxxxxxxxx aby dowiedzieÄ? siÄ? wiÄ?cej.</string>
-  <string name="tor_check">To otworzy TwojÄ? domyÅ?lnÄ? przeglÄ?darkÄ? na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poÅ?Ä?czenie z Torem.</string>
-  <string name="pref_hs_group">UsÅ?ugi ukryte</string>
-  <string name="pref_general_group">Ogólne</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot daje Tora Androidowi! Tor pomaga broniÄ? siÄ? przed podsÅ?uchem sieci znanym jako analiza ruchu, który zagraża wolnoÅ?ci osobistej i prywatnoÅ?ci, poufnym dziaÅ?aniom biznesowym i relacjami.\n\nTen kreator pomoże Ci skonfigurowaÄ? Orbota i Tora na Twoim urzÄ?dzeniu.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ostrzeżenie</string>
-  <string name="wizard_warning_msg">Sama instalacja Orbota nie sprawi, że Twój mobilny ruch bÄ?dzie caÅ?kiem anonimowy.\n\nMusisz wykonaÄ? poprawnÄ? konfiguracjÄ? Orbota, Twojego urzÄ?dzenia i innych aplikacji, aby skutecznie używaÄ? Tora.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Uprawnienia</string>
-  <string name="wizard_permissions_root_msg1">Możesz opcjonalnie przekazaÄ? darowiznÄ? Orbotowi i otrzymaÄ? dostÄ?p \'Superużytkownika\' aby wÅ?Ä?czyÄ? zaawansowane funkcje, jak np. Transparentne Proxy.</string>
-  <string name="wizard_permissions_root_msg2">JeÅ?li nie chcesz tego robiÄ?, upewnij siÄ? by używaÄ? aplikacji stworzonych do pracy z Orbotem</string>
-  <string name="wizard_permissions_no_root_msg">WyglÄ?da na to, że Twoje urzÄ?dzenie nie ma praw administratora, lub nie posiada opcji \'Super użytkownika\'.\n\nZamiast tego prosimy o spróbowanie opcji \'Aplikacje\' na gÅ?ównym ekranie.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-WÅ?Ä?czone Aplikacje</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Bezpieczny komunikator z szyfrowaniem Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: PrzeglÄ?darka, która dziaÅ?a przez Tora</string>
-  <string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string>
-  <string name="wizard_tips_fdroid">Zobacz wszystkie aplikacje Guardian Project na F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Zobacz wszystkie aplikacje Guardian Project na https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentne Proxy</string>
-  <string name="wizard_transproxy_msg">To pozwala Twojej aplikacji na automatyczne poÅ?Ä?czenie przez SieÄ? Tor bez żadnej konfiguracji.</string>
-  <string name="wizard_transproxy_hint">(Sprawdź tutaj, jeÅ?li nie masz pojÄ?cia o czym mówimy)</string>
-  <string name="wizard_transproxy_none">Brak</string>
-  <string name="pref_transparent_tethering_title">PrzywiÄ?zywanie Tora</string>
-  <string name="pref_transparent_tethering_summary">WÅ?Ä?cz Transparentne Proxy Tora dla Wifi i USB (wymaga restartu)</string>
-  <string name="button_grant_superuser">Å»Ä?danie dostÄ?pu Superużytkownika</string>
-  <string name="pref_select_apps">Wybierz aplikacje</string>
-  <string name="pref_select_apps_summary">Wybierz aplikacje do przejÅ?cia przez Tor</string>
-  <string name="pref_node_configuration">Konfiguracja wÄ?zÅ?a</string>
+    <!--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="button_proxy_all">Przepuszczaj wszystko przez proxy</string>
-  <string name="button_proxy_none">Nie przepuszczaj niczego przez proxy</string>
-  <string name="button_invert_selection">OdwróÄ? zaznaczone</string>
-  <string name="pref_proxy_title">WychodzÄ?cy serwer sieciowy proxy</string>
+    <string name="pref_proxy_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>
@@ -146,20 +56,8 @@
   <string name="pref_proxy_password_title">HasÅ?o WychodzÄ?cego Proxy</string>
   <string name="pref_proxy_password_summary">HasÅ?o Proxy (opcjonalne)</string>
   <string name="pref_proxy_password_dialog">Wpisz hasÅ?o Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Ustawianie w peÅ?ni transparentnego proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ustawianie bazujÄ?cego na aplikacji transparentnego proxy</string>
-  <string name="transparent_proxying_enabled">Transparentne proxy WÅ?Ä?CZONE</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy podÅ?Ä?czone do modemu!</string>
-  <string name="warning_error_starting_transparent_proxying_">OSTRZEÅ»ENIE: bÅ?Ä?d w uruchamianiu transparentnego proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy dziaÅ?a czysto</string>
-  <string name="couldn_t_start_tor_process_">Nie można byÅ?o zainicjowaÄ? procesu Tora:</string>
-  <string name="privoxy_is_running_on_port_">Polipo dziaÅ?a na porcie:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ustawianie bazujÄ?cego na porcie transparentnego proxy</string>
-  <string name="bridge_error">BÅ?Ä?d mostka</string>
-  <string name="bridge_requires_ip">Aby użyÄ? funkcji mostka, musisz wpisaÄ? przynajmniej jeden adres IP mostka.</string>
-  <string name="send_email_for_bridges">WyÅ?lij e-mail do bridges@xxxxxxxxxxxxxx piszÄ?c w treÅ?ci \"get bridges\" z konta gmail.</string>
-  <string name="error">BÅ?Ä?d</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>
@@ -172,9 +70,7 @@
   <string name="use_only_these_specified_nodes">Użyj *tylko* tych okreÅ?lonych wÄ?zÅ?ów</string>
   <string name="bridges">Mostki</string>
   <string name="use_bridges">Użyj mostków</string>
-  <string name="bridges_obfuscated">UUtajnione Mostki</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">WÅ?Ä?cz, jeÅ?li skonfigurowane mostki sÄ? ukrytymi mostkami</string>
-  <string name="ip_address_and_port_of_bridges">Adres IP i port mostków</string>
+    <string name="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>
@@ -190,53 +86,27 @@
   <string name="reachable_ports">OsiÄ?galne porty</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostÄ?pne za ograniczajÄ?cym firewallem</string>
   <string name="enter_ports">Wpisz porty</string>
-  <string name="enable_hidden_services">WÅ?Ä?cz Ukryte Serwisy</string>
-  <string name="run_servers_accessible_via_the_tor_network">wÅ?Ä?cz serwisy dostÄ?pne przez SieÄ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">wpisz porty localhosta dla ukrytych serwisów</string>
-  <string name="hidden_service_ports">Porty Ukrytych Serwisów</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresowana nazwa dla Twojego ukrytego serwisu (generowana automatycznie)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">wÅ?Ä?cz zdebugowany log do wydajnoÅ?ci (musisz używaÄ? adb lub aLogCat, by go zobaczyÄ?)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">wÅ?Ä?cz zdebugowany log do wydajnoÅ?ci (musisz używaÄ? adb lub aLogCat, by go zobaczyÄ?)</string>
   <string name="project_home">Strony domowe projektu:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Licencja Tora</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Oprogramowanie 3rd-Party</string>
+    <string name="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="hidden_service_on">ukryty serwis:</string>
-  <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
+    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
   <string name="unable_to_start_tor">Nie można wystartowaÄ? aplikacji Tor:</string>
-  <string name="unable_to_reset_tor">Zrestartuj swoje urzÄ?dzenie, nie można zrestartowaÄ? Tora!</string>
-  <string name="pref_use_sys_iptables_title">Użyj domyÅ?lnie Iptables</string>
-  <string name="pref_use_sys_iptables_summary">użyj wbudowanych plików binarnych iptables zamiast tych w pakiecie z Orbotem</string>
-  <string name="error_installing_binares">Pliki binarne Tora nie zostaÅ?y zainstalowane lub uaktualnione.</string>
-  <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonÄ? w pasku powiadomieÅ? gdy Orbot jest poÅ?Ä?czony</string>
+    <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonÄ? w pasku powiadomieÅ? gdy Orbot jest poÅ?Ä?czony</string>
   <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
   <string name="pref_use_expanded_notifications">Pokaż rozszerzone powiadomienie z krajem Tor exit node oraz jego IP</string>
   <string name="pref_use_expanded_notifications_title">Rozszerzone Powiadomienia</string>
-  <string name="notification_using_bridges">Mostki wÅ?Ä?czone!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">JÄ?zyk</string>
-  <string name="set_locale_summary">Wybierz ustawienia regionalne i jÄ?zyk dla Orbota</string>
-  <string name="wizard_locale_title">Wybierz jÄ?zyk</string>
-  <string name="wizard_locale_msg">Zostaw domyÅ?lny albo zmieÅ? jÄ?zyk</string>
-  <string name="powered_by">napÄ?dzane oprogramowaniem Projektu Tor</string>
-  <string name="btn_save_settings">Zapisz ustawienia</string>
-  <string name="no_internet_connection_tor">Brak poÅ?Ä?czenia internetowego; Tor jest w trybie oczekiwania...</string>
-  <string name="bandwidth_">PrzepustowoÅ?Ä?:</string>
-  <string name="down">pobieranie</string>
-  <string name="up">wysyÅ?anie</string>
-  <string name="pref_disable_network_title">Brak Auto-UÅ?pienia Sieci</string>
+    <string name="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="menu_verify_browser">PrzeglÄ?darka</string>
-  <string name="menu_use_chatsecure">Użyj ChatSecure</string>
-  <string name="permission_manage_tor_label">Administruj Tor\'em</string>
-  <string name="permission_manage_tor_description">Pozwól tej aplikacji kontrolowaÄ? serwis Tor</string>
-  <string name="install_apps_">ZainstalowaÄ? przeglÄ?darkÄ??</string>
+    <string name="install_apps_">ZainstalowaÄ? przeglÄ?darkÄ??</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>
@@ -252,19 +122,7 @@
   <string name="pref_torrc_title">Konfiguracja Torrc klienta</string>
   <string name="pref_torrc_summary">TYLKO DLA EKSPERTÃ?W: wpisz linijki konfiguracyjne torrc</string>
   <string name="pref_torrc_dialog">Torrc klienta</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Dokumentacja Aplikacji Praw CzÅ?owieka</string>
-  <string name="your_tor_public_ips_">Twoje publiczne Tor IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">ProszÄ? wyÅ?Ä?cz tÄ? aplikacjÄ? w Android-&gt;Ustawienia-&gt;Aplikacje jesli masz problemy z Orbot:</string>
-  <string name="app_conflict">Konflikt aplikacji</string>
-  <string name="pref_transproxy_refresh_title">Transproxy Auto-OdÅ?wież</string>
-  <string name="pref_transproxy_refresh_summary">Zaztosuj ustawienia Transproxy kiedy stan sieci zmieni siÄ?</string>
-  <string name="pref_transproxy_flush_title">Transproxy WYMUÅ? USUNIÄ?CIE</string>
-  <string name="pref_transproxy_flush_summary">Dotknij tutaj, aby wyczyÅ?ciÄ? wszystkie zasady sieciowe transproxy TERAZ</string>
-  <string name="transparent_proxy_rules_flushed_">Ustawienia Transproxy zostaÅ?y wyczyszczone!</string>
-  <string name="you_do_not_have_root_access_enabled">Nie masz praw użytkownika root.</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Możesz zatrzymaÄ? i uruchomiÄ? ponownie Orbota, aby zmiany ustawieÅ? weszÅ?y w życie.</string>
-  <string name="menu_vpn">Aplikacje</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -279,14 +137,11 @@
   <string name="send_email">WyÅ?lij Email</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Możesz uzyskaÄ? adres Bridge poprzez email, internet, lub poprzez zeskanowanie kodu QR. Wybierz \'Email\' lub \'Internet\' poniżej, aby poprosiÄ? o adres bridge\'a.\n\nJak już bÄ?dziesz mieÄ? ten adres to skopiuj i wklej go do \"Bridges\" we wÅ?aÅ?ciwoÅ?ciach Orbota a nastÄ?pnie go zrestartuj.</string>
   <string name="install_orweb">Zainstaluj Orfox</string>
-  <string name="standard_browser">Standardowa przeglÄ?darka</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">UWAGA: Tylko standardowe bridges dziaÅ?ajÄ? na urzÄ?dzeniach z Intel X86/ATOM.</string>
-  <string name="hidden_services">Ukryte UsÅ?ugi</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="ports">Porty</string>
-  <string name="local_port">Lokalne Porty</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>
diff --git a/app/src/main/res/values-ps/strings.xml b/app/src/main/res/values-ps/strings.xml
index 79fc21a7..e832af24 100644
--- a/app/src/main/res/values-ps/strings.xml
+++ b/app/src/main/res/values-ps/strings.xml
@@ -1,17 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="menu_info">Help</string>
-  <string name="button_help">Help</string>
-  <string name="btn_cancel">Cancel</string>
+    <string name="btn_cancel">Cancel</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
-  <string name="name">Name</string>
+    <string name="name">Name</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/poestrings.xml b/app/src/main/res/values-pt-rBR/poestrings.xml
index 62850d08..a6d12ea3 100644
--- a/app/src/main/res/values-pt-rBR/poestrings.xml
+++ b/app/src/main/res/values-pt-rBR/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">Bridges são relays Tor que ajudam a transpor mecanismos de censura. Você pode utilizar Bridges caso o seu provedor bloqueie o uso do Tor; este tipo de Bridge usa métodos
-     diferentes para evitar censura: caso um tipo não funcione, tente utilizando um diferente.</string>
-
-    <string name="bridges_no">Sem Bridges: Diretamente conectado com o Tor</string>
-    <string name="bridges_provided">Bridges fornecidas:</string>
-    <string name="bridges_custom">Bridges Customizadas</string>
-
-    <string name="bridges_config">Configuração de Bridge</string>
-    <string name="action_done">Pronto</string>
 
     <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>
@@ -17,19 +8,6 @@
     <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="status_connected">Conectado!</string>
-
-    <string name="loading_claim_1">Nossa diversificada comunidade é o que o Tor grande!</string>
-    <string name="loading_claim_2">Todos os dias pessoas usam o Tor para evitar rastreamento de anúncios de marketing.</string>
-    <string name="loading_claim_3">Quando o Facebook é bloqueado, pessoas utilizam o Tor para conectar com seus amigos e familiares.</string>
-    <string name="loading_claim_4">Ativistas utilizam o Tor para expressar livremente suas opiniões e crenças no Twitter.</string>
-    <string name="loading_claim_5">Blogueiros utilizam o Tor para reunir pessoas para reformas sociais.</string>
-    <string name="loading_claim_6">Jornalistas usam o Tor para investigações seguras sobre histórias que eles estão relatando.</string>
-    <string name="loading_claim_7">Empresários utilizam o Tor para manter suas estratégias de negócios a salvo.</string>
-    <string name="loading_claim_8">Trabalhadores usam o Tor para lutar por justiça sem medo de perder seus empregos.</string>
-
-    <string name="status_connecting">Estamos conectando você.\" = \"Estamos conectando você.</string>
-
     <string name="hello">Olá</string>
     <string name="welcome">Seja bem vindo ao Tor para dispositivos móveis.</string>
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 286feceb..a5217f0d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e parar o Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciando...</string>
+    <string name="status_starting_up">Orbot está iniciando...</string>
   <string name="status_activated">Conectado à rede Tor</string>
   <string name="status_disabled">Orbot está desativado</string>
   <string name="status_shutting_down">TorService está desligando</string>
   <string name="tor_process_starting">Iniciando cliente Tor...</string>
   <string name="tor_process_complete">completo.</string>
-  <string name="tor_process_waiting">esperando.</string>
-  <string name="not_anonymous_yet">AVISO: Seu tráfego não é anônimo ainda! Por favor, configure suas aplicações para usar proxy HTTP 127.0.0.1:8118 ou proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Início</string>
-  <string name="menu_browse">Procurar</string>
-  <string name="menu_settings">Configurações</string>
+    <string name="menu_settings">Configurações</string>
   <string name="menu_log">Log</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_apps">Aplicativos...</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Parar</string>
   <string name="menu_about">Sobre</string>
-  <string name="menu_promo_apps">Obter aplicativos...</string>
-  <string name="main_layout_download">Download</string>
+    <string name="main_layout_download">Download</string>
   <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Fechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar Log</string>
-  <string name="menu_verify">Checar</string>
-  <string name="menu_exit">Sair</string>
+    <string name="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="press_to_start">- clique longo para iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
-  <string name="pref_trans_proxy_summary">Automaticamente Torificar Apps</string>
-  <string name="pref_transparent_all_title">Tor Tudo</string>
-  <string name="pref_transparent_all_summary">Tráfego proxy para todos apps através do Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porta do Proxy Reserva</string>
-  <string name="pref_transparent_port_fallback_summary">AVISO: Evite as portas comuns (80, 443, etc). *SOMENTE UTILIZE* se o modo \'Todos\' ou \'App\' não funcionar.</string>
-  <string name="pref_transparent_port_title">Lista de Portas</string>
-  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou</string>
-  <string name="pref_transparent_port_dialog">Digite as portas para proxy</string>
-  <string name="pref_has_root">Requer Acesso Root</string>
-  <string name="pref_has_root_summary">Requer acesso root para proxy transparente</string>
-  <string name="status_install_success">Binário do Tor instalados com sucesso!</string>
-  <string name="status_install_fail">Os arquivos binários do Tor estão inaptos à serem instalados. Por favor, cheque o log e notifique tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erro de Aplicação</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
-  <string name="btn_next">Próximo</string>
-  <string name="btn_back">Anterior</string>
-  <string name="btn_finish">Terminar</string>
-  <string name="btn_okay">Okay</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>
-  <string name="wizard_permissions_root">Permissão Concedida</string>
-  <string name="wizard_permissions_stock">Permissões do Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelente! Detectamos que você habilitou permissões de root para Orbot. Nós usaremos este poder com sabedoria.</string>
-  <string name="wizard_permissions_msg_stock"> Enquanto não é requerido, o Orbot pode se tornar uma ferramenta mais poderosa se seu dispositivo tivesse acesso root. Use o botão abaixo para conceder superpoderes ao Orbot! </string>
-  <string name="wizard_permissions_no_root">Se você não tem acesso root ou não tem idéia sobre o que estamos falando, só tenha a certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_consent">Eu entendo e gostaria de continuar sem o Superusuário</string>
-  <string name="wizard_permission_enable_root">Conceder acesso Root ao Orbot</string>
-  <string name="wizard_configure">Configurar Torificação</string>
-  <string name="wizard_configure_msg">Orbot dá a você a opção de rotear todo o tráfego de aplicação através do Tor OU para escolher suas aplicações individualmente.</string>
-  <string name="wizard_configure_all">Usar Proxy para Todas Apps Através do Tor</string>
-  <string name="wizard_configure_select_apps">Selecionar Apps Individuais para o Tor</string>
-  <string name="wizard_tips_tricks">Apps habilitadas para Orbot</string>
-  <string name="wizard_tips_msg">Os aplicativos abaixo foram desenvolvidos para o Orbot. Clique em cada botão para instalar individualmente, ou você pode encontrá-los no Google Play, no site GuardianProject.info ou pelo F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - cliente de mensagem instantânea segura para Android</string>
-  <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
-  <string name="wizard_tips_duckgo">Ferramenta de Busca DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Faça uma história e deixe-a para o tor por segurança!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Configurações de Proxy</string>
-  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor. As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível. Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot está pronto!</string>
-  <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões. Jornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
-  <string name="wizard_exit_at_first_screen_toast">Por favor, configure o Orbot antes de começar a usá-lo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto N�O significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador. Visite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help@xxxxxxxxxxxxxxxxxxxx para saber mais.</string>
-  <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
-  <string name="pref_hs_group">Serviços Ocultos</string>
-  <string name="pref_general_group">Geral</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot trouxe Tor para Android!! Tor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais. Este assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Aviso</string>
-  <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel. Você deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissões</string>
-  <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'. De maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS. </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Apps Orbot Habilitadas</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: app de chat seguro com criptografia Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: navegador de privacidade aprimorada que funciona através do Tor</string>
-  <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string>
-  <string name="wizard_tips_fdroid">Encontre todos os aplicativos da Guardian Project no F-Droid </string>
-  <string name="wizard_tips_fdroid_org">Encontre todos os aplicativos da Guardian Project no https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
-  <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
-  <string name="wizard_transproxy_none">Nenhum</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente para Tor Dispositivos de Toque Wifi e Usb (requer reinicialização)</string>
-  <string name="button_grant_superuser">Acesso Superusuário Requerido</string>
-  <string name="pref_select_apps">Selecionar Apps</string>
-  <string name="pref_select_apps_summary">Escolha as Apps para Rotearem Através do Tor</string>
-  <string name="pref_node_configuration">Configuração de Nó</string>
+    <!--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="button_proxy_all">Todo o Proxy</string>
-  <string name="button_proxy_none">Nenhum Proxy</string>
-  <string name="button_invert_selection">Inverter Sele</string>
-  <string name="pref_proxy_title">Proxy de saída da rede (Opcional)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Senha do Proxy de saída</string>
   <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
   <string name="pref_proxy_password_dialog">Digite a senha do Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Configurando proxy com total transparência...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurando apps baseadas em transparência de proxy...</string>
-  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Toque!</string>
-  <string name="warning_error_starting_transparent_proxying_">AVISO: erro ao iniciar o proxy transparente!</string>
-  <string name="transproxy_rules_cleared">Regras TransProxy limpas</string>
-  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo está rodando na porta:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurando proxy transparente baseado em porta...</string>
-  <string name="bridge_error">Erro na Ponte</string>
-  <string name="bridge_requires_ip">Como condição para usar o recurso de ponte, você deve inserir pelo menos um endereço IP de ponte.</string>
-  <string name="send_email_for_bridges">Envie um email para bridges@xxxxxxxxxxxxxx com a linha \"get bridges\" sozinha no corpo do e-mail, a partir de uma conta do gmail</string>
-  <string name="error">Erro</string>
+    <string name="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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
   <string name="bridges">Pontes</string>
   <string name="use_bridges">Usar pontes</string>
-  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilite entradas alternativas para a Rede Tor.</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string>
-  <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Portas Atingíveis</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string>
   <string name="enter_ports">Insira as portas</string>
-  <string name="enable_hidden_services">Habilitar Serviços Ocultos</string>
-  <string name="run_servers_accessible_via_the_tor_network">rodar servidores acessíveis via rede Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">insira as portas local para serviços ocultos</string>
-  <string name="hidden_service_ports">Portas de Serviço Oculto</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">o nome enderessável para seu serviço oculto (gerado automaticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
   <string name="project_home">Home(s) do Projeto: </string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Licença Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de Terceiros</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">serviço oculto em:</string>
-  <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
+    <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
   <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
-  <string name="unable_to_reset_tor">Reinicie seu dispositivo, incapaz de resetar Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar tabelas de IP padrão:</string>
-  <string name="pref_use_sys_iptables_summary">usar as tabelas ip binárias embutidas ao invés das tabelas do pacote Orbot</string>
-  <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
-  <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
+    <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
   <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
   <string name="pref_use_expanded_notifications">Mostrar notificação expandida com Tor país de saída e IP</string>
   <string name="pref_use_expanded_notifications_title">Notificações Expandidas</string>
-  <string name="notification_using_bridges">Pontes habilitadas!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
-  <string name="wizard_locale_title">Escolha o Idioma</string>
-  <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string>
-  <string name="powered_by">distribuído por Tor</string>
-  <string name="btn_save_settings">Salvar Configurações</string>
-  <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</string>
-  <string name="bandwidth_">Largura de banda:</string>
-  <string name="down">down</string>
-  <string name="up">up</string>
-  <string name="pref_disable_network_title">Modo de espera automático</string>
+    <string name="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="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Gerenciar Tor</string>
-  <string name="permission_manage_tor_description">Habilitar este app a controlar o serviço Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona melhor com o navegador Orfox. Gostaria de instalar ? </string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot funciona melhor com o navegador Orfox. Gostaria de instalar ? </string>
   <string name="install_apps_">Instalar navegador ?</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>
@@ -258,19 +128,7 @@
   <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="wizard_tips_martus">Mobile Martus - Aplicativo de documentação Benetech Human Rights</string>
-  <string name="your_tor_public_ips_">Seus IPs Públicos do Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por Favor desabilite esta aplicação em Configurações de Aplicações Android se você está tendo problemas com Orbot: </string>
-  <string name="app_conflict">Conflito de aplicattivo</string>
-  <string name="pref_transproxy_refresh_title">Atualização automática Transproxy </string>
-  <string name="pref_transproxy_refresh_summary">Reaplicar regras Transproxy quando o estado da rede mudar</string>
-  <string name="pref_transproxy_flush_title">Transproxy FORÃ?AR REMOÃ?Ã?O</string>
-  <string name="pref_transproxy_flush_summary">Toque aqui para nivelar todas as regras de rede transproxy AGORA</string>
-  <string name="transparent_proxy_rules_flushed_">Regras niveladas do proxy Transparente</string>
-  <string name="you_do_not_have_root_access_enabled">Você não tem acesso root ativado</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Você pode precisar parar e iniciar Orbot para as configurações de mudar para ser ativado.</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -286,15 +144,12 @@
   <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 &amp; colá-lo na \"Bridges\" preferência na configuração e reiniciar do Orbot.</string>
   <string name="install_orweb">Instalar Orfox</string>
-  <string name="standard_browser">Navegador Padrão</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Apenas pontes Tor padrão funcionam em dispositivos Atom/Intel X86</string>
-  <string name="vpn_default_world">Global (Automático)</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="ports">Portas</string>
-  <string name="local_port">Porta Local</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>
@@ -307,9 +162,7 @@
   <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="permission_granted">Permissão garantida</string>
-  <string name="permission_denied">Permissão negada</string>
-  <string name="restore_backup">Restaurar Backup</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>
@@ -322,10 +175,8 @@
   <string name="share_as_qr">Compartilhar como QR</string>
   <string name="disable">Desabilitar</string>
   <string name="enable">Ativar</string>
-  <string name="please_enable_vpn">Por favor, ative o modo VPN para permitir que aplicações utilizem o Tor</string>
-  <string name="app_shortcuts">Aplicações habilitadas para o Tor</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Testando conexão bridge com o Tor</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>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 25f6741d..00c5e6b1 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -4,118 +4,53 @@
   <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e parar Tor</string>
-  <string name="status_starting_up">Orbot está a iniciar�</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="tor_process_waiting">em espera.</string>
-  <string name="not_anonymous_yet">ATEN��O: O seu tráfego ainda não está anónimo! Por favor, configure as suas aplicações para utilizar HTTP proxy 127.0.0.1:8118 ou SOCKS4A ou SOCKS5 proxy 127.0.0.1:9050 </string>
-  <string name="menu_home">Início</string>
-  <string name="menu_browse">Explorar</string>
-  <string name="menu_settings">Definições</string>
+    <string name="menu_settings">Definições</string>
   <string name="menu_log">Registo</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Parar</string>
   <string name="menu_about">Sobre</string>
-  <string name="menu_promo_apps">Obter aplicações...</string>
-  <string name="main_layout_download">Transferir</string>
+    <string name="main_layout_download">Transferir</string>
   <string name="main_layout_upload">Enviar</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Fechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar Registo</string>
-  <string name="menu_verify">Verificar</string>
-  <string name="menu_exit">Sair</string>
+    <string name="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="press_to_start">Pressione para começar </string>
-  <string name="pref_trans_proxy_summary">Tor automatico em Apps</string>
-  <string name="pref_transparent_all_title">Tor Tudo</string>
-  <string name="pref_transparent_port_title">Lista de Portas</string>
-  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'\'Tudo\'\' ou \'\'App\'\' não funcionar</string>
-  <string name="pref_transparent_port_dialog">Insira portas</string>
-  <string name="pref_has_root">Solicite Acesso Root </string>
-  <string name="status_install_success">Tor binários instalados com sucesso!</string>
-  <string name="status_install_fail">Não foi possível instalar os ficheiros binários Tor. Por favor, verifique o registro e notifique tor-assistants@xxxxxxxxxxxxxx </string>
-  <string name="title_error">Erro de Aplicação</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
-  <string name="btn_next">Seguinte</string>
-  <string name="btn_back">Anterior</string>
-  <string name="btn_finish">Terminar</string>
-  <string name="btn_okay">Ok</string>
+    <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Alguns Detalhes do Orbot</string>
-  <string name="wizard_permissions_root">Permissão Concedida</string>
-  <string name="wizard_permissions_stock">Permissões do Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelente! Detectámos que as permissões de root estão autorizadas para o Orbot. Utilizaremos este privilégio com sensatez.</string>
-  <string name="wizard_permissions_consent">Eu compreendo e gostaria de continuar sem Superuser</string>
-  <string name="wizard_permission_enable_root">Conceder Root para Orbot</string>
-  <string name="wizard_configure">Configurar Torification</string>
-  <string name="wizard_configure_select_apps">Seleccione Apps Individuais para o Tor </string>
-  <string name="wizard_tips_duckgo">Motor de busca DuckDuckGo </string>
-  <string name="wizard_tips_story_maker">StoryMaker - Crie uma história e deixe a segurança à reflexão do TOR</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Definições de Proxy</string>
-  <string name="wizard_final">Orbot está pronto!</string>
-  <string name="wizard_exit_at_first_screen_toast">Por favor, configure o Orbot antes que o possa começar a utilizar!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Está conectado à rede Tor com sucesso - mas isto N�O significa que o seu dispositivo está seguro. Pode utilizar o botão \'Navegador\' para testas a sua conexão. \n\nVisite-nos em https://guardianproject.info/apps/orbot ou envie email para help@xxxxxxxxxxxxxxxxxxxx para saber mais. </string>
-  <string name="tor_check">Irá abrir o seu navegador web como https://check.torproject.org para verificar se o Orbot está configurado corretamente e está conectado ao Tor. </string>
-  <string name="pref_general_group">Geral</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-->
-  <string name="wizard_warning_title">Aviso</string>
-  <string name="wizard_warning_msg">Instalar o Orbot por si só não irá anonimizar automaticamente o seu tráfego móvel.\n\nTerá de configurar correctamente o Orbot, o seu dispositivo e outras Apps para utilizar o Tor com sucesso. </string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissões</string>
-  <!--TipsAndTricks screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="pref_select_apps">Selecionar Aplicações</string>
-  <string name="pref_node_configuration">Configuração do Nodo</string>
-  <string name="button_proxy_all">Proxy Tudo</string>
-  <string name="button_proxy_none">Proxy Nenhum</string>
-  <string name="button_invert_selection">Inverter Seleção</string>
-  <string name="status">Estado</string>
-  <string name="error">Erro</string>
+    <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="the_tor_license">A Licença Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de terceiros:  </string>
+    <string name="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="default_bridges"></string>
-  <string name="set_locale_title">idioma</string>
-  <string name="wizard_locale_title">Escolher idioma</string>
-  <string name="wizard_locale_msg">Deixe o predefinido ou mude o idioma atual</string>
-  <string name="powered_by">desenvolvido por Tor</string>
-  <string name="btn_save_settings">Guardar Definições</string>
-  <string name="bandwidth_">Largura de banda:</string>
-  <string name="menu_verify_browser">Navegador</string>
-  <string name="permission_manage_tor_label">Gerir Tor</string>
-  <string name="permission_manage_tor_description">Ative esta aplicação para controlar o serviço Tor</string>
-  <string name="pref_socks_title">SOCKS do Tor</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="app_conflict">Conflito de Aplicação</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -125,8 +60,7 @@
   <string name="activate">Ativar</string>
   <string name="send_email">Enviar Mensagem</string>
   <string name="install_orweb">Instalar Orfox</string>
-  <string name="standard_browser">Navegador Padrão</string>
-  <string name="save">Guardar</string>
+    <string name="save">Guardar</string>
   <string name="name">Nome</string>
   <string name="done">Concluído!</string>
   <string name="disable">Desativar</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index fd97061c..78dd464c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,104 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e parar Tor</string>
-  <string name="tor_proxy_service_process">serviço proxy Tor</string>
-  <string name="status_starting_up">O Orbot está a iniciar...</string>
+    <string name="status_starting_up">O Orbot está a iniciar...</string>
   <string name="status_activated">Conetado à rede Tor</string>
   <string name="status_disabled">O Orbot está desativado</string>
   <string name="tor_process_starting">A iniciar o cliente Tor...</string>
   <string name="tor_process_complete">completo.</string>
-  <string name="tor_process_waiting">a aguardar.</string>
-  <string name="not_anonymous_yet">AVISO: O seu tráfego não está anónimo! Por favor, configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Início</string>
-  <string name="menu_browse">Explorar</string>
-  <string name="menu_settings">Configurações</string>
+    <string name="menu_settings">Configurações</string>
   <string name="menu_log">Registo</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Parar</string>
   <string name="menu_about">Sobre</string>
   <string name="main_layout_download">Transferir</string>
   <string name="main_layout_upload">Enviar</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Fechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar Registo</string>
-  <string name="menu_verify">Verificar</string>
-  <string name="menu_exit">Sair</string>
+    <string name="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="press_to_start">- pressionar longo para iniciar - </string>
-  <string name="pref_trans_proxy_group">Proxy Transparente (requer \'Root\')</string>
-  <string name="pref_trans_proxy_title">Proxy Transparente</string>
-  <string name="pref_transparent_all_title">Tor em Tudo</string>
-  <string name="pref_transparent_all_summary">Passar todo o tráfego das apps via Tor</string>
-  <string name="pref_transparent_port_fallback_summary">AVISO: Rodear as portas comuns (80, 443, etc...). *USAR APENAS* se o modo  \'Todas\' ou \'App\' não funcionar.</string>
-  <string name="pref_transparent_port_title">Lista de Portas</string>
-  <string name="pref_transparent_port_summary">Lista de portas para o proxy. *USAR APENAS* se o modo \'Todas\' ou \'App\' não funcionar.</string>
-  <string name="pref_transparent_port_dialog">Insira as portas para o proxy</string>
-  <string name="pref_has_root">Solicitar Acesso \'Root\'</string>
-  <string name="pref_has_root_summary">Solicitar acesso \'root\' para o proxy transparente</string>
-  <string name="status_install_success">Binários do Tor instalados com sucesso!</string>
-  <string name="status_install_fail">Não foi possível instalar os ficheiros binário do Tor. Por favor, verifique o registo de eventos e notifique tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erro de Aplicação</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Sobre o Orbot</string>
-  <string name="btn_next">Seguinte</string>
-  <string name="btn_back">Voltar</string>
-  <string name="btn_finish">Terminar</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_okay">OK</string>
   <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Alguns Detalhes do Orbot</string>
-  <string name="wizard_permissions_root">Autorização Concedida</string>
-  <string name="wizard_permissions_stock">Autorizações do Orbot</string>
-  <string name="wizard_permissions_consent">Eu compreendo e gostaria de continuar sem a Superuser</string>
-  <string name="wizard_permission_enable_root">Conceder \'Root\' para o Orbot</string>
-  <string name="wizard_configure">Configurar Acesso do Tor</string>
-  <string name="wizard_configure_all">Passar Todas as Aplicações Via Tor</string>
-  <string name="wizard_configure_select_apps">Selecione Individualmente as Apps para o Tor</string>
-  <string name="wizard_tips_tricks">Orbot - Apps ativadas</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensagens instantâneas seguras para Android</string>
-  <string name="wizard_tips_proxy">Configurações do Proxy - Aprenda a configurar as apps para funcionarem com o Orbot</string>
-  <string name="wizard_tips_duckgo">App de Mecanismo de Procura DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Defina o proxy do Twitter para hospedeiro \"localhost\" e porta 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Definições Proxy</string>
-  <string name="wizard_final">O Orbot está pronto!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_hs_group">Serviço de Hospedagem Ocultado</string>
-  <string name="pref_general_group">Geral</string>
+    <!--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-->
-  <string name="wizard_warning_title">Aviso</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Autorizações</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente, pode conceder acesso de  Administrador\' ao Orbot para ativar as funções avançadas, tais como, Proxy Transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se não quer isto, por favor, certifique-se que usa as apps criadas para funcionarem com a Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot - Apps Ativadas</string>
-  <string name="wizard_tips_play">Encontre todas as apps do Projeto Guardian na Play Store da Google</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_hint">(Selecione esta caixa se não souber do que estamos a falar)</string>
-  <string name="wizard_transproxy_none">Nenhum</string>
-  <string name="pref_transparent_tethering_title">\"Tethering\" Tor</string>
-  <string name="pref_transparent_tethering_summary">Ativar o Proxy Transparente Tor para a rede Sem Fios e Dispositivos USB \"Tethered\" (necessário reiniciar)</string>
-  <string name="button_grant_superuser">Solicitar Acesso de Administrador</string>
-  <string name="pref_select_apps">Selecionar Apps</string>
-  <string name="pref_select_apps_summary">Escolher Apps para Encaminhar Via Tor</string>
-  <string name="button_proxy_all">Tudo com o Proxy</string>
-  <string name="button_proxy_none">Nenhum Proxy</string>
-  <string name="button_invert_selection">Inverter Seleção</string>
-  <string name="pref_proxy_title">Proxy de Rede de Saída (Opcional)</string>
+    <!--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>
@@ -114,8 +47,7 @@
   <string name="pref_proxy_password_title">Senha do Proxy de Saída</string>
   <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
   <string name="pref_proxy_password_dialog">Inserir Senha do Proxy</string>
-  <string name="status">Estado</string>
-  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+    <string name="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>
@@ -124,48 +56,26 @@
   <string name="reachable_ports">Portas alcançáveis</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Portas alcançáveis por detrás de uma Firewal restritiva</string>
   <string name="enter_ports">Insira as portas</string>
-  <string name="enable_hidden_services">Hospedeiro de Serviço Ocultado</string>
-  <string name="hidden_service_ports">Portas de Serviço Ocultadas</string>
-  <string name="project_home">Projeto Home(s): </string>
+    <string name="project_home">Projeto Home(s): </string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Licença do Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Programas de Terceiros: </string>
+    <string name="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="hidden_service_on">serviço ocultado em:</string>
-  <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
+    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
   <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
-  <string name="unable_to_reset_tor">Reinicie o seu dispositivo, não é possível reiniciar Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar Tabelas de IP Predefinidas</string>
-  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
+    <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
   <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
-  <string name="notification_using_bridges">Pontes ativadas!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Escolha o local e o idioma para o Orbot</string>
-  <string name="wizard_locale_title">Escolher Idioma</string>
-  <string name="wizard_locale_msg">Deixe a predefinição ou mude o idioma atual</string>
-  <string name="btn_save_settings">Guardar Definições</string>
-  <string name="bandwidth_">Largura de banda:</string>
-  <string name="down">para baixo</string>
-  <string name="up">para cima</string>
-  <string name="newnym">Mudou para uma nova identidade do Tor!</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Gerir Tor</string>
-  <string name="permission_manage_tor_description">Ative esta app para controlar o serviço Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nenhuma conetividade de rede. A hibernar Torâ?¦</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="your_tor_public_ips_">Os seus IPs Públicos Tor:</string>
-  <string name="app_conflict">Conflito de App</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -175,8 +85,7 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Ativar</string>
   <string name="send_email">Enviar Mensagem</string>
-  <string name="standard_browser">Navegador Padrão</string>
-  <string name="hidden_services">Serviços ocultos</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>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index f0ae485d..dc8ae0d6 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1,30 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">Pagina de start</string>
-  <string name="menu_browse">RÄ?sfoieÅ?te</string>
-  <string name="menu_settings">SetÄ?ri</string>
-  <string name="menu_info">AsistenÅ£Ä?</string>
-  <string name="menu_about">Despre</string>
-  <string name="button_help">AsistenÅ£Ä?</string>
-  <string name="button_close">Ã?nchide</string>
-  <string name="button_about">Despre</string>
+    <string name="menu_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_back">Ã?napoi</string>
-  <string name="btn_cancel">Revocare</string>
+    <string name="btn_cancel">Revocare</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">SetÄ?ri proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">General</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Avertizare</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Nimic</string>
-  <string name="status">Stare</string>
-  <string name="error">Eroare</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">SalveazÄ? setÄ?rile</string>
+    <string name="error">Eroare</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 81354f92..caf7c35f 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2,134 +2,45 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">porneÈ?te È?i opreÈ?te Tor</string>
-  <string name="tor_proxy_service_process">serviciul proxy tor</string>
-  <string name="status_starting_up">Orbot porneÅ?te...</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="tor_process_waiting">aÅ?teptare.</string>
-  <string name="not_anonymous_yet">ATENTIE: Traficul inca nu este anonim! Configureaza aplicatile sa foloseasca proxy-ul HTTP 127.0.0.1:8118 sau SOCKS4A sau proxy-ul SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Pagina de start</string>
-  <string name="menu_browse">RÄ?sfoieÅ?te</string>
-  <string name="menu_settings">SetÄ?ri</string>
+    <string name="menu_settings">SetÄ?ri</string>
   <string name="menu_log">log</string>
-  <string name="menu_info">AsistenÅ£Ä?</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">Despre</string>
-  <string name="menu_promo_apps">CautÄ? aplicaÅ£ii</string>
-  <string name="main_layout_download">DescarcÄ?</string>
+    <string name="main_layout_download">DescarcÄ?</string>
   <string name="main_layout_upload">IncarcÄ?</string>
-  <string name="button_help">AsistenÅ£Ä?</string>
-  <string name="button_close">Ã?nchide</string>
-  <string name="button_about">Despre</string>
-  <string name="button_clear_log">GoleÅ?te log-ul</string>
-  <string name="menu_verify">VerificÄ?</string>
-  <string name="menu_exit">IeÅ?ire</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="press_to_start">- apasÄ? lung pentru activare -</string>
-  <string name="pref_trans_proxy_group">Proxy transparent (necesitÄ? root)</string>
-  <string name="pref_trans_proxy_title">Proxy transparent</string>
-  <string name="pref_trans_proxy_summary">Aplicare automatÄ? a Tor la aplicaÅ£ii</string>
-  <string name="pref_transparent_all_title">Tor tot</string>
-  <string name="pref_transparent_all_summary">Toate aplicaţiile folosesc Tor pentru trafic</string>
-  <string name="pref_transparent_port_fallback_title">Port proxy de rezervÄ?</string>
-  <string name="pref_transparent_port_fallback_summary">ATENTIE: Ocoleste porturile comune (80, 443, etc.). *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
-  <string name="pref_transparent_port_title">ListÄ? porturi</string>
-  <string name="pref_transparent_port_summary">Lista porturi pentru proxy. *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
-  <string name="pref_transparent_port_dialog">Introdu porturile pentru proxy</string>
-  <string name="pref_has_root">NecesitÄ? acces root</string>
-  <string name="pref_has_root_summary">NecesitÄ? acces root pentru proxy transparent</string>
-  <string name="status_install_success">FiÅ?ierele binare Tor instalate cu succes!</string>
-  <string name="status_install_fail">Fisierele binare Tor nu au putut fi instalate. Verificati log-ul si raportati bug-ul la tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Eroare de aplicaţie</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Despre Orbot</string>
-  <string name="btn_next">UrmÄ?torul</string>
-  <string name="btn_back">Ã?napoi</string>
-  <string name="btn_finish">TerminÄ?</string>
-  <string name="btn_okay">Ok</string>
+    <string name="btn_okay">Ok</string>
   <string name="btn_cancel">Revocare</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Detalii Orbot</string>
-  <string name="wizard_permissions_root">Permisiune acordatÄ?</string>
-  <string name="wizard_permissions_stock">Permisiuni Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelent! Am detectat ca ai permis acces root pentru Orbot. Vom folosi aceasta putere cu raspundere.</string>
-  <string name="wizard_permissions_msg_stock">Desi nu este necesar, Orbot poate fi mai puternic daca dispozitivul dumneavoastra are acces root. Foloseste butonul de mai jos pentru ai oferi superputeri lui Orbot!</string>
-  <string name="wizard_permissions_no_root">DacÄ? nu ai acces root, sau nu ai habar despre ce vorbim, asigurÄ?-te cÄ? foloseÅ?ti aplicatii fÄ?cute sÄ? functioneze cu Orbot.</string>
-  <string name="wizard_permissions_consent">InÅ£eleg Å?i aÅ? vrea sÄ? continui fÄ?rÄ? Superuser</string>
-  <string name="wizard_permission_enable_root">AprobÄ? root pentru Orbot</string>
-  <string name="wizard_configure">ConfigureazÄ? Tor</string>
-  <string name="wizard_configure_msg">Orbot oferÄ? posibilitatea sÄ? trimitÄ? tot traficul prin Tor SAU sÄ? alegi aplicaÅ£ii individuale.</string>
-  <string name="wizard_configure_all">Toate aplicaţiile folosesc Tor</string>
-  <string name="wizard_configure_select_apps">Alege aplicaţii individuale pentru Tor</string>
-  <string name="wizard_tips_tricks">Aplicaţii compatibile Orbot</string>
-  <string name="wizard_tips_msg">Aplicatiile de mai jos au fost create sa fie compatibile cu Orbot. Apasa pe fiecare buton pentru a instala acum, sau le poti gasi mai tarziu pe Google Play, pe site-ul GuardianProject.info sau pe F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Mesagerie instantanee securizatÄ? pentru Android</string>
-  <string name="wizard_tips_proxy">SÄ?tari pentru proxy - Ã?nvaÅ£Ä? cum sÄ? configurezi aplicaÅ£ii,sÄ? fie compatibile cu Orbot</string>
-  <string name="wizard_tips_duckgo">Motor de cÄ?utare DuckDuckGo</string>
-  <string name="wizard_tips_twitter">SeteazÄ? proxy-ul Twitter \"localhost\" cu portul 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - PovesteÅ?te-ne întâmplÄ?rile!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">SetÄ?ri proxy</string>
-  <string name="wizard_proxy_help_msg">DacÄ? aplicaÅ£ia Android pe care o foloseÅ?ti are opÅ£iunea de proxy HTTP sau SOCKS, atunci o poÅ£i configura sÄ? se conecteze la Orbot Å?i sÄ? foloseascÄ? Tor.\n\n\n SetÄ?rile host-ului sunt 127.0.0.1 sau \"localhost\". Pentru HTTP portul este 8118. Pentru SOCKS proxy-ul este 9050. Daca este posibil, foloseÅ?te SOCKS4A sau SOCKS5.\n\ \n\n\n PoÅ£i afla mai multe despre proxy pe Android citind FAQ-ul de aici: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot este pregÄ?tit!</string>
-  <string name="wizard_final_msg">Milioane de oameni din întreaga lume folosesc Tor pentru o variatate largÄ? de motive.n\nJurnaliÅ?ti Å?i bloggeri,apÄ?rÄ?tori ai drepturilor omului,ofiÅ£eri de poliÅ£ie,soldaÅ£i,corporaÅ£ii,cetÄ?Å£eni ai regimelor represive Å?i cetÄ?Å£eni obiÅ?nuiÅ£i... iar acum eÅ?ti pregÄ?tit sÄ? faci Å?i tu asta!</string>
-  <string name="wizard_exit_at_first_screen_toast">ConfiguraÈ?i Orbot înainte de a începe sÄ?-l utilizaÈ?i!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Te-ai conectat cu succes la reÅ£eaua Tor - dar asta NU înseamnÄ? cÄ? dispozitivul tÄ?u este securizat. PoÅ£i folosi optiunea \"VerificÄ?\" din meniu pentru a testa navigatorul. \n\nViziteazÄ?-ne la https://guardianproject.info/apps/orbot sau trimite un e-mail la help@xxxxxxxxxxxxxxxxxxxx pentru a afla mai multe.</string>
-  <string name="tor_check">Vom deschide pagina https://check.torproject.org pentru a verifica daca Orbot este configurat corespunzator si daca este conectat la Tor.</string>
-  <string name="pref_hs_group">Serviciu de gÄ?zduire ascuns</string>
-  <string name="pref_general_group">General</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-->
-  <string name="wizard_title_msg">Orbot aduce Tor pe Android! \n\nTor te ajutÄ? sÄ? te protejezi împotriva filtrÄ?rii de conÅ£inut, analizÄ? a traficului si monitorizare a reÅ£elei, lucruri care violeazÄ? intimitatea, informaÅ£ia confidenÅ£ialÄ? si relaÅ£iile personale.\n\n Asistentul te va ajuta sÄ? configurezi Orbot Å?i Tor pe dispozitivul tÄ?u.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Atenţie</string>
-  <string name="wizard_warning_msg">Doar instalarea Orbot nu va anonimiza automat traficul pe mobil.\n\nTrebuie configurate corespunzator Orbot, dispozitivul tÄ?u si alte aplicaÅ£ii pentru a folosi cu succes Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisiuni</string>
-  <string name="wizard_permissions_root_msg1">Optional, ii poti oferi lui Orbot acces \"Superuser\" pentru a activa optiuni avansate, cum ar fi proxy transparent.</string>
-  <string name="wizard_permissions_root_msg2">Daca nu vrei sa faci asta, asigura-te ca folosesti aplicatii compatibile cu Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Se pare ca dispozitivul tÄ?u nu are root sau nu ai acordat acces \"Superuser\" lui Orbot.\n\nTe rog foloseÅ?te modul de â??AplicaÅ£iiâ?? din meniul principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicaţii cu Orbot activat</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: AplicaÈ?ie sigurÄ? de chat cu codare Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: Navigatorul dezvoltat pentru intimitate care ruleazÄ? prin Tor</string>
-  <string name="wizard_tips_play">Gaseste toate aplicatile Guardian Project pe Google Play</string>
-  <string name="wizard_tips_fdroid">GÄ?seÅ?te toate aplicaÅ£iile Guardian Project pe F-Droid</string>
-  <string name="wizard_tips_fdroid_org">GÄ?seÅ?te toate aplicaÅ£iile Guardian Project pe https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy transparent</string>
-  <string name="wizard_transproxy_msg">Asta va permite aplicatilor tale sa foloseasca Tor automat fara nici o configurare.</string>
-  <string name="wizard_transproxy_hint">(Bifeaza asta daca nu ai idee despre ce vorbim)</string>
-  <string name="wizard_transproxy_none">Nimic</string>
-  <string name="pref_transparent_tethering_title">Partajarea conexiunii Tor</string>
-  <string name="pref_transparent_tethering_summary">Activeaza proxy transparent pentru conexiuni partajate prin WiFi si USB (necesita restart)</string>
-  <string name="button_grant_superuser">Cere acces Superuser</string>
-  <string name="pref_select_apps">Selecteaza aplicatii</string>
-  <string name="pref_select_apps_summary">Alege aplicatii care sa foloseasca Tor</string>
-  <string name="pref_node_configuration">Configurare nod</string>
+    <!--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="button_proxy_all">Tot Proxy </string>
-  <string name="button_proxy_none">Niciun Proxy</string>
-  <string name="button_invert_selection">InverseazÄ? selecÅ£ia</string>
-  <string name="pref_proxy_title">Proxy de retea pentru iesire (optional)</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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">Parola pentru proxy-ul de iesire</string>
   <string name="pref_proxy_password_summary">Parola pentru proxy (optional)</string>
   <string name="pref_proxy_password_dialog">Introdu parola pentru proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Configurez proxy transparent complet...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurez un proxy transparent bazat pe aplicatie...</string>
-  <string name="transparent_proxying_enabled">Proxy transparent ACTIVAT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy activat pentru partajare!</string>
-  <string name="warning_error_starting_transparent_proxying_">ATENÅ¢IE: eroare la pornirea proxy-ului transparent!</string>
-  <string name="transproxy_rules_cleared">Reguli TransProxy golite</string>
-  <string name="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo ruleazÄ? în portul:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurez proxy transparent bazat pe port...</string>
-  <string name="bridge_error">Eroare de punte</string>
-  <string name="bridge_requires_ip">Pentru a putea folosi optiunea de punte, trebuie introdusÄ? cel puÅ£in o adresÄ? IP pentru punte.</string>
-  <string name="send_email_for_bridges">Trimite un e-mail la bridges@xxxxxxxxxxxxxx cu linia \"get bridges\" in continutul mail-ului de pe un cont de GMail.</string>
-  <string name="error">Eroare</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>
@@ -171,9 +70,7 @@
   <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="bridges_obfuscated">Punţi mascate</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">ActiveazÄ? dacÄ? punÅ£ile configurate sunt punÅ£i mascate</string>
-  <string name="ip_address_and_port_of_bridges">Adresa IP Å?i port pentru 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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Porturi accesibile</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Porturi accesibile in spatele unui firewall restrictiv</string>
   <string name="enter_ports">Introdu porturi</string>
-  <string name="enable_hidden_services">Serviciu de gÄ?zduire ascuns</string>
-  <string name="run_servers_accessible_via_the_tor_network">permite serverului de pe dispozitiv sÄ? fie accesibil în reÅ£eaua Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">introdu porturile localhost-ului pentru servicile ascunse</string>
-  <string name="hidden_service_ports">Porturi de serviciu ascunse</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">numele serviciului tÄ?u ascuns (generat automat)</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="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="the_tor_license">Licenţa Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Aplicatii tertiare:</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="hidden_service_on">serviciu ascuns pe:</string>
-  <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
+    <string name="unable_to_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="unable_to_reset_tor">RestarteazÄ?-Å£i dispozitivul,Tor nu mai rÄ?spunde!</string>
-  <string name="pref_use_sys_iptables_title">FoloseÅ?te Iptables implicite</string>
-  <string name="pref_use_sys_iptables_summary">foloseste fisierele binare iptables incorporate in locul celor din Orbot</string>
-  <string name="error_installing_binares">Fisierele binare Tor nu au putut fi instalate sau actualizate.</string>
-  <string name="pref_use_persistent_notifications">AratÄ? tot timpul icoana în barÄ? când Orbot este conectat</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="notification_using_bridges">Punţi activate!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">LimbÄ?</string>
-  <string name="set_locale_summary">Alege localele Å?i limba pentru Orbot</string>
-  <string name="wizard_locale_title">Alege limba</string>
-  <string name="wizard_locale_msg">Lasa implicit sau schimbÄ? limba curentÄ?</string>
-  <string name="powered_by">cu sprijinul Tor</string>
-  <string name="btn_save_settings">SalveazÄ? setarile</string>
-  <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în aÈ?teptare...</string>
-  <string name="bandwidth_">LÄ?È?ime de bandÄ?:</string>
-  <string name="down">jos</string>
-  <string name="up">sus</string>
-  <string name="pref_disable_network_title">FÄ?rÄ? adormirea automatÄ? a reÈ?elei</string>
+    <string name="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="menu_verify_browser">Navigator</string>
-  <string name="menu_use_chatsecure">UtilizaÈ?i ChatSecure</string>
-  <string name="permission_manage_tor_label">Administrare Tor</string>
-  <string name="permission_manage_tor_description">ActivaÈ?i aceastÄ? aplicaÈ?ie pentru a controla serviciile Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nu este conexiune la reÈ?ea. Se pune Tor în adormire...</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>
@@ -250,19 +121,7 @@
   <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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">IPurile tale Tor publice:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Te rugÄ?m sÄ? dezactivezi aceastÄ? aplicaÅ£ie din Android-&gt;Settings-&gt;Apps dacÄ? întâmpini probleme cu Orbot:</string>
-  <string name="app_conflict">Confilct Aplicaţie</string>
-  <string name="pref_transproxy_refresh_title">ReîmprospÄ?tare Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Re-aplicÄ? regulile Transproxy când reÅ£eaua se schimbÄ? </string>
-  <string name="pref_transproxy_flush_title">Å?tergere forÅ£atÄ? Transproxy</string>
-  <string name="pref_transproxy_flush_summary">ApasÄ? aici pentru a îndepÄ?rta ACUM toate regulile de reÅ£ea Transproxy</string>
-  <string name="transparent_proxy_rules_flushed_">Regulile Transparent Proxy au fost îndepÄ?rtate!</string>
-  <string name="you_do_not_have_root_access_enabled">Nu aveÈ?i activat accesul ca ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Trebuie sÄ? reporneÅ?ti aplicaÅ£ia Orbot pentru a schimba setÄ?rile cu succes.</string>
-  <string name="menu_vpn">AplicaÈ?ii</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,9 +135,7 @@
   <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="install_orweb">InstaleazÄ? Orfox</string>
-  <string name="standard_browser">Navigator standard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTÄ?: Doar punÅ£ile Tor standard merg pe dispozitivele Intel X86/ATOM</string>
-  <string name="hidden_services">Servicii ascunse</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>
diff --git a/app/src/main/res/values-rs-rAR/strings.xml b/app/src/main/res/values-rs-rAR/strings.xml
index 132b67e8..8955187a 100644
--- a/app/src/main/res/values-rs-rAR/strings.xml
+++ b/app/src/main/res/values-rs-rAR/strings.xml
@@ -1,45 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">reiniciar Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciándose�</string>
+    <string name="status_starting_up">Orbot está iniciándose�</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">\"Orbot está Desactivado</string>
   <string name="status_shutting_down">Orbot se está apagando</string>
   <string name="tor_process_complete">Completar</string>
-  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Inicio</string>
-  <string name="menu_browse">Navegar</string>
-  <string name="menu_settings">Configuración</string>
+    <string name="menu_settings">Configuración</string>
   <string name="menu_log">Registro</string>
-  <string name="menu_info">Ayuda</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Iniciar</string>
+    <string name="menu_start">Iniciar</string>
   <string name="menu_stop">Detener</string>
   <string name="menu_about">Acerca de</string>
-  <string name="menu_wizard">Asistente</string>
-  <string name="button_help">Ayuda</string>
-  <string name="button_close">Cerrar</string>
-  <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Borrar Registros</string>
-  <string name="menu_verify">Chequear</string>
-  <string name="menu_exit">Salir</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
-  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
-  <string name="pref_transparent_all_title">Torear Todo</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Finalizar</string>
-  <string name="btn_cancel">Cancelar</string>
+    <string name="button_about">Acerca de</string>
+    <string name="menu_exit">Salir</string>
+    <string name="btn_cancel">Cancelar</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_final">Orbot está listo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">General</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -53,6 +29,4 @@
   <!--Transparent Proxy screen-->
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
-  <string name="powered_by">potenciado por The Tor Project</string>
 </resources>
diff --git a/app/src/main/res/values-ru/poestrings.xml b/app/src/main/res/values-ru/poestrings.xml
index ae6b55eb..eef54f0d 100644
--- a/app/src/main/res/values-ru/poestrings.xml
+++ b/app/src/main/res/values-ru/poestrings.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Ð?оÑ?Ñ?Ñ? â?? Ñ?Ñ?о Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Tor, коÑ?оÑ?Ñ?е помогаÑ?Ñ? обойÑ?и Ñ?ензÑ?Ñ?Ñ?. Ð?Ñ? можеÑ?е попÑ?обоваÑ?Ñ? иÑ?полÑ?зоваÑ?Ñ? моÑ?Ñ?Ñ?, еÑ?ли Tor блокиÑ?Ñ?еÑ?Ñ?Ñ? ваÑ?им пÑ?овайдеÑ?ом. Ð?аждÑ?й Ñ?ип моÑ?Ñ?а иÑ?полÑ?зÑ?еÑ? оÑ?лиÑ?нÑ?й оÑ? дÑ?Ñ?гого меÑ?од, Ñ?Ñ?обÑ? избежаÑ?Ñ? блокиÑ?овки: еÑ?ли один Ñ?ип не Ñ?абоÑ?аеÑ?, попÑ?обÑ?йÑ?е иÑ?полÑ?зоваÑ?Ñ? дÑ?Ñ?гой.</string>
-
-    <string name="bridges_no">Ð?ез моÑ?Ñ?ов: пÑ?Ñ?мое подклÑ?Ñ?ение к Tor</string>
-    <string name="bridges_provided">Ð?Ñ?едоÑ?Ñ?авленнÑ?е моÑ?Ñ?Ñ?:</string>
-    <string name="bridges_custom">Ð?олÑ?зоваÑ?елÑ?Ñ?кие моÑ?Ñ?Ñ?</string>
-
-    <string name="bridges_config">Ð?аÑ?Ñ?Ñ?ойка моÑ?Ñ?а</string>
-    <string name="action_done">Ð?оÑ?ово</string>
 
     <string name="bridges_sometimes">Ð?ногда вам бÑ?деÑ? нÑ?жен моÑ?Ñ?, Ñ?Ñ?обÑ? добÑ?аÑ?Ñ?Ñ?Ñ? до Tor.</string>
     <string name="action_more">РÐ?ССÐ?Ð?Ð?Ð?ТÐ? Ð?Ð?Ð?РÐ?Ð?Ð?Ð?Ð?</string>
@@ -16,19 +8,6 @@
     <string name="vpn_setup_sub">ЭÑ?о не Ñ?делаеÑ? ваÑ? анонимнÑ?м, но Ñ?Ñ?о поможеÑ? пÑ?ойÑ?и Ñ?еÑ?ез бÑ?андмаÑ?Ñ?Ñ?Ñ?.</string>
     <string name="action_vpn_choose">Ð?ЫÐ?РÐ?ТЬ Ð?РÐ?Ð?Ð?Ð?Ð?Ð?Ð?Я</string>
 
-    <string name="status_connected">Ð?одклÑ?Ñ?ено!</string>
-
-    <string name="loading_claim_1">Ð?аÑ?е многообÑ?азное Ñ?ообÑ?еÑ?Ñ?во делаеÑ? Tor пÑ?евоÑ?Ñ?однÑ?м!</string>
-    <string name="loading_claim_2">Ð?аждÑ?й денÑ? лÑ?ди иÑ?полÑ?зÑ?Ñ?Ñ? Tor, Ñ?Ñ?обÑ? избежаÑ?Ñ? Ñ?екламÑ?.</string>
-    <string name="loading_claim_3">Ð?огда Facebook заблокиÑ?ован, лÑ?ди иÑ?полÑ?зÑ?Ñ?Ñ? Tor длÑ? Ñ?вÑ?зи Ñ?о Ñ?воими дÑ?Ñ?зÑ?Ñ?ми и Ñ?емÑ?Ñ?й.</string>
-    <string name="loading_claim_4">Ð?кÑ?ивиÑ?Ñ?Ñ? иÑ?полÑ?зÑ?Ñ?Ñ? Tor, Ñ?Ñ?обÑ? Ñ?вободно вÑ?Ñ?казÑ?ваÑ?Ñ? Ñ?вои мнениÑ? и Ñ?беждениÑ?.</string>
-    <string name="loading_claim_5">Ð?логгеÑ?Ñ? иÑ?полÑ?зÑ?Ñ?Ñ? Tor длÑ? Ñ?плоÑ?ениÑ? лÑ?дей, желаÑ?Ñ?иÑ? пÑ?оведениÑ? Ñ?оÑ?иалÑ?ной Ñ?еÑ?оÑ?мÑ?.</string>
-    <string name="loading_claim_6">Ð?Ñ?Ñ?налиÑ?Ñ?Ñ? иÑ?полÑ?зÑ?Ñ?Ñ? Tor длÑ? безопаÑ?ного изÑ?Ñ?ениÑ? иÑ?Ñ?оÑ?ий, о коÑ?оÑ?Ñ?Ñ? они Ñ?аÑ?Ñ?казÑ?ваÑ?Ñ?.</string>
-    <string name="loading_claim_7">Ð?изнеÑ?менÑ? иÑ?полÑ?зÑ?Ñ?Ñ? Tor, Ñ?Ñ?обÑ? Ñ?оÑ?Ñ?аниÑ?Ñ? в Ñ?айне Ñ?Ñ?Ñ?аÑ?егии Ñ?воей компании.</string>
-    <string name="loading_claim_8">РабоÑ?ие иÑ?полÑ?зÑ?Ñ?Ñ? Tor длÑ? боÑ?Ñ?бÑ? за Ñ?вои пÑ?ава, не боÑ?Ñ?Ñ? поÑ?еÑ?Ñ?Ñ?Ñ? Ñ?абоÑ?Ñ?.</string>
-
-    <string name="status_connecting">Ð?Ñ? подклÑ?Ñ?аем ваÑ?.\" = \"Ð?Ñ? подклÑ?Ñ?аем ваÑ?.</string>
-
     <string name="hello">Ð?Ñ?ивеÑ?</string>
     <string name="welcome">Ð?обÑ?о пожаловаÑ?Ñ? в Tor длÑ? мобилÑ?нÑ?Ñ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?в.</string>
 
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 96b3d622..682e4673 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot â?? Ñ?Ñ?о Ñ?вободнаÑ? пÑ?огÑ?амма длÑ? пÑ?окÑ?и-Ñ?оединений, она позволÑ?еÑ? дÑ?Ñ?гим пÑ?иложениÑ?м более безопаÑ?но иÑ?полÑ?зоваÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?оединение. Orbot иÑ?полÑ?зÑ?еÑ? Tor длÑ? Ñ?иÑ?Ñ?ованиÑ? инÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?ика, коÑ?оÑ?Ñ?й заÑ?ем Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? в Ñ?оде пеÑ?еÑ?Ñ?лки Ñ?еÑ?ез неÑ?колÑ?ко компÑ?Ñ?Ñ?еÑ?ов в Ñ?азнÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? планеÑ?Ñ?. Tor Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?вободнÑ?м пÑ?огÑ?аммнÑ?м пÑ?иложением, а Ñ?акже оÑ?кÑ?Ñ?Ñ?ой Ñ?еÑ?Ñ?Ñ?, помогаÑ?Ñ?ей заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?лежки в Ñ?еÑ?Ñ?Ñ?, Ñ?гÑ?ожаÑ?Ñ?ей лиÑ?ной Ñ?вободе и Ñ?аÑ?Ñ?ной жизни, конÑ?иденÑ?иалÑ?ноÑ?Ñ?и бизнеÑ?-деÑ?Ñ?елÑ?ноÑ?Ñ?и и конÑ?акÑ?ов, а Ñ?акже гоÑ?Ñ?даÑ?Ñ?Ñ?венной пÑ?огÑ?амм
 Ñ? безопаÑ?ноÑ?Ñ?и, извеÑ?Ñ?ной как анализ Ñ?Ñ?аÑ?ика.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">запÑ?Ñ?к и оÑ?Ñ?ановка Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot запÑ?Ñ?каеÑ?Ñ?Ñ?...</string>
+    <string name="status_starting_up">Orbot запÑ?Ñ?каеÑ?Ñ?Ñ?...</string>
   <string name="status_activated">Ð?одклÑ?Ñ?Ñ?н к Ñ?еÑ?и Tor</string>
   <string name="status_disabled">Orbot оÑ?клÑ?Ñ?Ñ?н</string>
   <string name="status_shutting_down">СлÑ?жба Tor вÑ?клÑ?Ñ?аеÑ?Ñ?Ñ?</string>
   <string name="tor_process_starting">Ð?апÑ?Ñ?каеÑ?Ñ?Ñ? клиенÑ? Tor...</string>
   <string name="tor_process_complete">завеÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">ожидание.</string>
-  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: ваÑ? Ñ?Ñ?аÑ?ик еÑ?Ñ? не анонимен! Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Ñ?вои пÑ?иложениÑ? на иÑ?полÑ?зование HTTP-пÑ?окÑ?и 127.0.0.1:8118 или SOCKS4A- или SOCKS5-пÑ?окÑ?и 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?лавнаÑ?</string>
-  <string name="menu_browse">Ð?Ñ?оÑ?моÑ?Ñ?</string>
-  <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
+    <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
   <string name="menu_log">Ð?Ñ?Ñ?нал</string>
-  <string name="menu_info">Ð?омоÑ?Ñ?</string>
-  <string name="menu_apps">Ð?Ñ?иложениÑ?â?¦</string>
-  <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?Ñ?</string>
+    <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?Ñ?</string>
   <string name="menu_stop">Ð?Ñ?Ñ?ановиÑ?Ñ?</string>
   <string name="menu_about">Ð? пÑ?иложении</string>
-  <string name="menu_promo_apps">Ð?олÑ?Ñ?иÑ?Ñ? пÑ?иложениÑ?...</string>
-  <string name="main_layout_download">Ð?агÑ?Ñ?зка</string>
+    <string name="main_layout_download">Ð?агÑ?Ñ?зка</string>
   <string name="main_layout_upload">Ð?Ñ?пÑ?авка</string>
-  <string name="button_help">Ð?омоÑ?Ñ?</string>
-  <string name="button_close">Ð?акÑ?Ñ?Ñ?Ñ?</string>
-  <string name="button_about">Ð? пÑ?иложении</string>
-  <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?иÑ?Ñ? жÑ?Ñ?нал</string>
-  <string name="menu_verify">Ð?Ñ?овеÑ?ка</string>
-  <string name="menu_exit">Ð?Ñ?Ñ?од</string>
+    <string name="button_about">Ð? пÑ?иложении</string>
+    <string name="menu_exit">Ð?Ñ?Ñ?од</string>
   <string name="menu_scan">СканиÑ?оваÑ?Ñ? QR-код моÑ?Ñ?а</string>
   <string name="menu_share_bridge">Ð?пÑ?бликоваÑ?Ñ? QR-код моÑ?Ñ?а</string>
-  <string name="press_to_start">- долгое нажаÑ?ие длÑ? запÑ?Ñ?ка -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и (Ñ?Ñ?ебÑ?Ñ?Ñ?Ñ?Ñ? пÑ?ивилегии root)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?озÑ?аÑ?ное пÑ?окÑ?иÑ?ование</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?еÑ?каÑ? Ñ?оÑ?иÑ?икаÑ?иÑ? пÑ?иложений</string>
-  <string name="pref_transparent_all_title">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?е Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_all_summary">Ð?апÑ?авлÑ?Ñ?Ñ? Ñ?Ñ?аÑ?ик вÑ?еÑ? пÑ?иложений Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?внÑ?й поÑ?Ñ? пÑ?окÑ?и</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?РÐ?Ð?УÐ?РÐ?Ð?Ð?Ð?Ð?Ð?Ð?: обÑ?одиÑ? обÑ?ие поÑ?Ñ?Ñ? (80, 443 и Ñ?.д.). *Ð?СÐ?Ð?Ð?ЬÐ?Ð?Ð?Ð?ТЬ ТÐ?Ð?ЬÐ?Ð?* еÑ?ли Ñ?ежимÑ? \'Ð?Ñ?е\' или \'Ð?Ñ?иложение\' не Ñ?абоÑ?аÑ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпиÑ?ок поÑ?Ñ?ов</string>
-  <string name="pref_transparent_port_summary">СпиÑ?ок поÑ?Ñ?ов длÑ? пÑ?окÑ?иÑ?икаÑ?ии. *Ð?СÐ?Ð?Ð?ЬÐ?Ð?Ð?Ð?ТЬ ТÐ?Ð?ЬÐ?Ð?* еÑ?ли Ñ?ежимÑ? \'Ð?Ñ?е\' или \'Ð?Ñ?иложение\' не Ñ?абоÑ?аÑ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?ведиÑ?е поÑ?Ñ?Ñ? длÑ? пÑ?окÑ?иÑ?икаÑ?ии</string>
-  <string name="pref_has_root">Ð?апÑ?оÑ?иÑ?Ñ? root-доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?апÑ?оÑ?иÑ?Ñ? root-доÑ?Ñ?Ñ?п длÑ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии</string>
-  <string name="status_install_success">Ð?инаÑ?нÑ?е Ñ?айлÑ? Tor Ñ?Ñ?пеÑ?но Ñ?Ñ?Ñ?ановленÑ?!</string>
-  <string name="status_install_fail">Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? бинаÑ?нÑ?е Ñ?айлÑ? Tor. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?иÑ?Ñ?емнÑ?й жÑ?Ñ?нал и Ñ?ообÑ?иÑ?е нам: tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?ибка пÑ?иложениÑ?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?б Orbot</string>
-  <string name="btn_next">Ð?пеÑ?Ñ?д</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?авеÑ?Ñ?иÑ?Ñ?</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">РазÑ?еÑ?ение полÑ?Ñ?ено</string>
-  <string name="wizard_permissions_stock">РазÑ?еÑ?ениÑ? Orbot</string>
-  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?Ñ? опÑ?еделили, Ñ?Ñ?о вÑ? пÑ?едоÑ?Ñ?авили root-пÑ?ава длÑ? Orbot. Ð?Ñ? бÑ?дем иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ? возможноÑ?Ñ?Ñ? Ñ? Ñ?мом.</string>
-  <string name="wizard_permissions_msg_stock">ХоÑ?Ñ? Ñ?Ñ?о и не Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ?, Orbot можеÑ? бÑ?Ñ?Ñ? более моÑ?нÑ?м инÑ?Ñ?Ñ?Ñ?менÑ?ом, еÑ?ли ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во имееÑ? пÑ?ава root. Ð?ажмиÑ?е на кнопкÑ? ниже и пÑ?едоÑ?Ñ?авÑ?Ñ?е Orbot Ñ?Ñ?пеÑ?возможноÑ?Ñ?и!</string>
-  <string name="wizard_permissions_no_root">Ð?Ñ?ли Ñ? ваÑ? неÑ? root-пÑ?ав или вÑ? не имееÑ?е пÑ?едÑ?Ñ?авлениÑ? о Ñ?Ñ?м мÑ? говоÑ?им, пÑ?оÑ?Ñ?о Ñ?бедиÑ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ?, Ñ?азÑ?абоÑ?аннÑ?е длÑ? Orbot.</string>
-  <string name="wizard_permissions_consent">Я понимаÑ? и Ñ?оÑ?Ñ? пÑ?одолжиÑ?Ñ? без пÑ?ав Ñ?Ñ?пеÑ?полÑ?зоваÑ?елÑ?</string>
-  <string name="wizard_permission_enable_root">Ð?аÑ?Ñ? root-пÑ?ава Orbot</string>
-  <string name="wizard_configure">Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? Tor-иÑ?икаÑ?иÑ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?огÑ?амма Orbot даÑ?Ñ? вам возможноÑ?Ñ?Ñ? напÑ?авлÑ?Ñ?Ñ? Ñ?Ñ?аÑ?ик вÑ?еÑ? пÑ?иложений Ñ?еÑ?ез Tor Ð?Ð?Ð? вÑ?бÑ?аÑ?Ñ? пÑ?иложениÑ? длÑ? пеÑ?енапÑ?авлениÑ? Ñ?амоÑ?Ñ?оÑ?Ñ?елÑ?но.</string>
-  <string name="wizard_configure_all">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?е пÑ?иложениÑ? Ñ?еÑ?ез Tor</string>
-  <string name="wizard_configure_select_apps">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?бÑ?аннÑ?е пÑ?иложениÑ? Ñ?еÑ?ез Tor</string>
-  <string name="wizard_tips_tricks">Orbot-задейÑ?Ñ?вованнÑ?е пÑ?иложениÑ?</string>
-  <string name="wizard_tips_msg">Ð?Ñ? Ñ?овеÑ?Ñ?ем вам Ñ?каÑ?аÑ?Ñ? и иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ?, коÑ?оÑ?Ñ?е Ñ?меÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? напÑ?Ñ?мÑ?Ñ? Ñ?еÑ?ез Orbot. Ð?ажмиÑ?е на кнопки ниже, Ñ?Ñ?обÑ? запÑ?Ñ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Ñ?Ñ?Ñ?ановки или вÑ? можеÑ?е найÑ?и иÑ? позже в Google Play, на веб-Ñ?айÑ?е GuardianProject.info или Ñ?еÑ?ез F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - заÑ?иÑ?Ñ?ннÑ?й обмен Ñ?ообÑ?ениÑ?ми в Android</string>
-  <string name="wizard_tips_proxy">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и: Ñ?знайÑ?е, как наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?иложениÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot</string>
-  <string name="wizard_tips_duckgo">Ð?Ñ?иложение поиÑ?ковой Ñ?иÑ?Ñ?емÑ? DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Twitter поддеÑ?живаеÑ? http-пÑ?окÑ?и \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - напиÑ?иÑ?е Ñ?аÑ?Ñ?каз и оÑ?Ñ?авÑ?Ñ?е его Tor длÑ? обеÑ?пеÑ?ениÑ? безопаÑ?ноÑ?Ñ?и!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и</string>
-  <string name="wizard_proxy_help_msg">Ð?Ñ?ли иÑ?полÑ?зÑ?емое вами пÑ?иложение длÑ? Android поддеÑ?живаеÑ? HTTP или SOCKS-пÑ?окÑ?и, Ñ?о вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? его на подклÑ?Ñ?ение к Orbot и иÑ?полÑ?зование Tor.\n\n\nÐ?наÑ?ение Ñ?оÑ?Ñ?а - 127.0.0.1 или \"localhost\". Ð?лÑ? HTTP номеÑ? поÑ?Ñ?а - 8118. Ð?лÑ? SOCKS-пÑ?окÑ?и - 9050. Ð?о возможноÑ?Ñ?и иÑ?полÑ?зÑ?йÑ?е SOCKS4A или SOCKS5.\n \n\n\nÐ?Ñ? можеÑ?е Ñ?знаÑ?Ñ? болÑ?Ñ?е о Ñ?абоÑ?е Ñ?еÑ?ез пÑ?окÑ?и на Android, пÑ?оÑ?иÑ?ав Ñ?Ñ?оÑ? FAQ: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot гоÑ?ов к иÑ?полÑ?зованиÑ?!</string>
-  <string name="wizard_final_msg">Ð?иллионÑ? лÑ?дей во вÑ?Ñ?м миÑ?е иÑ?полÑ?зÑ?Ñ?Ñ? Tor по Ñ?азлиÑ?нÑ?м пÑ?иÑ?инам. Ð?Ñ?Ñ?налиÑ?Ñ?Ñ? и блоггеÑ?Ñ?, пÑ?авозаÑ?иÑ?ники, Ñ?оÑ?Ñ?Ñ?дники пÑ?авооÑ?Ñ?аниÑ?елÑ?нÑ?Ñ? оÑ?ганов, Ñ?олдаÑ?Ñ?, коÑ?поÑ?аÑ?ии, гÑ?аждане Ñ?Ñ?Ñ?ан Ñ? Ñ?епÑ?еÑ?Ñ?ивнÑ?м Ñ?ежимом и пÑ?оÑ?Ñ?о обÑ?Ñ?нÑ?е гÑ?аждане..., а Ñ?епеÑ?Ñ? гоÑ?овÑ? и вÑ?!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Orbot пÑ?ежде Ñ?ем пÑ?иÑ?Ñ?Ñ?пиÑ?Ñ? к иÑ?полÑ?зованиÑ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ð?Ñ? Ñ?Ñ?пеÑ?но подклÑ?Ñ?илиÑ?Ñ? к Ñ?еÑ?и Tor, но Ñ?Ñ?о Ð?Ð? знаÑ?иÑ?, Ñ?Ñ?о ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во безопаÑ?но. Ð?Ñ? можеÑ?е воÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? Ñ?Ñ?нкÑ?ией \'Ð?Ñ?овеÑ?ка\' из менÑ?, Ñ?Ñ?обÑ? пÑ?оÑ?еÑ?Ñ?иÑ?оваÑ?Ñ? ваÑ? бÑ?аÑ?зеÑ?.\n\nÐ?оÑ?еÑ?иÑ?е наÑ? Ñ?айÑ? https://guardianproject.info/apps/orbot или оÑ?пÑ?авÑ?Ñ?е пиÑ?Ñ?мо на адÑ?еÑ? help@xxxxxxxxxxxxxxxxxxxx, Ñ?Ñ?обÑ? Ñ?знаÑ?Ñ? болÑ?Ñ?е.</string>
-  <string name="tor_check">ЭÑ?о пÑ?иведÑ?Ñ? к запÑ?Ñ?кÑ? бÑ?аÑ?зеÑ?а, вÑ?бÑ?анного на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве по Ñ?молÑ?аниÑ?, и подклÑ?Ñ?ениÑ? к Ñ?айÑ?Ñ? https://check.torproject.org Ñ? Ñ?елÑ?Ñ? пÑ?овеÑ?ки пÑ?авилÑ?ноÑ?Ñ?и Ñ?абоÑ?Ñ? Orbot и опÑ?еделениÑ?, подклÑ?Ñ?енÑ? ли вÑ? к Ñ?еÑ?и Tor.</string>
-  <string name="pref_hs_group">СкÑ?Ñ?Ñ?Ñ?е Ñ?лÑ?жбÑ?</string>
-  <string name="pref_general_group">Ð?бÑ?ие</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-->
-  <string name="wizard_title_msg">Orbot позволÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? Tor на Android!\n\nTor позволÑ?еÑ? вам заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?илÑ?Ñ?Ñ?аÑ?ии Ñ?одеÑ?жимого, анализа Ñ?Ñ?аÑ?ика и наблÑ?дениÑ? за Ñ?еÑ?Ñ?Ñ?, коÑ?оÑ?Ñ?е Ñ?Ñ?авÑ?Ñ? под Ñ?гÑ?озÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ?, конÑ?иденÑ?иалÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? и лиÑ?нÑ?е оÑ?ноÑ?ениÑ?.\n\nЭÑ?оÑ? маÑ?Ñ?еÑ? поможеÑ? вам наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot и Tor на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?Ñ?едÑ?пÑ?еждение</string>
-  <string name="wizard_warning_msg">Сама по Ñ?ебе Ñ?Ñ?Ñ?ановка Orbot не Ñ?делаеÑ? авÑ?омаÑ?иÑ?еÑ?ки ваÑ? мобилÑ?нÑ?й Ñ?Ñ?аÑ?ик анонимнÑ?м.\n\nÐ?Ñ? должнÑ? пÑ?авилÑ?но наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot, ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во и дÑ?Ñ?гие пÑ?иложениÑ?, Ñ?Ñ?о бÑ? Ñ?Ñ?пеÑ?но иÑ?полÑ?зоваÑ?Ñ? Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">РазÑ?еÑ?ениÑ?</string>
-  <string name="wizard_permissions_root_msg1">Ð?Ñ? Ñ?ак же можеÑ?е по желаниÑ? даÑ?Ñ? Orbot пÑ?ава \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\' длÑ? доÑ?Ñ?Ñ?па к дополниÑ?елÑ?нÑ?м возможноÑ?Ñ?Ñ?м Ñ?ипа пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии.</string>
-  <string name="wizard_permissions_root_msg2">Ð?Ñ?ли вÑ? не Ñ?оÑ?иÑ?е делаÑ?Ñ? Ñ?Ñ?о, пожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ?, Ñ?озданнÑ?е длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Ð?оÑ?оже, ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во не имееÑ? root-пÑ?ав и не пÑ?едоÑ?Ñ?авлÑ?еÑ? доÑ?Ñ?Ñ?п \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\'.\n\nÐ?ожалÑ?йÑ?Ñ?а, попÑ?обÑ?йÑ?е Ñ?ежим \'Ð?Ñ?иложениÑ?\' на главном Ñ?кÑ?ане.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?Ñ?иложениÑ?, Ñ?абоÑ?аÑ?Ñ?ие Ñ? Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: пÑ?иложение длÑ? безопаÑ?ной пеÑ?епиÑ?ки Ñ? конÑ?иденÑ?иалÑ?нÑ?м Ñ?иÑ?Ñ?ованием</string>
-  <string name="wizard_tips_orweb">Orfox: конÑ?иденÑ?иалÑ?нÑ?й бÑ?аÑ?зеÑ?, Ñ?абоÑ?аÑ?Ñ?ий Ñ?еÑ?ез Tor</string>
-  <string name="wizard_tips_play">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на Ñ?айÑ?е https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?озÑ?аÑ?ное пÑ?окÑ?иÑ?ование</string>
-  <string name="wizard_transproxy_msg">ЭÑ?о позволÑ?еÑ? ваÑ?им пÑ?иложениÑ?м авÑ?омаÑ?иÑ?еÑ?ки Ñ?абоÑ?аÑ?Ñ? по Ñ?еÑ?и Tor без какой-либо наÑ?Ñ?Ñ?ойки.</string>
-  <string name="wizard_transproxy_hint">(Ð?Ñ?меÑ?Ñ?Ñ?е даннÑ?й пÑ?нкÑ?, еÑ?ли вÑ? не знаеÑ?е о Ñ?Ñ?м идÑ?Ñ? Ñ?еÑ?Ñ?)</string>
-  <string name="wizard_transproxy_none">Ð?еÑ?</string>
-  <string name="pref_transparent_tethering_title">ТеÑ?еÑ?инг Tor</string>
-  <string name="pref_transparent_tethering_summary">Ð?клÑ?Ñ?иÑ?Ñ? пÑ?озÑ?аÑ?нÑ?Ñ? пÑ?окÑ?иÑ?икаÑ?иÑ? Tor длÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?в Ñ? Ñ?еÑ?еÑ?ингом по Wi-Fi и USB (Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? пеÑ?езапÑ?Ñ?к)</string>
-  <string name="button_grant_superuser">Ð?апÑ?оÑ?иÑ?Ñ? доÑ?Ñ?Ñ?п СÑ?пеÑ?полÑ?зоваÑ?елÑ?</string>
-  <string name="pref_select_apps">Ð?Ñ?бÑ?аннÑ?е пÑ?иложениÑ?</string>
-  <string name="pref_select_apps_summary">Ð?Ñ?бÑ?аÑ?Ñ? пÑ?иложениÑ? длÑ? напÑ?авлениÑ? Ñ?еÑ?ез Tor</string>
-  <string name="pref_node_configuration">Ð?онÑ?игÑ?Ñ?аÑ?иÑ? Ñ?зла</string>
+    <!--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="button_proxy_all">Ð?Ñ?окÑ?иÑ?оваÑ?Ñ? вÑ?Ñ?</string>
-  <string name="button_proxy_none">Ð?е пÑ?окÑ?иÑ?оваÑ?Ñ? </string>
-  <string name="button_invert_selection">Ð?нвеÑ?Ñ?иÑ?оваÑ?Ñ? вÑ?деленное</string>
-  <string name="pref_proxy_title">Ð?Ñ?Ñ?одÑ?Ñ?ий Ñ?еÑ?евой пÑ?окÑ?и (необÑ?заÑ?елÑ?но)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Ð?аÑ?олÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и</string>
   <string name="pref_proxy_password_summary">Ð?аÑ?олÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?а (необÑ?заÑ?елÑ?но)</string>
   <string name="pref_proxy_password_dialog">Ð?ведиÑ?е паÑ?олÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">УÑ?Ñ?ановка обÑ?ей пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии...</string>
-  <string name="setting_up_app_based_transparent_proxying_">УÑ?Ñ?ановка оÑ?нованной на пÑ?иложениÑ?Ñ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?озÑ?аÑ?наÑ? пÑ?окÑ?иÑ?икаÑ?иÑ? Ð?Ð?Ð?ЮЧÐ?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и поддеÑ?живаеÑ? Ñ?еÑ?еÑ?инг!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: оÑ?ибка запÑ?Ñ?ка пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии!</string>
-  <string name="transproxy_rules_cleared">Ð?Ñ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и Ñ?даленÑ?</string>
-  <string name="couldn_t_start_tor_process_">Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?абоÑ?аеÑ? на поÑ?Ñ?Ñ?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">УÑ?Ñ?ановка оÑ?нованной на поÑ?Ñ?аÑ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии...</string>
-  <string name="bridge_error">Ð?Ñ?ибка моÑ?Ñ?а</string>
-  <string name="bridge_requires_ip">Ð?лÑ? иÑ?полÑ?зованиÑ? необÑ?одимо задаÑ?Ñ? IP-адÑ?еÑ? как минимÑ?м одного моÑ?Ñ?а.</string>
-  <string name="send_email_for_bridges">Ð?Ñ?пÑ?авÑ?Ñ?е пиÑ?Ñ?мо на адÑ?еÑ? bridges@xxxxxxxxxxxxxx Ñ?о Ñ?Ñ?Ñ?окой \"get bridges\" в Ñ?еле Ñ?ообÑ?ениÑ? из Ñ?Ñ?Ñ?Ñ?ной запиÑ?и GMail.</string>
-  <string name="error">Ð?Ñ?ибка</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Ð?Ñ?полÑ?зоваÑ?Ñ? *Ñ?олÑ?ко* Ñ?Ñ?и заданнÑ?е Ñ?злÑ?</string>
   <string name="bridges">Ð?оÑ?Ñ?Ñ?</string>
   <string name="use_bridges">Ð?Ñ?полÑ?зоваÑ?Ñ? моÑ?Ñ?Ñ?</string>
-  <string name="bridges_obfuscated">Ð?бÑ?Ñ?Ñ?Ñ?иÑ?ованнÑ?е моÑ?Ñ?Ñ?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?клÑ?Ñ?иÑ?Ñ? алÑ?Ñ?еÑ?наÑ?ивнÑ?е вÑ?однÑ?е Ñ?злÑ? в Ñ?еÑ?Ñ? Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?аданнÑ?е моÑ?Ñ?Ñ? обÑ?Ñ?Ñ?Ñ?иÑ?ованÑ?</string>
-  <string name="ip_address_and_port_of_bridges">IP-адÑ?еÑ?а и поÑ?Ñ?Ñ? моÑ?Ñ?ов</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пнÑ?е поÑ?Ñ?Ñ?</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?Ñ?, доÑ?Ñ?Ñ?пнÑ?е из-за огÑ?аниÑ?иÑ?елÑ?ного Ñ?еÑ?евого Ñ?кÑ?ана</string>
   <string name="enter_ports">Ð?ведиÑ?е поÑ?Ñ?Ñ?</string>
-  <string name="enable_hidden_services">Ð?клÑ?Ñ?иÑ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?е Ñ?лÑ?жбÑ?</string>
-  <string name="run_servers_accessible_via_the_tor_network">РазÑ?еÑ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?веÑ?Ñ? на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ð?ведиÑ?е локалÑ?нÑ?е поÑ?Ñ?Ñ? длÑ? Ñ?кÑ?Ñ?Ñ?Ñ?Ñ? Ñ?лÑ?жб</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ð?дÑ?еÑ?Ñ?емое имÑ? длÑ? ваÑ?ей Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ? (Ñ?оздаÑ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?еÑ?ки)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ð?клÑ?Ñ?иÑ?Ñ? вÑ?вод жÑ?Ñ?нала оÑ?ладки (Ñ?Ñ?ебÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? adb или aLogCat длÑ? пÑ?оÑ?моÑ?Ñ?а)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ð?клÑ?Ñ?иÑ?Ñ? вÑ?вод жÑ?Ñ?нала оÑ?ладки (Ñ?Ñ?ебÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? adb или aLogCat длÑ? пÑ?оÑ?моÑ?Ñ?а)</string>
   <string name="project_home">Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а пÑ?оекÑ?а(ов): </string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ð?иÑ?ензиÑ? Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Ð?Ñ?огÑ?аммÑ? Ñ?Ñ?оÑ?онниÑ? Ñ?азÑ?абоÑ?Ñ?иков: </string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">Ñ?кÑ?Ñ?Ñ?аÑ? Ñ?лÑ?жба на:</string>
-  <string name="unable_to_read_hidden_service_name">невозможно пÑ?оÑ?иÑ?аÑ?Ñ? имÑ? Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ?</string>
+    <string name="unable_to_read_hidden_service_name">невозможно пÑ?оÑ?иÑ?аÑ?Ñ? имÑ? Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ?</string>
   <string name="unable_to_start_tor">Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor:</string>
-  <string name="unable_to_reset_tor">Ð?еÑ?езагÑ?Ñ?зиÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во, невозможно пеÑ?еÑ?Ñ?Ñ?ановиÑ?Ñ? Tor!</string>
-  <string name="pref_use_sys_iptables_title">Ð?Ñ?полÑ?зоваÑ?Ñ? Iptables по Ñ?молÑ?аниÑ?</string>
-  <string name="pref_use_sys_iptables_summary">Ð?Ñ?полÑ?зоваÑ?Ñ? вÑ?Ñ?Ñ?оеннÑ?й Ñ?айл iptables вмеÑ?Ñ?о поÑ?Ñ?авлÑ?емого Ñ? Orbot</string>
-  <string name="error_installing_binares">Ð?Ñ?полнÑ?емÑ?е Ñ?айлÑ? Tor не Ñ?могли Ñ?Ñ?Ñ?ановиÑ?Ñ?Ñ?Ñ? или обновиÑ?Ñ?Ñ?.</string>
-  <string name="pref_use_persistent_notifications">Ð?Ñ?егда оÑ?обÑ?ажаÑ?Ñ? иконкÑ? в панели задаÑ? когда Orbot подклÑ?Ñ?Ñ?н</string>
+    <string name="pref_use_persistent_notifications">Ð?Ñ?егда оÑ?обÑ?ажаÑ?Ñ? иконкÑ? в панели задаÑ? когда Orbot подклÑ?Ñ?Ñ?н</string>
   <string name="pref_use_persistent_notifications_title">Ð?оÑ?Ñ?оÑ?нное Ñ?ведомление о Ñ?абоÑ?е</string>
   <string name="pref_use_expanded_notifications">Ð?оказаÑ?Ñ? Ñ?аÑ?Ñ?иÑ?енное Ñ?ведомление Tor Ñ?о Ñ?Ñ?Ñ?аной вÑ?Ñ?ода и IP</string>
   <string name="pref_use_expanded_notifications_title">РаÑ?Ñ?иÑ?еннÑ?е Ñ?ведомлениÑ?</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?Ñ? вклÑ?Ñ?енÑ?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ЯзÑ?к</string>
-  <string name="set_locale_summary">Ð?Ñ?бÑ?аÑ?Ñ? Ñ?зÑ?к инÑ?еÑ?Ñ?ейÑ?а длÑ? Orbot</string>
-  <string name="wizard_locale_title">Ð?Ñ?беÑ?иÑ?е Ñ?зÑ?к</string>
-  <string name="wizard_locale_msg">Ð?Ñ?Ñ?авиÑ?Ñ? по Ñ?молÑ?аниÑ? или пеÑ?еклÑ?Ñ?иÑ?Ñ? Ñ?екÑ?Ñ?ий Ñ?зÑ?к</string>
-  <string name="powered_by">оÑ?новано на Tor</string>
-  <string name="btn_save_settings">СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки</string>
-  <string name="no_internet_connection_tor">Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? подклÑ?Ñ?ение к инÑ?еÑ?неÑ?Ñ?, Tor наÑ?одиÑ?Ñ?Ñ? в Ñ?ежиме ожиданиÑ?â?¦</string>
-  <string name="bandwidth_">Ð?анал:</string>
-  <string name="down">к нам</string>
-  <string name="up">оÑ? наÑ?</string>
-  <string name="pref_disable_network_title">Ð?вÑ?озаÑ?Ñ?пание без Ñ?еÑ?и</string>
+    <string name="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="menu_verify_browser">Ð?Ñ?овеÑ?иÑ?Ñ? бÑ?аÑ?зеÑ?</string>
-  <string name="menu_use_chatsecure">Ð?Ñ?полÑ?зоваÑ?Ñ? ChatSecure</string>
-  <string name="permission_manage_tor_label">УпÑ?авление Tor</string>
-  <string name="permission_manage_tor_description">РазÑ?еÑ?иÑ?Ñ? пÑ?иложениÑ? Ñ?пÑ?авлÑ?Ñ?Ñ? Ñ?еÑ?виÑ?ом Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot лÑ?Ñ?Ñ?е вÑ?его Ñ?абоÑ?аеÑ? Ñ? бÑ?аÑ?зеÑ?ом Orfox. УÑ?Ñ?ановиÑ?Ñ? его?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot лÑ?Ñ?Ñ?е вÑ?его Ñ?абоÑ?аеÑ? Ñ? бÑ?аÑ?зеÑ?ом Orfox. УÑ?Ñ?ановиÑ?Ñ? его?</string>
   <string name="install_apps_">УÑ?Ñ?ановиÑ?Ñ? бÑ?аÑ?зеÑ??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?еÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?и. Tor пеÑ?еÑ?одиÑ? в Ñ?ежим Ñ?на...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Ð?одклÑ?Ñ?ение к Ñ?еÑ?и Ñ?Ñ?Ñ?ановлено. Tor пÑ?оÑ?Ñ?паеÑ?Ñ?Ñ?...</string>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Ð?олÑ?зоваÑ?елÑ?Ñ?кие наÑ?Ñ?Ñ?ойки Torrc</string>
   <string name="pref_torrc_summary">ТÐ?Ð?ЬÐ?Ð? Ð?Ð?Я ЭÐ?СÐ?Ð?РТÐ?Ð?: внеÑ?иÑ?е наÑ?Ñ?Ñ?ойки напÑ?Ñ?мÑ?Ñ? в Ñ?Ñ?Ñ?оки Ñ?айла конÑ?игÑ?Ñ?аÑ?ии torrc</string>
   <string name="pref_torrc_dialog">Ð?олÑ?зоваÑ?елÑ?Ñ?кий Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus -  пÑ?иложение Benetech докÑ?менÑ?аÑ?иÑ? по пÑ?авам Ñ?еловека </string>
-  <string name="your_tor_public_ips_">Ð?аÑ?и пÑ?блиÑ?нÑ?е IP-адÑ?еÑ?а Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?ожалÑ?йÑ?Ñ?а, оÑ?клÑ?Ñ?иÑ?е Ñ?Ñ?Ñ? пÑ?огÑ?аммÑ? в Android-&gt;Ð?аÑ?Ñ?Ñ?ойки-&gt;Ð?Ñ?иложениÑ?, еÑ?ли Ñ? ваÑ? возникли пÑ?облемÑ? Ñ? Orbot:</string>
-  <string name="app_conflict"> Ð?онÑ?ликÑ? пÑ?иложений</string>
-  <string name="pref_transproxy_refresh_title">Ð?вÑ?ообновление пÑ?озÑ?аÑ?ного пÑ?окÑ?и</string>
-  <string name="pref_transproxy_refresh_summary">Ð?овÑ?оÑ?но пÑ?имениÑ?Ñ? пÑ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и пÑ?и изменении Ñ?оÑ?Ñ?оÑ?ниÑ? Ñ?еÑ?и</string>
-  <string name="pref_transproxy_flush_title">Ð?РÐ?Ð?УÐ?Ð?ТÐ?Ð?ЬÐ?Ð?Ð? УÐ?Ð?Ð?Ð?Ð?Ð?Ð? пÑ?озÑ?аÑ?ного пÑ?окÑ?и</string>
-  <string name="pref_transproxy_flush_summary">Ð?ажмиÑ?е здеÑ?Ñ?, Ñ?Ñ?обÑ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? оÑ?иÑ?Ñ?иÑ?Ñ? вÑ?е Ñ?еÑ?евÑ?е пÑ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и</string>
-  <string name="transparent_proxy_rules_flushed_">Ð?Ñ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и Ñ?даленÑ?!</string>
-  <string name="you_do_not_have_root_access_enabled">У ваÑ? неÑ? root-доÑ?Ñ?Ñ?па</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?озможно, поÑ?Ñ?ебÑ?еÑ?Ñ?Ñ? оÑ?Ñ?ановиÑ?Ñ? и запÑ?Ñ?Ñ?иÑ?Ñ? Orbot заново длÑ? иÑ?полÑ?зованиÑ? изменÑ?ннÑ?Ñ? наÑ?Ñ?Ñ?оек.</string>
-  <string name="menu_vpn">Ð?Ñ?иложениÑ?</string>
-  <string name="kbps">кбиÑ?/Ñ?</string>
+    <string name="kbps">кбиÑ?/Ñ?</string>
   <string name="mbps">мбиÑ?/Ñ?</string>
   <string name="kb">Ð?Ð?</string>
   <string name="mb">Ð?Ð?</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">СайÑ?</string>
   <string name="activate">Ð?кÑ?иваÑ?иÑ?</string>
   <string name="apps_mode">VPN-Ñ?ежим</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?Ñ? можеÑ?е Ñ?азÑ?еÑ?иÑ?Ñ? пÑ?иложениÑ?м пÑ?оÑ?одиÑ?Ñ? Ñ?еÑ?ез Tor Ñ? помоÑ?Ñ?Ñ? вÑ?Ñ?Ñ?оенной VPN-Ñ?еÑ?и Orbot.\n\nЭÑ?о не Ñ?делаеÑ? ваÑ? анонимнÑ?м, но Ñ?Ñ?о поможеÑ? пÑ?ойÑ?и Ñ?еÑ?ез бÑ?андмаÑ?Ñ?Ñ?Ñ?.</string>
-  <string name="send_email">Ð?Ñ?пÑ?авиÑ?Ñ? пиÑ?Ñ?мо</string>
+    <string name="send_email">Ð?Ñ?пÑ?авиÑ?Ñ? пиÑ?Ñ?мо</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ð?Ñ? можеÑ?е полÑ?Ñ?иÑ?Ñ? адÑ?еÑ? моÑ?Ñ?а по Ñ?лекÑ?Ñ?онной поÑ?Ñ?е, Ñ? Ñ?айÑ?а или пÑ?Ñ?Ñ?м Ñ?каниÑ?ованиÑ? QR-кода. Ð?Ñ?беÑ?иÑ?е \"Эл. поÑ?Ñ?а\" или \"СайÑ?\" ниже, Ñ?Ñ?обÑ? запÑ?оÑ?иÑ?Ñ? адÑ?еÑ? моÑ?Ñ?а.\n\nÐ?олÑ?Ñ?еннÑ?й адÑ?еÑ? Ñ?копиÑ?Ñ?йÑ?е и вÑ?Ñ?авÑ?Ñ?е его в Ñ?азделе наÑ?Ñ?Ñ?оек Orbot \"Ð?оÑ?Ñ?Ñ?\", поÑ?ле Ñ?его пеÑ?езапÑ?Ñ?Ñ?иÑ?е пÑ?иложение.</string>
   <string name="install_orweb">УÑ?Ñ?ановиÑ?Ñ? Orfox</string>
-  <string name="standard_browser">СÑ?андаÑ?Ñ?нÑ?й бÑ?аÑ?зеÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?РÐ?Ð?Ð?ЧÐ?Ð?Ð?Ð?: на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ваÑ? Intel X86/Atom Ñ?абоÑ?аÑ?Ñ? Ñ?олÑ?ко Ñ?Ñ?андаÑ?Ñ?нÑ?е моÑ?Ñ?Ñ? Tor</string>
-  <string name="vpn_default_world">Ð?иÑ? (авÑ?о)</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="ports">Ð?оÑ?Ñ?Ñ?</string>
-  <string name="local_port">Ð?окалÑ?нÑ?й поÑ?Ñ?</string>
+    <string name="local_port">Ð?окалÑ?нÑ?й поÑ?Ñ?</string>
   <string name="onion_port">Onion-поÑ?Ñ?</string>
   <string name="name">Ð?мÑ?</string>
   <string name="done">Ð?оÑ?ово!</string>
@@ -308,9 +162,7 @@
   <string name="backup_restored">Ð?оÑ?Ñ?Ñ?ановлено из Ñ?езеÑ?вной копии</string>
   <string name="filemanager_not_available">ФайловÑ?й менеджеÑ? недоÑ?Ñ?Ñ?пен</string>
   <string name="please_grant_permissions_for_external_storage">Ð?Ñ?едоÑ?Ñ?авÑ?Ñ?е Ñ?азÑ?еÑ?ениÑ? длÑ? доÑ?Ñ?Ñ?па к внеÑ?немÑ? Ñ?Ñ?анилиÑ?Ñ?</string>
-  <string name="permission_granted">РазÑ?еÑ?ение полÑ?Ñ?ено</string>
-  <string name="permission_denied">РазÑ?еÑ?ение не полÑ?Ñ?ено</string>
-  <string name="restore_backup">Ð?оÑ?Ñ?Ñ?ановиÑ?Ñ? из копии</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>
@@ -343,10 +195,8 @@
   <string name="pref_connection_padding_summary">Ð?Ñ?егда вклÑ?Ñ?аеÑ? пÑ?окладкÑ? Ñ?оединениÑ? длÑ? заÑ?иÑ?Ñ? оÑ? некоÑ?оÑ?Ñ?Ñ? Ñ?оÑ?м анализа Ñ?Ñ?аÑ?ика. Ð?о Ñ?молÑ?аниÑ?: авÑ?о</string>
   <string name="pref_reduced_connection_padding">СокÑ?аÑ?Ñ?ннаÑ? пÑ?окладка Ñ?оединениÑ?</string>
   <string name="pref_reduced_connection_padding_summary">РанÑ?Ñ?е закÑ?Ñ?ваеÑ? Ñ?еÑ?Ñ?анÑ?лиÑ?ованнÑ?е Ñ?оединениÑ? и оÑ?пÑ?авлÑ?еÑ? менÑ?Ñ?е пакеÑ?ов заполнениÑ? длÑ? Ñ?менÑ?Ñ?ениÑ? обÑ?Ñ?ма пеÑ?едаваемÑ?Ñ? даннÑ?Ñ? и иÑ?полÑ?зованиÑ? баÑ?аÑ?еи</string>
-  <string name="please_enable_vpn">Ð?клÑ?Ñ?иÑ?е Ñ?ежим VPN, Ñ?Ñ?обÑ? пÑ?иложениÑ? могли иÑ?полÑ?зоваÑ?Ñ? Tor</string>
-  <string name="app_shortcuts">Ð?Ñ?иложениÑ? Ñ? поддеÑ?жкой Tor</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">ТеÑ?Ñ?иÑ?ование Ñ?оединениÑ? Ñ? Tor Ñ?еÑ?ез моÑ?Ñ?â?¦</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>
diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml
index fa3e5671..fa116ecb 100644
--- a/app/src/main/res/values-si-rLK/strings.xml
+++ b/app/src/main/res/values-si-rLK/strings.xml
@@ -2,107 +2,35 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot යන� �න���ත� ��ප��� �ට �ඩ� ��ර������ර�� �න�තර�ජ�ල�ය� ��ර���ර�මට �ඩ �ල��ද�න  න��ම�ල�� ලබ�ද�න�න��� ප�ර����� ��������. �ය Tor ය��ද��න�ම�න� �බ��� �න�තර�ජ�ල �න�ද�න� ���තනය �රය� �ම�න�ම �ය ල��� �ට� �� �න���ත� �ම�න�තර පර��න� �ර�� ��නයම�න�  �බ��� �න�තර�ජ�ල �න�ද�න� ���� තබ��න�. Tor යන� </string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor �රම�භ ��ර�ම �� න��ත�ම</string>
-  <string name="tor_proxy_service_process">Tor න�ය�ත� ���� </string>
-  <string name="status_starting_up">Orbot �රම�භ �රම�න��</string>
+    <string name="status_starting_up">Orbot �රම�භ �රම�න��</string>
   <string name="status_activated">Tor ජ�ලයට �බ�ද�ය�</string>
   <string name="status_disabled">Orbot à¶?à·?â??රà·?යà·?à·?à·?රà·?à·?ත à¶?ර à¶?ත </string>
   <string name="tor_process_starting">Tor ද�ය�ය� �රම�භ �රම�න�...</string>
   <string name="tor_process_complete">�ම�ප�ර�ණය�.</string>
-  <string name="tor_process_waiting">ර�ද� ��ට�ය�.</string>
-  <string name="not_anonymous_yet">à¶?à·?à·?à·?දයයà·?: à¶?බà·? à¶?නà·?දà·?නà·? තà·?ම නà·?රà·?නà·?මà·?à¶? නà·?මà·?ත. à¶?රà·?ණà·?à¶?ර à¶?බà·? යà·?දà·?මà·? à·?දà·?à·? HTTP proxy 127.0.0.1:8118 à·?à·? SOCKS4A à·?à·? SOCKS5 proxy 127.0.0.1:9050 භà·?à·?à·?තà·? à·?න පරà·?දà·? à·?à·?නà·?â??යà·?à·? à¶?රà¶?නà·?න.</string>
-  <string name="menu_home">ම�ල�ප�ට��</string>
-  <string name="menu_browse">ප�ර����න�න</string>
-  <string name="menu_settings">��ට��ම�</string>
+    <string name="menu_settings">��ට��ම�</string>
   <string name="menu_log">ල��ය </string>
-  <string name="menu_info">�ද��</string>
-  <string name="menu_start">�රඹන�න</string>
+    <string name="menu_start">�රඹන�න</string>
   <string name="menu_stop">න�ත��න�න</string>
   <string name="menu_about">ප���බද</string>
   <string name="main_layout_download">භ��ත �රන�න </string>
   <string name="main_layout_upload">�ඩ��ත �රන�න </string>
-  <string name="button_help">�ද��</string>
-  <string name="button_close">��න�න</string>
-  <string name="button_about">ප���බද</string>
-  <string name="button_clear_log">ල��ය ���� �රන�න </string>
-  <string name="menu_verify">පර����� �රන�න</string>
-  <string name="menu_exit">��ත� �න�න</string>
-  <string name="press_to_start">- �රම�භ ��ර�මට ට�� ��ල���� තද�රන�න -</string>
-  <string name="pref_trans_proxy_group">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? (මà·?ලය à¶?à·?à·?à·?â??ය à·?à·?)</string>
-  <string name="pref_trans_proxy_title">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·?</string>
-  <string name="pref_trans_proxy_summary">යà·?මà·?නà·? à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? ටà·?රà·?à¶?රණය </string>
-  <string name="pref_transparent_all_title">Tor ��යල�ල</string>
-  <string name="pref_transparent_all_summary">Tor ත�ල ��ය�� ය�ම��ලට ප�ත�න න�ය�ත����� තදබදය</string>
-  <string name="pref_transparent_port_fallback_title">ප�ට න�ය�ත����� ප��බ���ම </string>
-  <string name="pref_transparent_port_fallback_summary">à¶?à·?à·?à·?දයයà·?: මà¶?à·?à·?රà·?ය යà·?තà·? පà·?දà·? පà·?ට (80, 443, යනà·?දà·?ය). *භà·?à·?à·?තà·?à·? à·?à·?දà·?à¶?à·?* \'à·?à·?යà·?à·?\' à·?à·? \'යà·?මà·?\' පà·?â??රà¶?à·?ර à·?à·?ඩ නà·?à¶?රනà·?නà·? නමà·? පමණà·?.</string>
-  <string name="pref_transparent_port_title">ප�ට ල�ය���ත�� </string>
-  <string name="pref_transparent_port_summary">නà·?යà·?තà·?à·?à·?à·?à·? à·?දà·?à·? පà·?ට ලà·?යà·?à·?à·?තà·?à·?. *භà·?à·?à·?තà·?à·? à·?à·?දà·?à¶?à·?* \'à·?à·?යà·?à·?\' à·?à·? \'යà·?මà·?\' පà·?â??රà¶?à·?ර à·?à·?ඩ නà·?à¶?රනà·?නà·? නමà·? පමණà·?.</string>
-  <string name="pref_transparent_port_dialog">ප�ට න�ය�ත������ට ��� �රන�න</string>
-  <string name="pref_has_root">මà·?ල පà·?â??රà·?à·?à·?ය à¶?ලà·?ලනà·?න </string>
-  <string name="pref_has_root_summary">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? à·?දà·?à·? මà·?ල පà·?â??රà·?à·?à·?ය à¶?ලà·?ලනà·?න </string>
-  <string name="status_install_success">Tor ද���මයන� ��ර�ථ�� ��ථ�පනය �රන ලද�!</string>
-  <string name="status_install_fail">Tor ද���මය ��න��න� ��ථ�පනය ��ර�මට න����� ��ය. �ර�ණ��ර ල��ය පර������ර tor-assistants@xxxxxxxxxxxxxx ට ද�න�ම� ද�න�න</string>
-  <string name="title_error">ය�ද�ම� ද�� </string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot ප�ල�බද� </string>
-  <string name="btn_next">�ල� </string>
-  <string name="btn_back">ප��ප�ට</string>
-  <string name="btn_finish">����නය� </string>
-  <string name="btn_okay">���ය�</string>
+    <string name="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>
-  <string name="wizard_permissions_root">�න�ම�ත�ය ල�බ� �ත.</string>
-  <string name="wizard_permissions_stock">Orbot �න�ම�ත�යන� </string>
-  <string name="wizard_premissions_msg_root">�නර��ය�! �බ ම�ල Orbot �ද�� ම�ල �න�ම�ත�යන� �බල �ර �ත� බ� �පට �න��රණය ��ය. �ප ම�ම බලය න�ණ�ත� ල�� භ���ත� ��ර�මට ප�ර�න�ද� ��ම�.</string>
-  <string name="wizard_permissions_msg_stock">à¶?තà·?â??යà·?à·?à·?â??ය නà·?à·?à·?à·?තà·? Orbot à·?ට මà·?ල පà·?â??රà·?à·?à·?ය ලබà·?දà·?මà·?නà·? à¶?ය බලà¶?තà·? මà·?à·?ලමà¶?à·? බà·?ට පතà·?à·?à·?. පà·?ල බà·?තà·?තම භà·?à·?à·?තයà·?නà·? Orbot à·?ට à·?à·?පà·?රà·?බලය ලබà·?දà·?නà·?න!</string>
-  <string name="wizard_permissions_no_root">à¶?බට මà·?ල පà·?â??රà·?à·?à·?ය à·?මà·?බනà·?ධà·? à¶?à·?à·?à·?දà·? à¶?à·?බà·?ධයà¶?à·? නà·?මà·?තà·? නමà·?, Orbot à·?ල à·?ඩà·? à¶?රන යà·?මà·?නà·? පමණà¶?à·? භà·?à·?à·?තà·? à¶?රනà·?න.</string>
-  <string name="wizard_permissions_consent">ම� �ට ��ට��ය�. ��ප�ර� පර���ල�ය� න�ම�ත�� ද��ටම �ර��න ය�මට ��ම�ත�ත�ම�.</string>
-  <string name="wizard_permission_enable_root">Orbot à·?ට මà·?ලය පà·?â??රදà·?නය à¶?රනà·?න </string>
-  <string name="wizard_configure">ටà·?රà·?à¶?රණය à·?à·?නà·?â??යà·?à·? à¶?රනà·?න </string>
-  <string name="wizard_configure_msg">Orbot �බට ��ය�� ය�ම��ල �න�ද�න� Tor ත�ල�න� ය���මට �� �බ� ය�ම� තන� තන�� ත�ර���න�මට ����� ලබ�ද�.</string>
-  <string name="wizard_configure_all">��ය�� ය�ම��ලට ප�ත�න න�ය�ත����� Tor ත�ල�න� ය�න�න </string>
-  <string name="wizard_configure_select_apps">තන� ය�ම�න� Tor �ද�� ත�ර��න�න </string>
-  <string name="wizard_tips_tricks">Orbot �බල �ල ය�ම� </string>
-  <string name="wizard_tips_msg">ප�ත ය�ම� ��ද� �ත�ත� Orbot �ම� ��ඩ ��ර�මට ය. ��ථ�පනය ��ර�ම �ද�� ��� ��� බ�ත�තම මත ��ල��� �රන�න. න�ත��ත� �බට ම�ම ය�ම� Google Play, GuardianProject.info ��බ��ඩ��ය�න� �� F-Droid.org �ල�න� ��ය� �ත ���.</string>
-  <string name="wizard_tips_proxy">නà·?යà·?තà·? à·?à·?à·?à·? à·?à·?ටà·?à·?මà·? - Orbot à·?මà¶? à¶?à·?â??රà·?යà·?à¶?à·?රà·?මට à¶?නà·?à¶?à·? යà·?මà·? à·?à·?නà·?â??යà·?à·? à¶?රන à¶?à¶?à·?රය à·?දà·?රනà·?න </string>
-  <string name="wizard_tips_duckgo">DuckDuckGo à·?à·?à·?à·?මà·? යනà·?තà·?â??ර යà·?දà·?ම </string>
-  <string name="wizard_tips_twitter">Twitter න�ය�ත������ \"localhost\" �ත���ර�යට �� ප�ටය 8118 ට ප���ට��න�න </string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">න�ය�ත� ���� ��ට��ම� </string>
-  <string name="wizard_final">Orbot ��ද�නම�!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">මà·?මà¶?à·?නà·? à¶?බà·? à·?à·?බà·? බà·?â??රà·?à·?à·?රය https://check.torproject.org ට à·?à·?à·?à·?ත à·?à·?. à¶?à·?à·?ට à¶?බට Orbot නà·?à·?à·? ලà·?à·? à·?à·?නà·?â??යà·?à·? à·?à·? à¶?තà·?දà·?යà·? à·?à·? à¶?බ Tor ජà·?ලයට à·?මà·?බනà·?ධ à·?à·? à¶?තà·?දà·?යà·? දà·?à¶?à¶?ත à·?à·?à¶?.</string>
-  <string name="pref_hs_group">�����ණ� ���� �ත���ර �රම�න� </string>
-  <string name="pref_general_group">ප�ද�</string>
+    <!--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-->
-  <string name="wizard_warning_title">����දයය�</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">�න�ම�ත�ය</string>
-  <string name="wizard_permissions_root_msg1">à¶?බට à¶?à·?à·?à·?â??ය නමà·? Orbot à·?à·?පà·?රà·? පරà·?à·?à·?ලà¶?යà·?ට පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·? à·?à·?à·?à·? à·?à·?නà·? පà·?â??රà¶?මන à·?à·?à·?à·?à·?à·?à¶?à¶? à·?බල à¶?à·?රà·?මට à¶?à·?à·?ර ලබà·?දà·?ය à·?à·?à¶?. </string>
-  <string name="wizard_permissions_root_msg2">à¶?බට මà·?ය à·?à·?දà·? à¶?à·?රà·?මට à¶?à·?à·?à·?â??යතà·?à·?à¶?à·? නà·?මà·?තà·? නමà·?, Orbot à·?ල à·?à·?ඩà·? à¶?රන යà·?මà·?නà·? පමණà¶?à·? භà·?à·?à·?තà·? à¶?රනà·?න.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot �බල �ල ය�ම�</string>
-  <string name="wizard_tips_play">Google Play ත�ල�න� Guardian Project apps ත�ර��න�න </string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·?</string>
-  <string name="wizard_transproxy_msg">මà·?මà¶?à·?නà·? à¶?බà·? යà·?මà·?නà·?ට à¶?à·?à·?à·?දà·? à·?à·?නà·?â??යà·?à¶?රණයà¶?à·? නà·?මà·?තà·?à·? Tor ජà·?ලය à·?රà·?à·? à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? à¶?à·?â??රà·?යà·?තà·?මà¶? à·?à·?ය à·?à·?à¶?.</string>
-  <string name="wizard_transproxy_hint">(�බට �ප �ද�න� �ල �ර�ණ� ප���බද ��බ�ධය�� න�ම�ත� නම� ම�ම ��ට�� �ල��ණ� �රන�න)</string>
-  <string name="wizard_transproxy_none">������� න�ම�ත</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Wifi à·?à·? USB Tethered à¶?පà·?à¶?à¶? à·?දà·?à·? Tor පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·? à·?à·?à·?à·?à·? à·?බල à¶?රනà·?න (නà·?à·?ත à¶?රමà·?භ à¶?à·?රà·?මà¶?à·? à¶?à·?à·?à·?â??යà·?à·?)</string>
-  <string name="button_grant_superuser">à·?à·?පà·?රà·? පරà·?à·?à·?ලà¶?යà·?à¶?à·? පà·?â??රà·?à·?à·?ය à¶?ලà·?ලනà·?න </string>
-  <string name="pref_select_apps">ය�ම�න� ත�ර��න�න </string>
-  <string name="pref_select_apps_summary">Tor �ර�� ය���මට ය�ම�න� ත�ර��න�න </string>
-  <string name="pref_node_configuration">නà·?ඩà·? à·?à·?නà·?â??යà·?à·?à¶?රණය </string>
+    <!--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>
@@ -117,19 +45,8 @@
   <string name="pref_proxy_port_title">Outbound න�ය�ත� ප�ර�ටය�� </string>
   <string name="pref_proxy_port_summary">න�ය�ත� ����ද�ය� ප�ටය</string>
   <string name="pref_proxy_port_dialog">න�ය�ත� ���� ප�ටය �ත��� �රන�න </string>
-  <string name="status">තත��ය</string>
-  <string name="setting_up_full_transparent_proxying_">à·?මà·?පà·?රà·?ණ පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? පà·?à·?à·?ටà·?à·?à·?ම...</string>
-  <string name="setting_up_app_based_transparent_proxying_">යà·?මà·? පදනමà·? à¶?රà¶?à·?න à¶?à·?â??රà·?යà·?තà·?මà¶? à·?න පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? පà·?à·?à·?ටà·?à·?à·?ම...</string>
-  <string name="transparent_proxying_enabled">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? à·?බල à¶?ර à¶?ත </string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering �ද�� �බල �ර �ත!</string>
-  <string name="warning_error_starting_transparent_proxying_">à¶?à·?à·?à·?දයයà·?: පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·?à·?à·?නà·? දà·?à·?යà¶?à·? à·?ටà¶?à·?න à¶?ත!</string>
-  <string name="transproxy_rules_cleared">TransProxy ��න�ද��� ��ත� �ර �ත </string>
-  <string name="couldn_t_start_tor_process_">Tor à¶?à·?â??රà·?යà·?à·?ලà·?නà·? à¶?රමà·?භ à¶?à·?රà·?මට නà·?à·?à·?à¶?à·? à·?à·?ය:</string>
-  <string name="setting_up_port_based_transparent_proxying_">පà·?ට පදනමà·? à¶?රà¶?à·?න à¶?à·?â??රà·?යà·?තà·?මà¶? à·?න පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? පà·?à·?à·?ටà·?à·?à·?ම...</string>
-  <string name="bridge_error">��ත� ද��ය��</string>
-  <string name="bridge_requires_ip">��ත� �������� භ���ත�ය �ද�� �බ �ඩ� තරම�න� ��� ��ත� IP ල�ප�නය�� �� �ත�ලත� �ල ය�ත�ය.</string>
-  <string name="send_email_for_bridges">\"get bridges\" නමà·? පà·?ලà·?ය à·?à·?දà·?â??යà·?තà·? ලà·?පà·?යà·? දà·?à·?යà·? à¶?තà·?ලතà·? à¶?ර gmail à¶?à·?ණà·?මà¶?à·?නà·? bridges@xxxxxxxxxxxxxx ලà·?පà·?නයට යà·?නà·?න.</string>
-  <string name="error">ද��ය��</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>
@@ -142,9 +59,7 @@
   <string name="use_only_these_specified_nodes">��ත �ද�න� න�ඩ� *පමණ��* භ���ත� �රන�න </string>
   <string name="bridges">��ත�</string>
   <string name="use_bridges">��ත� භ���ත� �රන�න </string>
-  <string name="bridges_obfuscated">��ත� �ද�ර� �රන�න </string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">à·?à·?නà·?â??යà·?à·? à¶?ර à¶?තà·? à·?à·?තà·? à¶?දà·?රà·? à¶?ල à·?à·?තà·? නමà·? à¶?à·?à·? à·?බල à¶?රනà·?න </string>
-  <string name="ip_address_and_port_of_bridges">IP ල�ප�නය �� ��ත��ල ප�ට</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>
@@ -160,36 +75,17 @@
   <string name="reachable_ports">��න�ද� ��ය���� ප�ටයන�</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">��ම���ර� firewall ප�ට�ප� ��න�ද���ය ���� ප�ටයන�</string>
   <string name="enter_ports">ප�ටයන� �ත��� �රන�න </string>
-  <string name="enable_hidden_services">�����ණ� ���� �ත���ර �රම�න� </string>
-  <string name="run_servers_accessible_via_the_tor_network">à¶?පà·?à¶?à¶? මත දà·?à·?à·?න à·?à·?à·?à·?දà·?යà¶?යà·?ට Tor ජà·?ලයට පà·?â??රà·?à·?à·?à·?à·?මට à¶?ඩදà·?නà·?න</string>
-  <string name="enter_localhost_ports_for_hidden_services">�����ණ� ���� �ද�� �ත� localhost ප�ටයන� �ත��� �රන�න </string>
-  <string name="hidden_service_ports">�����ණ� ���� ප�ටයන�</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">à¶?බà·? à·?à·?à¶?à·?à·?ණà·? à·?à·?à·?à·? à·?දà·?à·? à¶?මතන නà·?මය (à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? ජනනය à·?à·?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">නà·?දà·?à·?à·? à¶?à·?රà·?මà·? ලà·?à¶?ය පà·?â??රතà·?දà·?නය à·?දà·?à·? à·?බල à¶?රනà·?න (නà·?රඹà·?ම à·?දà·?à·? adb or aLogCat භà·?à·?à·?තà·? à¶?රනà·?න)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">නà·?දà·?à·?à·? à¶?à·?රà·?මà·? ලà·?à¶?ය පà·?â??රතà·?දà·?නය à·?දà·?à·? à·?බල à¶?රනà·?න (නà·?රඹà·?ම à·?දà·?à·? adb or aLogCat භà·?à·?à·?තà·? à¶?රනà·?න)</string>
   <string name="project_home">à·?à·?â??යà·?පà·?තà·? නà·?à·?à·?න(නà·?):</string>
-  <string name="the_tor_license">Tor බලපතà·?â??රය</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3 �න ප�ර��� ම�ද�����</string>
+    <string name="third_party_software">3 �න ප�ර��� ම�ද�����</string>
   <string name="found_existing_tor_process">පà·?තà·?න Tor à¶?à·?â??රà·?යà·?à·?ලà·? à·?මà·?à·?à·?ය...</string>
   <string name="something_bad_happened">යම� න�මන� ද�ය�� ��ද���ය. ල��ය පර����� �ර බලන�න </string>
-  <string name="hidden_service_on">�����ණ� ���� ප���ටන�න�:</string>
-  <string name="unable_to_read_hidden_service_name">�����ණ� ���� න�මය ��ය��මට න�����ය </string>
+    <string name="unable_to_read_hidden_service_name">�����ණ� ���� න�මය ��ය��මට න�����ය </string>
   <string name="unable_to_start_tor">Tor �රම�භ ��ර�මට න�����ය:</string>
-  <string name="pref_use_sys_iptables_title">ප�රන�ම� IP ���� භ���ත� �රන�න </string>
-  <string name="pref_use_sys_iptables_summary">Orbot �� ද���මය ip ��� ��න��ට �ප���ය� ප���ට� ද���මය ip ��� භ���ත� �රන�න </string>
-  <string name="error_installing_binares">Tor දà·?à·?à·?මයනà·? à·?à·?ථà·?පනයට à·?à·? à¶?තà·?à·?à·?â??රà·?ණà·? à¶?à·?රà·?මට නà·?à·?à·?à¶?à·? à·?à·?ය.</string>
-  <string name="pref_use_persistent_notifications">Orbot �ම�බන�ධ �� �ත� ��ම��ටම ��ට ම��ලම� ත�ර��� න�ර�ප�ය තබ��න�න</string>
+    <string name="pref_use_persistent_notifications">Orbot �ම�බන�ධ �� �ත� ��ම��ටම ��ට ම��ලම� ත�ර��� න�ර�ප�ය තබ��න�න</string>
   <string name="pref_use_persistent_notifications_title">න���දන ල�බ�මට �ල���න�න </string>
-  <string name="notification_using_bridges">��ත� �බල �ර �ත!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">භ����</string>
-  <string name="set_locale_summary">Orbot �ද�� ප�ද���ය �� භ���� ත�රන�න </string>
-  <string name="wizard_locale_title">භ���� ත�රන�න </string>
-  <string name="wizard_locale_msg">�ම�මතය �ත��ර �ර�තම�න භ����ට ම�ර���න�න </string>
-  <string name="btn_save_settings">��ට��ම� ��ර���න�න</string>
-  <string name="bandwidth_">�ල�ප ප�ල:</string>
-  <string name="menu_vpn">ය�ද�ම� </string>
-  <string name="kb">KB</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>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index b7578c49..0fe1e9e1 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_info">Pomocník</string>
-  <string name="button_help">Pomocník</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Nastavenia proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 478b7983..a6be0788 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2,134 +2,45 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">zapnúť a vypnút Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sa spúšťa�</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="tor_process_waiting">Ä?akám.</string>
-  <string name="not_anonymous_yet">VAROVANIE: Váš prenos nie je ešte anonymný! Prosím, nakonfigurujte aplikácie aby používali HTTP proxy 127.0.0.1:8118 alebo SOCKS4A alebo SOCKS5 proxy server 127.0.0.1:9050</string>
-  <string name="menu_home">Domov</string>
-  <string name="menu_browse">Prehliadať</string>
-  <string name="menu_settings">Nastavenia</string>
+    <string name="menu_settings">Nastavenia</string>
   <string name="menu_log">Podrobnosti</string>
-  <string name="menu_info">Pomocník</string>
-  <string name="menu_start">Å tart</string>
+    <string name="menu_start">Å tart</string>
   <string name="menu_stop">Stop</string>
   <string name="menu_about">O aplikácií</string>
-  <string name="menu_promo_apps">Získať aplikácie...</string>
-  <string name="main_layout_download">Stiahnuť</string>
+    <string name="main_layout_download">Stiahnuť</string>
   <string name="main_layout_upload">Nahrať</string>
-  <string name="button_help">Pomocník</string>
-  <string name="button_close">Zatvoriť</string>
-  <string name="button_about">O aplikácií</string>
-  <string name="button_clear_log">Vymazať podrobnosti</string>
-  <string name="menu_verify">Skontrolovať</string>
-  <string name="menu_exit">UkonÄ?iÅ¥</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="press_to_start">Podržať pre spustenie</string>
-  <string name="pref_trans_proxy_group">Transparentné proxy (vyžaduje root)</string>
-  <string name="pref_trans_proxy_title">Transparentné proxy</string>
-  <string name="pref_trans_proxy_summary">Automatické používanie siete Tor pre aplikácie</string>
-  <string name="pref_transparent_all_title">VÅ¡etko cez Tor</string>
-  <string name="pref_transparent_all_summary">Proxy spojenie pre všetky aplikácie cez Tor</string>
-  <string name="pref_transparent_port_fallback_title">Záložný port pre proxy</string>
-  <string name="pref_transparent_port_fallback_summary">VAROVANIE: Obchádza bežné porty (80, 443, atÄ?.). *POUŽITE LEN* ak módy \'All\' alebo \'App\' nefungujú.</string>
-  <string name="pref_transparent_port_title">Zoznam portov</string>
-  <string name="pref_transparent_port_summary">Zoznam portov pre proxy. *POUŽIŤ LEN* ak módy \'All\' alebo \'App\' nefungujú</string>
-  <string name="pref_transparent_port_dialog">Zadať porty pre proxy</string>
-  <string name="pref_has_root">Vyžiadať prístup administrátora</string>
-  <string name="pref_has_root_summary">Vyžiadať prístup administrátora pre transparentné proxy</string>
-  <string name="status_install_success">Súbory Tor úspešne nainštalované!</string>
-  <string name="status_install_fail">Súbory Tor nemohli byť nainštalované. Skontrolujte podrobnosti a oznámte to tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Chyba aplikácie</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O aplikácií</string>
-  <string name="btn_next">Vpred</string>
-  <string name="btn_back">Späť</string>
-  <string name="btn_finish">DokonÄ?iÅ¥</string>
-  <string name="btn_okay">OK</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>
-  <string name="wizard_permissions_root">Prístup povolený</string>
-  <string name="wizard_permissions_stock">Povolenia aplikácie Orbot</string>
-  <string name="wizard_premissions_msg_root">�žasné! Zistili sme, že máte pre Orbot povolený prístup root. Budeme používať túto možnosť rozumne.</string>
-  <string name="wizard_permissions_msg_stock">Aj keÄ? to nie je požadované, Orbot môže byÅ¥ silnejší nástroj, pokiaľ vaÅ¡e zariadenie má prístup root. Použite tlaÄ?idlo nižšie a poskytnite Orbot superschopnosti!</string>
-  <string name="wizard_permissions_no_root">Pokiaľ nemáte prístup root, alebo neviete, na Ä?o sa vás pýtame, uistite sa, že používate aplikácie navrhnuté pre fungovanie s aplikáciou Orbot.</string>
-  <string name="wizard_permissions_consent">Rozumiem a chcem pokraÄ?ovaÅ¥ bez prístupu root.</string>
-  <string name="wizard_permission_enable_root">Povolit prístup root pre Orbot</string>
-  <string name="wizard_configure">Nastavenie Torifikácie</string>
-  <string name="wizard_configure_msg">Orbot vám umožÅ?uje presmerovaÅ¥ vÅ¡etky aplikácie cez Tor, alebo vybraÅ¥ individuálne aplikácie.</string>
-  <string name="wizard_configure_all">Presmerovať všetky aplikácie cez Tor</string>
-  <string name="wizard_configure_select_apps">Vybrať aplikácie, ktoré presmerovať cez Tor</string>
-  <string name="wizard_tips_tricks">Aplikácie kompatibilné s Orbot</string>
-  <string name="wizard_tips_msg">Nižšie uvedené aplikácie boli navrhnuté pre spoluprácu s Orbot. Kliknite na tlaÄ?ítka pre inÅ¡taláciu teraz, alebo ich môžete nájsÅ¥ neskôr v obchode Google Play, na stránke GuardianProject.info alebo cez F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - BezpeÄ?ný chat pre Android</string>
-  <string name="wizard_tips_proxy">Nastavenia proxy - Zistiť ako nastaviť aplikácie pre spoluprácu s Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo - VyhladávaÄ?</string>
-  <string name="wizard_tips_twitter">Nastavit proxy pre Twitter na \"localhost\" a port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Vytvorte príbeh a nechajte jeho bezpeÄ?nosÅ¥ na Tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Nastavenie proxy</string>
-  <string name="wizard_proxy_help_msg">Pokiaľ vaÅ¡a aplikácia na Android podporuje HTTP alebo SOCKS proxy, môžete ju nakonfigurovaÅ¥ pre použitie s Orbot a Tor.\n\n\n Nastavenie host bude 127.0.0.1 or \"localhost\". Pre HTTP, port bude 8118. Pre SOCKS, proxy bude 9050. KeÄ? je to možné, mali by ste používaÅ¥ SOCKS4A alebo SOCKS5.\n \n\n\n Ä?aľšie informácie o proxy pre Android nájdete vo FAQ na adrese: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot je pripravený!</string>
-  <string name="wizard_final_msg">Milióny ľudí na celom svete používajú Tor z rôznych dôvodov.\n\n Novinári a blogeri, ochrancovia ľudských práv, policajti, vojaci, organizácie, obÄ?ania režimov potlaÄ?ujúcich ich práva, alebo len bežní ľudia.. a teraz je dostupný aj pre vás!</string>
-  <string name="wizard_exit_at_first_screen_toast">Prosím, nastavte Orbot pred tým, ako ho zaÄ?nete používaÅ¥!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ã?speÅ¡ne ste sa pripojili k sieti Tor - ale to neznaÄ?í, že vaÅ¡e zariadenie je bezpeÄ?né. Môžete použiÅ¥ tlaÄ?idlo \'PrehliadaÄ?\' na overenie vaÅ¡eho pripojenia. \n\nNavÅ¡tívte naÅ¡u webstránku https://guardianproject.info/apps/orbot alebo nám poÅ¡lite email na help@xxxxxxxxxxxxxxxxxxxx pre viac informácií.</string>
-  <string name="tor_check">Toto otvorí vo vaÅ¡om prehliadaÄ?i https://check.torproject.org pre zistenie, Ä?i je Orbot správne nastavený a Ä?i ste pripojení do siete Tor.</string>
-  <string name="pref_hs_group">Skrytý hosting služby</string>
-  <string name="pref_general_group">Všeobecné</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-->
-  <string name="wizard_title_msg">Orbot prináša Tor na Android!\n\nTor vám pomáha brániť sa proti filtrovaniu obsahu, analýze prenášaných dát, sledovaniu sietí, ktoré ohrozujú vaše súkromie, citlivé údaje a osobné vzťahy.\n\nTento sprievodca vám pomôže nastaviť Orbot a tor na vašom zariadení.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Upozornenie</string>
-  <string name="wizard_warning_msg">Jednoduchá inÅ¡talácia Orbot neznamená automatickú anonymizáciu vášho mobilného spojenia. \n\nMusíte správne nastaviÅ¥ Orbot, vaÅ¡e zariadenie a Ä?alÅ¡ie aplikácie, aby ste mohli úspeÅ¡ne používaÅ¥ Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Povolenia</string>
-  <string name="wizard_permissions_root_msg1">Máte možnosť udeliť Orbot prístup \'Superpoužívateľ\' na sprístupnenie rozšírených funkcií, ako transparentné proxy.</string>
-  <string name="wizard_permissions_root_msg2">Ak to nechcete urobiÅ¥, tak sa uistite, že aplikácie, ktoré používate sú urÄ?ené na spoluprácu s Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Nevyzerá to, že by malo vaše zariadenie administrátorský prístup alebo poskytovalo možnosť prístupu root alebo \'Superpoužívateľ\'.\n\nProsím skúste namiesto toho mod \'Aplikácie\' na hlavnej obrazovke.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-povolené aplikácie</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: BezpeÄ?ná aplikácia na Ä?etovanie s Off-the-Record Å¡ifrovaním</string>
-  <string name="wizard_tips_orweb">Orfox: PrehliadaÄ? so zvýšenou bezpeÄ?nosÅ¥ou, ktorý pracuje cez sieÅ¥ Tor</string>
-  <string name="wizard_tips_play">Nájdite všetky aplikácie Guardian Project na Google Play</string>
-  <string name="wizard_tips_fdroid">Nájdite všetky aplikácie Guardian Project na F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Nájdite všetky aplikácie Guardian Project na https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentné proxy</string>
-  <string name="wizard_transproxy_msg">Toto umožní automaticky bežať vašim aplikáciám cez sieť Tor bez akéhokoľvek nastavenia.</string>
-  <string name="wizard_transproxy_hint">(ZaÅ¡krtnite toto pole, pokiaľ netušíte o Ä?om rozprávame)</string>
-  <string name="wizard_transproxy_none">Žiadny</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Povoliť Tor transparentné proxy pre zariadenia pripojené cez Wifi alebo USB (vyžaduje reštart)</string>
-  <string name="button_grant_superuser">Vyžiadať prístup Superpoužívateľa</string>
-  <string name="pref_select_apps">Vybrať aplikácie</string>
-  <string name="pref_select_apps_summary">Vybrať aplikácie, ktoré majú byť smerované cez Tor</string>
-  <string name="pref_node_configuration">Konfigurácia uzlu</string>
+    <!--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="button_proxy_all">VÅ¡etko cez proxy</string>
-  <string name="button_proxy_none">NiÄ? cez proxy</string>
-  <string name="button_invert_selection">Invertovať výber</string>
-  <string name="pref_proxy_title">Odchádzajúce sieťové proxy (voliteľné)</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>
@@ -145,20 +56,8 @@
   <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="status">Stav</string>
-  <string name="setting_up_full_transparent_proxying_">Nastavujem plne transparentné proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Nastavujem transparentné proxy založené na aplikáciách...</string>
-  <string name="transparent_proxying_enabled">Transparentné proxy POVOLEN�</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy povolené pre Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">VAROVANIE: chyba pri spúšťaní transparentného proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy pravidlá vymazané</string>
-  <string name="couldn_t_start_tor_process_">Nebolo možné spustiť Tor proces:</string>
-  <string name="privoxy_is_running_on_port_">Polipo beží na porte:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Nastavujem transparentné proxy založené na porte...</string>
-  <string name="bridge_error">Chyba premostenia</string>
-  <string name="bridge_requires_ip">Aby bolo možné použiÅ¥ funkciu premostení, musíte zadaÅ¥ IP adresu aspoÅ? jedného premostenia.</string>
-  <string name="send_email_for_bridges">Pošlite email na bridges@xxxxxxxxxxxxxx len s riadkom \"get bridges\" v tele správy v emaily z konta gmail.</string>
-  <string name="error">Chyba</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>
@@ -171,9 +70,7 @@
   <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="bridges_obfuscated">Maskované premostenia</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Povoliť ak nastavené premostenia sú maskované premostenia</string>
-  <string name="ip_address_and_port_of_bridges">IP adresy a porty premostení</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>
@@ -189,53 +86,27 @@
   <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_hidden_services">Skrytý hosting služby</string>
-  <string name="run_servers_accessible_via_the_tor_network">povoliť prístup zo siete Tor na server na tomto zariadení</string>
-  <string name="enter_localhost_ports_for_hidden_services">zadajte localhost porty pre skryté služby</string>
-  <string name="hidden_service_ports">Porty skrytých služieb</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresovateľný názov pre vaše skryté služby (vygenerovaný autimaticky)</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="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="the_tor_license">Licencia Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software tretích strán:</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="hidden_service_on">skrytá služba na:</string>
-  <string name="unable_to_read_hidden_service_name">nemožné preÄ?ítaÅ¥ názov skrytej služby</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="unable_to_reset_tor">Reštartujte vaše zariadenie, nemožné resetovať Tor!</string>
-  <string name="pref_use_sys_iptables_title">Použiť východzie IP tabulky</string>
-  <string name="pref_use_sys_iptables_summary">použiÅ¥ vstavané binárne balíÄ?ky IP tabuliek namiesto tých, ktoré poskytuje Orbot</string>
-  <string name="error_installing_binares">Binárne balíÄ?ky Tor nebolo možné nainÅ¡talovaÅ¥ alebo upgradovaÅ¥.</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">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="notification_using_bridges">Premostenia povolené!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jazyk</string>
-  <string name="set_locale_summary">Vyberte jazyk a lokalizáciu pre Orbot</string>
-  <string name="wizard_locale_title">Vyberte jazyk</string>
-  <string name="wizard_locale_msg">Ponechať východzí alebo prepnúť aktuálny jazyk</string>
-  <string name="powered_by">prevádzkované sieťou Tor</string>
-  <string name="btn_save_settings">Uložiť nastavenie</string>
-  <string name="no_internet_connection_tor">Žiadne pripojenie k internetu. Tor je v pohotovostnom režime...</string>
-  <string name="bandwidth_">Šírka pásma:</string>
-  <string name="down">dole</string>
-  <string name="up">hore</string>
-  <string name="pref_disable_network_title">Automatický spánok</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="menu_verify_browser">PrehliadaÄ?</string>
-  <string name="menu_use_chatsecure">Použiť ChatSecure</string>
-  <string name="permission_manage_tor_label">Spravovať Tor</string>
-  <string name="permission_manage_tor_description">Povoliť tejto aplikácií ovládať službu Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Žiadna možnosť pripojenia do siete. Uspávam Tor...</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>
@@ -250,19 +121,7 @@
   <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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Vaše verejné Tor IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Prosím deaktivujte túto aplikáciu na Android-&gt;Settings-&gt;Apps, ak máte problém s Orbot:</string>
-  <string name="app_conflict">Konflikt aplikácií</string>
-  <string name="pref_transproxy_refresh_title">Automatické obnovenie Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Opätovná aplikácia pravidiel Transproxy ak sa zmení stav siete</string>
-  <string name="pref_transproxy_flush_title">NASILU ODSTR�NIŤ Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Kliknite tu pre OKAMŽIT� zmazanie všetkých pravidiel siete transproxy</string>
-  <string name="transparent_proxy_rules_flushed_">Pravidlá Transproxy zmazané!</string>
-  <string name="you_do_not_have_root_access_enabled">Nemáte povolený ROOT prístup</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Možno budete musieť zastaviť a spustiť Orbot, aby sa aktivovali zmeny nastavení.</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,9 +135,7 @@
   <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="install_orweb">Inštalovať Orfox</string>
-  <string name="standard_browser">Východzí prehliadaÄ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">POZN�MKA: Na zariadeniach Intel X86/ATOM fungujú len štandardné Tor premostenia</string>
-  <string name="save">Uložiť</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>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 5a8d2d42..dfde7d65 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -1,85 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org/?lang=sl</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">zaÄ?ni in ustavi Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se zaganja...</string>
+    <string name="status_starting_up">Orbot se zaganja...</string>
   <string name="status_activated">Povezan v omrežje Tor</string>
   <string name="status_disabled">Orbot ni aktiviran</string>
   <string name="tor_process_starting">Zagon Tor klijenta...</string>
   <string name="tor_process_complete">konÄ?ano.</string>
-  <string name="tor_process_waiting">Ä?akam.</string>
-  <string name="not_anonymous_yet">POZOR: Vaš promet še ni anonimen! Prosimo, nastavite vaše aplikacije da uporabijo HTTP posredniški strežnik 127.0.0.1:8118 ali SOCKS4A ali SOCKS5 posredniški strežnik 127.0.0.1:9050</string>
-  <string name="menu_home">Glavni meni</string>
-  <string name="menu_browse">Brskaj</string>
-  <string name="menu_settings">Nastavitve</string>
+    <string name="menu_settings">Nastavitve</string>
   <string name="menu_log">Dnevnik</string>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="menu_start">ZaÄ?ni</string>
+    <string name="menu_start">ZaÄ?ni</string>
   <string name="menu_stop">Ustavi</string>
   <string name="menu_about">O programu</string>
   <string name="main_layout_download">Prenesi</string>
   <string name="main_layout_upload">Naloži</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zapri</string>
-  <string name="button_about">O programu</string>
-  <string name="button_clear_log">PoÄ?isti dnevnik</string>
-  <string name="menu_verify">Preveri</string>
-  <string name="menu_exit">Izhod</string>
-  <string name="press_to_start">- dolg pritisk za zaÄ?etek -</string>
-  <string name="pref_trans_proxy_group">Transparentno delovanje prek posredniškega strežnika (potrebuje root)</string>
-  <string name="pref_trans_proxy_title">Transparentno delovanje prek posredniškega strežnika</string>
-  <string name="pref_trans_proxy_summary">Samodejno preusmerjanje aplikacij preko Tor</string>
-  <string name="pref_transparent_all_title">Tor karkoli</string>
-  <string name="pref_transparent_all_summary">Posredovanje prometa za vse aplikacije preko Tor</string>
-  <string name="pref_transparent_port_fallback_title">Nadomestna posredniška vrata</string>
-  <string name="pref_transparent_port_fallback_summary">OPOZORILO: Obide skupne porte (80, 443, itd.) * UPORABI LE * v primeru Ä?e  \"Vsi\" ali \"App\" naÄ?in ne deluje.</string>
-  <string name="pref_transparent_port_title">Seznam vrat</string>
-  <string name="pref_transparent_port_summary">Seznam portov za posredniÅ¡ki strežnik. * UPORABI LE * v primeru Ä?e \"Vsi\" ali \"App\" naÄ?in ne deluje</string>
-  <string name="pref_transparent_port_dialog">Vnesi vrata za posredniški strežnik</string>
-  <string name="pref_has_root">Zahtevaj korenski dostop</string>
-  <string name="pref_has_root_summary">Zahtevaj korenski dostop za transparentno posredovanje</string>
-  <string name="status_install_success">Tor binarne datoteke so uspeÅ¡no nameÅ¡Ä?ene!</string>
-  <string name="status_install_fail">Ni bilo možno namestiti Tor binarnih datotek. Prosimo preverite log in obvestite tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Napaka v programu</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O programu Orbot</string>
-  <string name="btn_next">Naprej</string>
-  <string name="btn_back">Nazaj</string>
-  <string name="btn_finish">ZakljuÄ?i</string>
-  <string name="btn_okay">Potrdi</string>
+    <string name="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>
-  <string name="wizard_permissions_root">Dovoljenje dodeljeno</string>
-  <string name="wizard_permissions_stock">Orbot dovoljenja</string>
-  <string name="wizard_premissions_msg_root">OdliÄ?no! Ugotovili smo, da imate omogoÄ?eno root dovoljenje za Orbot. To moÄ? bomo modro uporabili.</string>
-  <string name="wizard_permissions_msg_stock">Ä?eprav to ni potrebno, lahko Orbot postane bolj zmogljivo orodje, Ä?e ima vaÅ¡a naprava korenski dostop. Uporabite spodnji gumb za odobritev Orbot velesile!</string>
-  <string name="wizard_permissions_no_root">Ä?e nimate korenski dostop ali nimate pojma o Ä?em je beseda, se le prepriÄ?ajte, da uporabljate aplikacije, narejene za delo z Orbot.</string>
-  <string name="wizard_permissions_consent">Razumem in želim nadaljevati kot Superuporabnik.</string>
-  <string name="wizard_permission_enable_root">Dodeli Root za Orbot</string>
-  <string name="wizard_proxy_help_info">Nastavitve posredniškega (proxy) strežnika</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Splošno</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Opozorilo</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Dovoljenja</string>
-  <!--TipsAndTricks screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Stanje</string>
-  <string name="error">Napaka</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jezik</string>
-  <string name="btn_save_settings">Shrani nastavitve</string>
-  <string name="menu_vpn">Aplikacije</string>
-  <string name="activate">Aktiviraj</string>
+    <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/src/main/res/values-sn/strings.xml b/app/src/main/res/values-sn/strings.xml
index 08498df8..247cd012 100644
--- a/app/src/main/res/values-sn/strings.xml
+++ b/app/src/main/res/values-sn/strings.xml
@@ -1,24 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="menu_home">Pekutangira</string>
-  <string name="menu_settings">Zvamada</string>
+    <string name="menu_settings">Zvamada</string>
   <string name="menu_stop">Mira</string>
   <string name="menu_about">Maererano</string>
-  <string name="button_close">Vhara</string>
-  <string name="button_about">Maererano</string>
+    <string name="button_about">Maererano</string>
   <string name="menu_exit">Buda</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Maererano Orbot</string>
-  <string name="btn_next">Tevedza</string>
-  <string name="btn_back">Dzokera shure</string>
-  <string name="btn_cancel">Kanzura</string>
+    <string name="btn_cancel">Kanzura</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Zvamada</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
@@ -26,8 +16,7 @@
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
   <string name="error">Paita kanganiso</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Mutauro</string>
+    <string name="set_locale_title">Mutauro</string>
   <string name="name">Zita</string>
   <string name="disable">Rambidza</string>
   <string name="enable">Bvumidza</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 4765e738..a54bdc79 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -2,53 +2,29 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">fillo dhe ndalo Orbot</string>
-  <string name="menu_home">Shpi</string>
-  <string name="menu_browse">Lundro</string>
-  <string name="menu_settings">Zgjedhjet</string>
-  <string name="menu_info">Ndihmë</string>
-  <string name="menu_start">Nisje</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_help">Ndihmë</string>
-  <string name="button_close">Mbylle</string>
-  <string name="button_about">Informacione</string>
+    <string name="button_about">Informacione</string>
   <string name="menu_exit">Dil</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Rreth Orbot</string>
-  <string name="btn_next">Vazhdo</string>
-  <string name="btn_back">Mbrapa</string>
-  <string name="btn_finish">Mbaroi</string>
-  <string name="btn_okay">Ne rregul</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>
-  <string name="wizard_permissions_root">Leja Garantohet</string>
-  <string name="wizard_permissions_stock">Lejet e Orbot</string>
-  <string name="wizard_proxy_help_info">Konfigurimi i Proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Të Përgjithshme</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Warning</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Asnjë</string>
-  <string name="status">Gjëndja</string>
-  <string name="error">Gabim</string>
+    <string name="error">Gabim</string>
   <string name="bridges">Urat</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Gjuhë</string>
-  <string name="btn_save_settings">Shpëto Konfigurmin</string>
-  <string name="bandwidth_">Banda:</string>
-  <string name="get_bridges_email">Email</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>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 7cb1e8b1..cb93b44e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Ð?Ñ?боÑ?</string>
   <string name="app_description">Ð?Ñ?боÑ? Ñ?е беÑ?плаÑ?на пÑ?окÑ?и апликаÑ?иÑ?а коÑ?а даÑ?е моÑ? дÑ?Ñ?гим апликаÑ?иÑ?ама да безбедниÑ?е коÑ?иÑ?Ñ?е инÑ?еÑ?неÑ?. Ð?Ñ?боÑ? коÑ?иÑ?Ñ?и ТоÑ? за Ñ?иÑ?Ñ?оваÑ?е ваÑ?ег инÑ?еÑ?неÑ? Ñ?аобÑ?аÑ?аÑ?а и онда га Ñ?кÑ?ива Ñ?лаÑ?ем кÑ?оз низ Ñ?аÑ?Ñ?наÑ?а Ñ?иÑ?ом Ñ?веÑ?а. ТоÑ? Ñ?е Ñ?лободан Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ?а помаже да Ñ?е одбÑ?аниÑ?е од Ñ?азниÑ? облика надзоÑ?а мÑ?ежа коÑ?и Ñ?гÑ?ожаваÑ?Ñ? лиÑ?нÑ? Ñ?лободÑ? и пÑ?иваÑ?ноÑ?Ñ?, повеÑ?Ñ?иве поÑ?ловне акÑ?ивноÑ?Ñ?и и лиÑ?не одноÑ?е и дÑ?жавне безбедноÑ?Ñ?и познаÑ?е као анализа Ñ?аобÑ?аÑ?аÑ?а.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">покÑ?ени и заÑ?Ñ?Ñ?ави Tor</string>
-  <string name="tor_proxy_service_process">ТоÑ? пÑ?окÑ?и Ñ?Ñ?лÑ?га</string>
-  <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е покÑ?еÑ?е...</string>
+    <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е покÑ?еÑ?е...</string>
   <string name="status_activated">Ð?овезан Ñ?а ТоÑ? мÑ?ежом</string>
   <string name="status_disabled">Ð?Ñ?боÑ? Ñ?е деакÑ?ивиÑ?ан</string>
   <string name="status_shutting_down">Ð?аÑ?еÑ?е ТоÑ? СеÑ?виÑ?а</string>
   <string name="tor_process_starting">Ð?окÑ?еÑ?е Ñ?е ТоÑ? клиÑ?енÑ?...</string>
   <string name="tor_process_complete">завÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">Ñ?екам.</string>
-  <string name="not_anonymous_yet">УÐ?Ð?Ð?Ð?РÐ?Ð?Ð?: Ð?аÑ? пÑ?омеÑ? Ñ?оÑ? ниÑ?е анониман! Ð?олимо ваÑ? да подеÑ?иÑ?е Ð?аÑ?е апликаÑ?иÑ?е да коÑ?иÑ?Ñ?е HTTP пÑ?окÑ?и 127.0.0.1:8118 или SOCKS4A или SOCKS5 пÑ?окÑ?и 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?оÑ?еÑ?на</string>
-  <string name="menu_browse">РазгледаÑ?е</string>
-  <string name="menu_settings">Ð?одеÑ?аваÑ?а</string>
+    <string name="menu_settings">Ð?одеÑ?аваÑ?а</string>
   <string name="menu_log">Ð?огови</string>
-  <string name="menu_info">Ð?омоÑ?</string>
-  <string name="menu_apps">Ð?пликаÑ?иÑ?е ...</string>
-  <string name="menu_start">Ð?Ñ?ени</string>
+    <string name="menu_start">Ð?Ñ?ени</string>
   <string name="menu_stop">Ð?аÑ?Ñ?Ñ?ави</string>
   <string name="menu_about">Ð? нама</string>
-  <string name="menu_promo_apps">Ð?Ñ?еÑ?зми апликаÑ?иÑ?е</string>
-  <string name="main_layout_download">Ð?Ñ?еÑ?зимаÑ?е</string>
+    <string name="main_layout_download">Ð?Ñ?еÑ?зимаÑ?е</string>
   <string name="main_layout_upload">Ð?Ñ?пÑ?емаÑ?е</string>
-  <string name="button_help">Ð?омоÑ?</string>
-  <string name="button_close">Ð?аÑ?воÑ?и</string>
-  <string name="button_about">Ð? нама</string>
-  <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?и логове</string>
-  <string name="menu_verify">Ð?Ñ?овеÑ?и</string>
-  <string name="menu_exit">Ð?злаз</string>
+    <string name="button_about">Ð? нама</string>
+    <string name="menu_exit">Ð?злаз</string>
   <string name="menu_scan">СкениÑ?аÑ? BridgeQR</string>
   <string name="menu_share_bridge">Ð?одели BridgeQR</string>
-  <string name="press_to_start">- задÑ?жиÑ?е дÑ?жи пÑ?иÑ?иÑ?ак  за поÑ?еÑ?ак -</string>
-  <string name="pref_trans_proxy_group">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е (заÑ?Ñ?ева root пÑ?иÑ?Ñ?Ñ?п)</string>
-  <string name="pref_trans_proxy_title">ТÑ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и</string>
-  <string name="pref_trans_proxy_summary">Ð?Ñ?Ñ?омаÑ?Ñ?ко Ñ?оÑ?иÑ?иÑ?иÑ?аÑ?е апликаÑ?иÑ?а</string>
-  <string name="pref_transparent_all_title">ТоÑ?оÑ?икÑ?Ñ? Ñ?ве</string>
-  <string name="pref_transparent_all_summary">Ð?Ñ?оÑ?леди пÑ?омеÑ? од Ñ?виÑ? апликаÑ?иÑ?а кÑ?оз ТоÑ?</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?ван поÑ?Ñ? пÑ?окÑ?иÑ?а</string>
-  <string name="pref_transparent_port_fallback_summary">УÐ?Ð?Ð?Ð?РÐ?Ð?Ð?: Ð?аобилажеÑ?е Ñ?еÑ?Ñ?иÑ? поÑ?Ñ?ова (80, 443 иÑ?д). Ð?Ð?РÐ?СТÐ?ТÐ? СÐ?Ð?Ð? ако подеÑ?аваÑ?а на \"Све\" или \"Ð?пликаÑ?иÑ?а\" не Ñ?аде.</string>
-  <string name="pref_transparent_port_title">Ð?иÑ?Ñ?а поÑ?Ñ?ова</string>
-  <string name="pref_transparent_port_summary">Ð?иÑ?Ñ?а поÑ?Ñ?ова за пÑ?окÑ?и. Ð?оÑ?иÑ?Ñ?иÑ?и СÐ?Ð?Ð? ако опÑ?иÑ?е \"Све\" или \"Ð?пликаÑ?иÑ?е\" не Ñ?аде.</string>
-  <string name="pref_transparent_port_dialog">УпиÑ?иÑ?е поÑ?Ñ?ове за пÑ?оÑ?леÑ?иваÑ?е на пÑ?окÑ?и</string>
-  <string name="pref_has_root">Ð?аÑ?Ñ?ажи root пÑ?иÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?аÑ?Ñ?ажи root пÑ?иÑ?Ñ?Ñ?п за Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="status_install_success">ТоÑ? бинаÑ?и Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ани!</string>
-  <string name="status_install_fail">Ð?инаÑ?не ТоÑ? даÑ?оÑ?еке ниÑ?Ñ? Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ане. Ð?олимо пÑ?егледаÑ?Ñ?е логове и обавеÑ?Ñ?иÑ?е наÑ? на tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?еÑ?ка Ñ? апликаÑ?иÑ?и</string>
-  <string name="wizard_title">Ð?Ñ?боÑ?</string>
-  <string name="wizard_btn_tell_me_more">Ð?нÑ?оÑ?маÑ?иÑ?е о Ð?Ñ?боÑ?Ñ?</string>
-  <string name="btn_next">СледеÑ?е</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?авÑ?Ñ?и</string>
-  <string name="btn_okay">У Ñ?едÑ?</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Ð?озвола одобÑ?ена</string>
-  <string name="wizard_permissions_stock">Ð?Ñ?боÑ? дозволе</string>
-  <string name="wizard_premissions_msg_root">Ð?длиÑ?но! Ð?еÑ?екÑ?овали Ñ?мо да имаÑ?е root дозволе за Ð?Ñ?боÑ?. Ð?Ñ?дÑ?о Ñ?емо иÑ?кÑ?оÑ?иÑ?Ñ?иÑ?и овÑ? моÑ?.</string>
-  <string name="wizard_permissions_msg_stock">Ð?ако ниÑ?е заÑ?Ñ?евано, Ð?Ñ?боÑ? поÑ?Ñ?аÑ?е много Ñ?аÑ?и алаÑ? ако Ð?аÑ? Ñ?Ñ?еÑ?аÑ? има root пÑ?иÑ?Ñ?Ñ?п. Ð?оÑ?иÑ?Ñ?иÑ?е дÑ?гме иÑ?под да биÑ?Ñ?е омогÑ?Ñ?или Ð?Ñ?боÑ?Ñ? Ñ?Ñ?пеÑ? моÑ?и.</string>
-  <string name="wizard_permissions_no_root">Ð?ко немаÑ?е root пÑ?иÑ?Ñ?Ñ?п или немаÑ?е поÑ?ма о Ñ?емÑ? пÑ?иÑ?амо, Ñ?амо Ñ?е побÑ?иниÑ?е да коÑ?иÑ?Ñ?иÑ?е апликаÑ?иÑ?е коÑ?е Ñ?Ñ? напÑ?авÑ?ене да Ñ?Ñ?нкÑ?иониÑ?Ñ? Ñ?а Ð?Ñ?боÑ?ом.</string>
-  <string name="wizard_permissions_consent">РазÑ?мем и желео биÑ? да наÑ?Ñ?авим без root пÑ?иÑ?Ñ?Ñ?па</string>
-  <string name="wizard_permission_enable_root">Ð?озволи root за Ð?Ñ?боÑ?</string>
-  <string name="wizard_configure">Ð?одеÑ?и Ñ?оÑ?иÑ?икаÑ?иÑ?Ñ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?боÑ? Ð?ам даÑ?е опÑ?иÑ?Ñ? да пÑ?оÑ?ледиÑ?е Ñ?ав пÑ?омеÑ? од Ñ?Ñ?Ñ?ане Ñ?виÑ? апликаÑ?иÑ?а или да изабеÑ?еÑ?е поÑ?ебно апликаÑ?иÑ?е коÑ?е желиÑ?е да пÑ?оÑ?ледиÑ?е кÑ?оз ТоÑ? мÑ?ежÑ?.</string>
-  <string name="wizard_configure_all">Ð?оÑ?аÑ?и пÑ?омеÑ? од Ñ?виÑ? апликаÑ?иÑ?а кÑ?оз ТоÑ?</string>
-  <string name="wizard_configure_select_apps">Ð?знаÑ?и поÑ?ебно апликаÑ?иÑ?е Ñ?иÑ?и Ñ?е Ñ?е пÑ?омеÑ? пÑ?оÑ?ледиÑ?и кÑ?оз ТоÑ?</string>
-  <string name="wizard_tips_tricks">Ð?Ñ?боÑ?-омогÑ?Ñ?ене Ð?пликаÑ?иÑ?е</string>
-  <string name="wizard_tips_msg">Ð?пликаÑ?иÑ?е наведене иÑ?под Ñ?Ñ? Ñ?азвиÑ?ене да би Ñ?адиле Ñ?а Ð?Ñ?боÑ?ом. Ð?ликниÑ?е Ñ?вако дÑ?гме коÑ?е желиÑ?е Ñ?ада да инÑ?Ñ?алиÑ?аÑ?е, а Ñ? Ñ?Ñ?пÑ?оÑ?ном иÑ? можеÑ?е пÑ?онаÑ?и и Ñ? Google Play пÑ?одавниÑ?и, на GuardianProject.info веб Ñ?Ñ?Ñ?аниÑ?и или пÑ?еко F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?езбедне инÑ?Ñ?анÑ? поÑ?Ñ?ке за Ð?ндÑ?оид</string>
-  <string name="wizard_tips_proxy">Ð?Ñ?окÑ?и поÑ?Ñ?авке - Ð?аÑ?Ñ?иÑ?е како да подеÑ?иÑ?е апликаÑ?иÑ?е да Ñ?аде Ñ?а Ð?Ñ?боÑ?ом</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo апликаÑ?иÑ?а за пÑ?еÑ?Ñ?аживаÑ?е инÑ?еÑ?неÑ?а</string>
-  <string name="wizard_tips_twitter">Ð?одеÑ?иÑ?е ТвиÑ?еÑ? да коÑ?иÑ?Ñ?и поÑ?Ñ? 8118 на локалном Ñ?оÑ?Ñ?Ñ?.</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Ð?апÑ?ави пÑ?иÑ?Ñ? и оÑ?Ñ?ави Ñ?е ТоÑ?-Ñ? на Ñ?игÑ?ном!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?Ñ?окÑ?и подеÑ?аваÑ?а</string>
-  <string name="wizard_proxy_help_msg">Уколико Ð?ндÑ?оид апликаÑ?иÑ?а, коÑ?Ñ? коÑ?иÑ?Ñ?иÑ?е, може подÑ?жаÑ?и Ñ?поÑ?Ñ?ебÑ?  HTTP или SOCKS пÑ?окÑ?иÑ?а, онда Ñ?е можеÑ?е подеÑ?иÑ?и да Ñ?е конекÑ?Ñ?Ñ?е пÑ?еко ТоÑ?-а.\n\n\n Ð?ost подеÑ?аваÑ?е Ñ?е 127.0.0.1 или \'\'localhost\'\'. Ð?а  HTTP поÑ?Ñ? Ñ?е 8118. Ð?а SOCKS пÑ?окÑ?и Ñ?е 9050. ТÑ?ебало би коÑ?иÑ?Ñ?иÑ?и SOCKS4A или SOCKS5 Ñ?колико Ñ?Ñ? могÑ?Ñ?и.\n \n\n\n Ð?ожеÑ?е Ñ?азнаÑ?и виÑ?е о пÑ?окÑ?и подеÑ?аваÑ?има на Ð?ндÑ?оидÑ?  пÑ?еко FAQ на: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Ð?Ñ?боÑ? Ñ?е Ñ?пÑ?еман!</string>
-  <string name="wizard_final_msg">Ð?илиони Ñ?Ñ?ди Ñ?иÑ?ом Ñ?веÑ?а коÑ?иÑ?Ñ?е ТоÑ? из великог бÑ?оÑ?а Ñ?азлога.\n\nÐ?овинаÑ?и, блогеÑ?и, бÑ?аниоÑ?и Ñ?Ñ?дÑ?киÑ? пÑ?ава, оÑ?гани влаÑ?Ñ?и, воÑ?ниÑ?и, коÑ?поÑ?аÑ?иÑ?е, жиÑ?еÑ?и Ñ?епÑ?еÑ?ивниÑ? Ñ?ежима, баÑ? као и обиÑ?ни гÑ?аÑ?ани... и Ð?и Ñ?Ñ?е Ñ?ада Ñ? могÑ?Ñ?ноÑ?Ñ?и, Ñ?акоÑ?е!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?олимо подеÑ?иÑ?е Ð?Ñ?боÑ? пÑ?е коÑ?иÑ?Ñ?еÑ?а.</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">УÑ?пеÑ?но Ñ?Ñ?е повезани на ТоÑ? мÑ?ежÑ? - али Ñ?о Ð?Ð? Ð?Ð?Ð?ЧÐ? да Ñ?е ваÑ? Ñ?Ñ?еÑ?аÑ? безбедан. Ð?ожеÑ?е коÑ?иÑ?Ñ?иÑ?и \'Ð?Ñ?еÑ?Ñ?аживаÑ?\' дÑ?гме за Ñ?еÑ?Ñ?иÑ?аÑ?е конекÑ?иÑ?е. \n\nÐ?оÑ?еÑ?иÑ?е наÑ? на https://guardianproject.info/apps/orbot или поÑ?аÑ?иÑ?е email на help@xxxxxxxxxxxxxxxxxxxx за даÑ?е Ñ?Ñ?авÑ?Ñ?аваÑ?е.</string>
-  <string name="tor_check">Ð?во Ñ?е оÑ?воÑ?иÑ?и Ð?аÑ? веб пÑ?еÑ?Ñ?аживаÑ? и поÑ?еÑ?иÑ?и Ñ?Ñ?Ñ?аниÑ?Ñ? https://check.torproject.org да би пÑ?овеÑ?или да ли Ñ?е Ð?Ñ?боÑ? пÑ?авилно подеÑ?ен и да ли Ñ?Ñ?е Ñ?поÑ?ени Ñ?а ТоÑ? мÑ?ежом.</string>
-  <string name="pref_hs_group">ХоÑ?Ñ?инг на Ñ?кÑ?ивеном Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="pref_general_group">Ð?пÑ?Ñ?е</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-->
-  <string name="wizard_title_msg">Ð?Ñ?боÑ? Ñ?е ТоÑ? на Ð?ндÑ?оидÑ?!\n\nТоÑ? Ð?ам помаже Ñ? одбÑ?ани од Ñ?илÑ?Ñ?иÑ?аÑ?а Ñ?адÑ?жаÑ?а, анализе подаÑ?ака и поÑ?маÑ?Ñ?аÑ?а инÑ?еÑ?неÑ? мÑ?еже Ñ?Ñ?о доводи до Ñ?гÑ?ожаваÑ?а пÑ?иваÑ?ноÑ?Ñ?и, повеÑ?Ñ?ивиÑ? инÑ?оÑ?маÑ?иÑ?а и лиÑ?ниÑ? одноÑ?а.\n\nÐ?ваÑ? Ñ?аÑ?обÑ?ак помаже да подеÑ?иÑ?е Ð?Ñ?боÑ? и ТоÑ? на ваÑ?ем Ñ?Ñ?еÑ?аÑ?Ñ?.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">УпозоÑ?еÑ?е</string>
-  <string name="wizard_warning_msg">Ð?едноÑ?Ñ?авно инÑ?Ñ?алиÑ?аÑ?е Ð?Ñ?боÑ?а неÑ?е аÑ?Ñ?омаÑ?Ñ?ки Ñ?Ñ?иниÑ?и анонимним инÑ?еÑ?неÑ? Ñ?аобÑ?аÑ?аÑ? ваÑ?ег Ñ?елеÑ?она.\n\nÐ?оÑ?аÑ?е пÑ?во пÑ?авилно подеÑ?иÑ?и Ð?Ñ?боÑ?, ваÑ? Ñ?Ñ?еÑ?аÑ? и оÑ?Ñ?але апликаÑ?иÑ?е како би Ñ?Ñ?е Ñ?Ñ?пеÑ?но коÑ?иÑ?Ñ?или ТоÑ?.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?озволе</string>
-  <string name="wizard_permissions_root_msg1">Ð?ожеÑ?е опÑ?ионално дозволиÑ?и Ð?Ñ?боÑ?Ñ? пÑ?иÑ?Ñ?Ñ?п као \"СÑ?пеÑ? коÑ?иÑ?ник\" да би омогÑ?Ñ?или напÑ?едне Ñ?Ñ?нкÑ?иÑ?е као Ñ?Ñ?о Ñ?е Ñ?Ñ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и.</string>
-  <string name="wizard_permissions_root_msg2">Ð?ко не желиÑ?е ово да Ñ?Ñ?адиÑ?е, молимо Ð?аÑ? да Ñ?е Ñ?веÑ?иÑ?е да коÑ?иÑ?Ñ?иÑ?е апликаÑ?иÑ?е коÑ?е Ñ?Ñ? подеÑ?ене да Ñ?аде Ñ?а Ð?Ñ?боÑ?ом.</string>
-  <string name="wizard_permissions_no_root_msg">Ð?згледа да ваÑ? Ñ?Ñ?еÑ?аÑ? ниÑ?е Ñ?Ñ?Ñ?ован или допÑ?иноÑ?и Ñ?Ñ?Ñ?оваÑ?Ñ? или СÑ?пеÑ?коÑ?иÑ?ниÑ?ком пÑ?иÑ?Ñ?Ñ?пÑ?.\n\nУмеÑ?Ñ?о Ñ?ога, молимо, покÑ?Ñ?аÑ?Ñ?е \'Apps\' Ñ?ежим на поÑ?еÑ?ном екÑ?анÑ?.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?пликаÑ?иÑ?е Ñ?а омогÑ?Ñ?еним Ð?Ñ?боÑ?ом.</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ð?пликаÑ?иÑ?а за Ñ?игÑ?Ñ?но Ñ?аÑ?каÑ?е Ñ?а Ð?еÑ?егиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?им Ð?овеÑ?Ñ?ивим Ð?одиÑ?аÑ?ем</string>
-  <string name="wizard_tips_orweb">Orfox: СигÑ?Ñ?оноÑ?о-побоÑ?Ñ?ани пÑ?еÑ?Ñ?аживаÑ? коÑ?и Ñ?ади кÑ?оз ТоÑ?</string>
-  <string name="wizard_tips_play">Ð?Ñ?онаÑ?иÑ?е Ñ?ве Guardian Project апликаÑ?иÑ?е на Google Play Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="wizard_tips_fdroid">Ð?Ñ?онаÑ?и Ñ?ве Guardian Project апликаÑ?иÑ?е на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?Ñ?онаÑ?и Ñ?ве Guardian Project апликаÑ?иÑ?е на https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">ТÑ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и</string>
-  <string name="wizard_transproxy_msg">Ð?во омогÑ?Ñ?ава Ð?аÑ?им апликаÑ?иÑ?ама да аÑ?Ñ?омаÑ?Ñ?ки пÑ?еÑ?Ñ?меÑ?аваÑ?Ñ? пÑ?омеÑ? кÑ?оз ТоÑ? мÑ?ежÑ? без икакве конÑ?игÑ?Ñ?аÑ?иÑ?е.</string>
-  <string name="wizard_transproxy_hint">(Ð?знаÑ?иÑ?е оваÑ? квадÑ?аÑ?иÑ? ако немаÑ?е поÑ?ма о Ñ?емÑ? пÑ?иÑ?амо)</string>
-  <string name="wizard_transproxy_none">Ð?иÑ?едан</string>
-  <string name="pref_transparent_tethering_title">Ð?Ñ?ивезиваÑ?е Ñ?оÑ?а</string>
-  <string name="pref_transparent_tethering_summary">Ð?могÑ?Ñ?ава ТоÑ?ово Ñ?Ñ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и за бежиÑ?не и УСÐ? повезиваÑ?Ñ?Ñ?е Ñ?Ñ?еÑ?аÑ?е (заÑ?Ñ?ева Ñ?еÑ?Ñ?аÑ?Ñ?оваÑ?е)</string>
-  <string name="button_grant_superuser">Ð?аÑ?Ñ?ажи пÑ?иÑ?Ñ?Ñ?п као \'Superuser\'</string>
-  <string name="pref_select_apps">Ð?забеÑ?иÑ?е апликаÑ?иÑ?е</string>
-  <string name="pref_select_apps_summary">Ð?забеÑ?иÑ?е апликаÑ?иÑ?е Ñ?иÑ?и пÑ?омеÑ? Ñ?еÑ?е пÑ?оÑ?ледиÑ?и кÑ?оз ТоÑ?</string>
-  <string name="pref_node_configuration">Ð?онÑ?игÑ?Ñ?аÑ?иÑ?а Ñ?воÑ?ова</string>
+    <!--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="button_proxy_all">Ð?Ñ?окÑ?и Све</string>
-  <string name="button_proxy_none">Ð?Ñ?окÑ?и Ð?иÑ?еднÑ?</string>
-  <string name="button_invert_selection">Ð?бÑ?нÑ?Ñ?а СелекÑ?иÑ?а</string>
-  <string name="pref_proxy_title">Ð?Ñ?ежни пÑ?окÑ?и за одлазеÑ?и пÑ?омеÑ? (Ð?еобавезно)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">ШиÑ?Ñ?а на пÑ?окÑ?иÑ?Ñ? за одлазеÑ?и пÑ?омеÑ?</string>
   <string name="pref_proxy_password_summary">ШиÑ?Ñ?а пÑ?окÑ?иÑ?а (необавезно)</string>
   <string name="pref_proxy_password_dialog">УнеÑ?иÑ?е Ñ?иÑ?Ñ?Ñ? пÑ?окÑ?иÑ?а</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?оÑ?Ñ?авÑ?аÑ?е поÑ?пÑ?но Ñ?Ñ?апÑ?паÑ?енÑ?ног Ñ?лаÑ?а кÑ?оз пÑ?окÑ?и</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?одеÑ?аваÑ?е Ñ?Ñ?апÑ?паÑ?енÑ?ног пÑ?окÑ?иÑ?а од Ñ?Ñ?Ñ?ане апликаÑ?иÑ?е</string>
-  <string name="transparent_proxying_enabled">ТÑ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и Ñ?е Ð?Ð?Ð?Ð?УÐ?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Ñ?е омогÑ?Ñ?ен за пÑ?ивезиваÑ?е</string>
-  <string name="warning_error_starting_transparent_proxying_">УÐ?Ð?Ð?Ð?РÐ?Ð?Ð?: гÑ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?анÑ?паÑ?енÑ?ног Ñ?лаÑ?а кÑ?оз пÑ?окÑ?и!</string>
-  <string name="transproxy_rules_cleared">TransProxy пÑ?авила оÑ?иÑ?Ñ?ена</string>
-  <string name="couldn_t_start_tor_process_">Ð?иÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и ТоÑ? пÑ?оÑ?еÑ?:</string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?е покÑ?енÑ?Ñ? на поÑ?Ñ?Ñ?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?одеÑ?аваÑ?е Ñ?Ñ?анÑ?паÑ?енÑ?ног пÑ?окÑ?иÑ?аÑ?а од Ñ?Ñ?Ñ?ане поÑ?Ñ?а...</string>
-  <string name="bridge_error">Ð?Ñ?еÑ?ка Ñ? моÑ?Ñ?Ñ?</string>
-  <string name="bridge_requires_ip">Ð?а биÑ?Ñ?е коÑ?иÑ?Ñ?или bridge могÑ?Ñ?ноÑ?Ñ?, моÑ?аÑ?е Ñ?неÑ?и баÑ? Ñ?еднÑ? bridge IP адÑ?еÑ?Ñ?.</string>
-  <string name="send_email_for_bridges">Ð?оÑ?аÑ?иÑ?е меÑ?л на bridges@xxxxxxxxxxxxxx Ñ?а Ñ?еÑ?има \"get bridges\" Ñ? Ñ?екÑ?Ñ?Ñ? поÑ?Ñ?ке меÑ?ла Ñ?а gmail коÑ?иÑ?ниÑ?ког Ñ?аÑ?Ñ?на.</string>
-  <string name="error">Ð?Ñ?еÑ?ка</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Ð?оÑ?иÑ?Ñ?и СÐ?Ð?Ð? ове наведене Ñ?воÑ?ове</string>
   <string name="bridges">Ð?оÑ?Ñ?ови</string>
   <string name="use_bridges">Ð?оÑ?иÑ?Ñ?и bridge</string>
-  <string name="bridges_obfuscated">Ð?оÑ?Ñ?ови Ñ?а bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?могÑ?Ñ?иÑ?е алÑ?еÑ?наÑ?ивне Ñ?лазе Ñ? ТоÑ? мÑ?ежÑ?</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?могÑ?Ñ?иÑ?и ако Ñ?Ñ? конÑ?игÑ?Ñ?иÑ?ани моÑ?Ñ?ови моÑ?Ñ?ови Ñ?а баговима</string>
-  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ?а и поÑ?Ñ? bridge-а</string>
+    <string name="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>
@@ -192,54 +88,28 @@
   <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пни поÑ?Ñ?ови</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?ови доÑ?Ñ?Ñ?пни иза Ñ?еÑ?Ñ?Ñ?икÑ?ивног firewall-а</string>
   <string name="enter_ports">УнеÑ?иÑ?е поÑ?Ñ?ове</string>
-  <string name="enable_hidden_services">ХоÑ?Ñ?инг на Ñ?кÑ?ивеном Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="run_servers_accessible_via_the_tor_network">дозволиÑ?е Ñ?еÑ?веÑ?Ñ? на Ñ?Ñ?еÑ?аÑ?Ñ? да бÑ?де доÑ?Ñ?Ñ?пан пÑ?еко ТоÑ? мÑ?еже</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ñ?неÑ?иÑ?е localhost поÑ?Ñ?ове за Ñ?кÑ?ивене Ñ?еÑ?виÑ?е</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?ови на Ñ?кÑ?ивеном Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адÑ?еÑ?абилно име за Ð?аÑ? Ñ?кÑ?ивени Ñ?еÑ?виÑ? (генеÑ?иÑ?е Ñ?е аÑ?Ñ?омаÑ?Ñ?ко)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">омогÑ?Ñ?иÑ?е debug логовоаÑ?е (моÑ?а Ñ?е коÑ?иÑ?Ñ?иÑ?и adb или aLogCat да би Ñ?е пÑ?егледали)</string>
+    <string name="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="the_tor_license">ТоÑ? лиÑ?енÑ?а</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">СоÑ?Ñ?веÑ? од Ñ?Ñ?Ñ?ане неÑ?лÑ?жбениÑ? издаваÑ?а:</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="hidden_service_on">Ñ?акÑ?ивен Ñ?еÑ?виÑ? на:</string>
-  <string name="unable_to_read_hidden_service_name">ниÑ?ам Ñ? могÑ?Ñ?ноÑ?Ñ?и да пÑ?оÑ?иÑ?ам име Ñ?акÑ?ивеног Ñ?еÑ?виÑ?а</string>
+    <string name="unable_to_read_hidden_service_name">ниÑ?ам Ñ? могÑ?Ñ?ноÑ?Ñ?и да пÑ?оÑ?иÑ?ам име Ñ?акÑ?ивеног Ñ?еÑ?виÑ?а</string>
   <string name="unable_to_start_tor">ТоÑ? ниÑ?е Ñ? могÑ?Ñ?ноÑ?Ñ?и да Ñ?е покÑ?ене:</string>
-  <string name="unable_to_reset_tor">РеÑ?Ñ?аÑ?Ñ?Ñ?Ñ? Ñ?Ñ?еÑ?аÑ?, немогÑ?Ñ?е Ñ?еÑ?еÑ?оваÑ?и ТоÑ?</string>
-  <string name="pref_use_sys_iptables_title">Ð?оÑ?иÑ?Ñ?иÑ?и Ñ?обиÑ?аÑ?ене Ð?пÑ?абеле</string>
-  <string name="pref_use_sys_iptables_summary">коÑ?иÑ?Ñ?и Ñ?гÑ?аÑ?ене Ð?Ð?Ñ?абеле Ñ?меÑ?Ñ?о ониÑ? коÑ?е долазе Ñ?а Ð?Ñ?боÑ?ом</string>
-  <string name="error_installing_binares">ТоÑ? бинаÑ?и ниÑ?Ñ? Ñ? могÑ?Ñ?ноÑ?Ñ?и да Ñ?е инÑ?Ñ?алиÑ?аÑ?Ñ? или надогÑ?аде.</string>
-  <string name="pref_use_persistent_notifications">Увек пÑ?икажи иконÑ? Ñ? Ñ?Ñ?лбаÑ?Ñ? када Ñ?е Ð?Ñ?боÑ? конекÑ?ован</string>
+    <string name="pref_use_persistent_notifications">Увек пÑ?икажи иконÑ? Ñ? Ñ?Ñ?лбаÑ?Ñ? када Ñ?е Ð?Ñ?боÑ? конекÑ?ован</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="notification_using_bridges">Ð?оÑ?Ñ?ови омогÑ?Ñ?ени!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ð?език</string>
-  <string name="set_locale_summary">Ð?забеÑ?иÑ?е локална и Ñ?езиÑ?ка подеÑ?аваÑ?а за Ð?Ñ?боÑ?</string>
-  <string name="wizard_locale_title">Ð?забеÑ?иÑ?е Ñ?език</string>
-  <string name="wizard_locale_msg">Ð?оÑ?иÑ?Ñ?и подÑ?азÑ?меваÑ?Ñ?Ñ?и или пÑ?ебаÑ?и на Ñ?Ñ?енÑ?Ñ?ни Ñ?език</string>
-  <string name="powered_by">покÑ?еÑ?е га ТоÑ?</string>
-  <string name="btn_save_settings">СаÑ?Ñ?ваÑ? подеÑ?аваÑ?а</string>
-  <string name="no_internet_connection_tor">Ð?ема инÑ?еÑ?неÑ? конекÑ?иÑ?е; ТоÑ? Ñ?е Ñ? миÑ?оваÑ?Ñ?...</string>
-  <string name="bandwidth_">Ð?Ñ?оÑ?ок:</string>
-  <string name="down">доле</string>
-  <string name="up">гоÑ?е</string>
-  <string name="pref_disable_network_title">Ð?ез Ð?Ñ?еже Auto-Sleep</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="menu_verify_browser">Ð?Ñ?еÑ?Ñ?аживаÑ?</string>
-  <string name="menu_use_chatsecure">Ð?оÑ?иÑ?Ñ?и СигÑ?Ñ?ноÐ?аÑ?каÑ?е</string>
-  <string name="permission_manage_tor_label">УпÑ?авÑ?аÑ?е ТоÑ?-ом</string>
-  <string name="permission_manage_tor_description">Ð?могÑ?Ñ?и апликаÑ?иÑ?и конÑ?Ñ?олÑ? над ТоÑ? Ñ?еÑ?виÑ?ом</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ð?Ñ?боÑ? Ñ?ади наÑ?боÑ?е Ñ?а Orfox пÑ?еÑ?Ñ?аживаÑ? Ð?нÑ?Ñ?алиÑ?аÑ?Ñ?е Ñ?ада?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ð?Ñ?боÑ? Ñ?ади наÑ?боÑ?е Ñ?а Orfox пÑ?еÑ?Ñ?аживаÑ? Ð?нÑ?Ñ?алиÑ?аÑ?Ñ?е Ñ?ада?</string>
   <string name="install_apps_">Ð?нÑ?Ñ?алиÑ?аÑ? пÑ?еÑ?Ñ?аживаÑ??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?ема инÑ?еÑ?неÑ? конекÑ?иÑ?е. УмиÑ?иваÑ?е ТоÑ?-а...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Ð?онекÑ?иÑ?а Ñ?е добÑ?а. Ð?живÑ?аваÑ?е ТоÑ?-а...</string>
@@ -256,19 +126,7 @@
   <string name="pref_torrc_title">Torrc Ð?Ñ?еÑ?аÑ?ена Ð?одеÑ?аваÑ?а</string>
   <string name="pref_torrc_summary">СÐ?Ð?Ð? Ð?Ð? Ð?Ð?СÐ?Ð?РТÐ?: Ñ?неÑ?и диÑ?екÑ?но torrc линиÑ?е подеÑ?аваÑ?а</string>
   <string name="pref_torrc_dialog">Ð?одеÑ?и Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech-ова Ð?окÑ?менÑ?аÑ?иона Ð?пликаÑ?иÑ?а за Ð?Ñ?дÑ?ка Ð?Ñ?ава</string>
-  <string name="your_tor_public_ips_">Ð?аÑ?и Ð?авни ТоÑ? IP-ови:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?олимо да онемогÑ?Ñ?иÑ?е овÑ? апликаÑ?иÑ?Ñ? на Ð?ндÑ?оидÑ?-&gt;Settings-&gt;Apps Ñ?колико имаÑ?е пÑ?облема Ñ?а Ð?Ñ?боÑ?-ом: </string>
-  <string name="app_conflict">Ð?онÑ?ликÑ? Ð?пликаÑ?иÑ?а</string>
-  <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string>
-  <string name="pref_transproxy_refresh_summary">Ð?Ñ?имениÑ?и поново Transproxy пÑ?авила када доÑ?е до пÑ?омене Ñ?Ñ?аÑ?а мÑ?еже</string>
-  <string name="pref_transproxy_flush_title">Transproxy ФÐ?РСÐ?РÐ?ТÐ? УÐ?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="pref_transproxy_flush_summary">Ð?ликниÑ?е овде за пÑ?оÑ?ок Ñ?виÑ? transproxy мÑ?ежниÑ? пÑ?авила СÐ?Ð?Ð?</string>
-  <string name="transparent_proxy_rules_flushed_">ТÑ?анÑ?пÑ?енÑ?на пÑ?авила proxy-Ñ?а пÑ?оÑ?еÑ?ена!</string>
-  <string name="you_do_not_have_root_access_enabled">Ð?емаÑ?е ROOT пÑ?иÑ?Ñ?Ñ?п Ñ?кÑ?Ñ?Ñ?ен</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?ожда Ñ?е биÑ?и поÑ?Ñ?ебно да Ñ?Ñ?опиÑ?аÑ?е и покÑ?енеÑ?е поново Ð?Ñ?боÑ? да би пÑ?омене Ñ? подеÑ?аваÑ?има имале еÑ?екÑ?а.</string>
-  <string name="menu_vpn">Ð?пликаÑ?иÑ?е</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -281,19 +139,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">Ð?кÑ?ивиÑ?аÑ?и</string>
   <string name="apps_mode">VPN Ð?од</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?ожеÑ?е омогÑ?Ñ?иÑ?и апликаÑ?иÑ?ама да пÑ?оÑ?еÑ?е кÑ?оз ТоÑ? помоÑ?Ñ? Ñ?гÑ?аÑ?еног Orbot VPN.Ð?еÑ?еÑ?е биÑ?и Ð?нониман веÑ? Ñ?е вам помоÑ?и да пÑ?оÑ?еÑ?е кÑ?оз заÑ?Ñ?иÑ?не зидове.</string>
-  <string name="send_email">Ð?оÑ?аÑ?и Ð?-поÑ?Ñ?Ñ?</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Ð?едном када добиÑ?еÑ?е адÑ?еÑ?Ñ?. копиÑ?аÑ?&amp; налепи Ñ?е Ñ? \"Bridges\" пÑ?еÑ?еÑ?енÑ?иÑ?и Ñ? Ð?Ñ?боÑ? подеÑ?аваÑ?има и поново покÑ?ениÑ?е.</string>
   <string name="install_orweb">Ð?нÑ?Ñ?алиÑ?аÑ?и Ð?Ñ?Ñ?окÑ?</string>
-  <string name="standard_browser">СÑ?андаÑ?дни Ð?Ñ?еÑ?Ñ?аживаÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?Ð?Ð?Ð?ШÐ?Ð?: Ð?едино Ñ?Ñ?андаÑ?дни ТоÑ? bridge-ви Ñ?аде на Intel X86/ATOM Ñ?Ñ?еÑ?аÑ?има</string>
-  <string name="vpn_default_world">Ð?лобално (Ð?Ñ?Ñ?омаÑ?Ñ?ки)</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="ports">Ð?оÑ?Ñ?ови</string>
-  <string name="local_port">Ð?окални Ð?оÑ?Ñ?</string>
+    <string name="local_port">Ð?окални Ð?оÑ?Ñ?</string>
   <string name="onion_port">Onion Ð?оÑ?Ñ?</string>
   <string name="name">Ð?ме</string>
   <string name="done">Ð?оÑ?ово !</string>
@@ -306,9 +160,7 @@
   <string name="backup_restored">РезеÑ?вна копиÑ?а Ñ?е обновÑ?ена</string>
   <string name="filemanager_not_available">Ð?енаÑ?еÑ? Ñ?аÑ?лова ниÑ?е доÑ?Ñ?Ñ?пан</string>
   <string name="please_grant_permissions_for_external_storage">Ð?олимо да даÑ?е дозволе за екÑ?Ñ?еÑ?но Ñ?кладиÑ?Ñ?еÑ?е</string>
-  <string name="permission_granted">Ð?озвола одобÑ?ена</string>
-  <string name="permission_denied">Ð?озвола одбиÑ?ена</string>
-  <string name="restore_backup">Ð?бнови Ñ?езеÑ?внÑ? копиÑ?Ñ?</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>
diff --git a/app/src/main/res/values-sv/poestrings.xml b/app/src/main/res/values-sv/poestrings.xml
index 4063950a..ed6bb5e0 100644
--- a/app/src/main/res/values-sv/poestrings.xml
+++ b/app/src/main/res/values-sv/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Broar är Tor-reläer som hjälper till att kringgå censur. Du kan prova broar om Tor är blockerad av din ISP, varje bro-typ använder en annan metod
-        för att undvika censur: om en typ inte fungerar kan du försöka använda en annan.</string>
-
-    <string name="bridges_no">Inga broar: Anslut direkt till Tor</string>
-    <string name="bridges_provided">Tillhandahållna broar: </string>
-    <string name="bridges_custom">Anpassade broar</string>
-
-    <string name="bridges_config">Brokonfiguration</string>
-    <string name="action_done">Klart</string>
 
     <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>
@@ -17,19 +8,6 @@
     <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="status_connected">Ansluten!</string>
-
-    <string name="loading_claim_1">Vår blandade grupp är vad som gör Tor bra!</string>
-    <string name="loading_claim_2">Vardagliga människor använder Tor för att undvika att följa marknadsföringsannonser.</string>
-    <string name="loading_claim_3">När Facebook är blockerad använder folk Tor för att ansluta till sina vänner och familj.</string>
-    <string name="loading_claim_4">Aktivister använder Tor för att fritt tweeta sina åsikter och övertygelser.</string>
-    <string name="loading_claim_5">Bloggare använder Tor för att samla människor mot sociala reformer.</string>
-    <string name="loading_claim_6">Journalister använder Tor för att på ett säkert sätt undersöka historier som de rapporterar om.</string>
-    <string name="loading_claim_7">Företagare använder Tor för att hålla sina företagsstrategier privata.</string>
-    <string name="loading_claim_8">Arbetare använder Tor för att kämpa för rättvisa utan rädsla för att förlora sitt jobb.</string>
-
-    <string name="status_connecting">Vi ansluter dig.\" = \"Vi ansluter dig.</string>
-
     <string name="hello">Hej</string>
     <string name="welcome">Välkommen till Tor på mobilen.</string>
 
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 35275219..609865dc 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startar...</string>
+    <string name="status_starting_up">Orbot startar...</string>
   <string name="status_activated">Uppkopplad till Tor-nätverket</string>
   <string name="status_disabled">Orbot är inaktiverad</string>
   <string name="status_shutting_down">TorService avslutas</string>
   <string name="tor_process_starting">Startar Tor-klient...</string>
   <string name="tor_process_complete">färdig.</string>
-  <string name="tor_process_waiting">väntar.</string>
-  <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina appar att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Hem</string>
-  <string name="menu_browse">Bläddra</string>
-  <string name="menu_settings">Inställningar</string>
+    <string name="menu_settings">Inställningar</string>
   <string name="menu_log">Logg</string>
-  <string name="menu_info">Hjälp</string>
-  <string name="menu_apps">Appar...</string>
-  <string name="menu_start">Start</string>
+    <string name="menu_start">Start</string>
   <string name="menu_stop">Stopp</string>
   <string name="menu_about">Om</string>
-  <string name="menu_promo_apps">Skaffa appar...</string>
-  <string name="main_layout_download">Nedladdat</string>
+    <string name="main_layout_download">Nedladdat</string>
   <string name="main_layout_upload">Uppladdat</string>
-  <string name="button_help">Hjälp</string>
-  <string name="button_close">Stäng</string>
-  <string name="button_about">Om</string>
-  <string name="button_clear_log">Rensa logg</string>
-  <string name="menu_verify">Kontrollera</string>
-  <string name="menu_exit">Avsluta</string>
+    <string name="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="press_to_start">- tryck länge för att starta -</string>
-  <string name="pref_trans_proxy_group">Transparent proxy (kräver root)</string>
-  <string name="pref_trans_proxy_title">Transparent proxy</string>
-  <string name="pref_trans_proxy_summary">Automatisk torifiering av appar</string>
-  <string name="pref_transparent_all_title">Tor:a Allt</string>
-  <string name="pref_transparent_all_summary">Skicka trafik för alla appar genom Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
-  <string name="pref_transparent_port_title">Port-lista</string>
-  <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
-  <string name="pref_transparent_port_dialog">Skriv in portar till proxy</string>
-  <string name="pref_has_root">Begär root-åtkomst</string>
-  <string name="pref_has_root_summary">Begär root-åtkomst för transparent proxy</string>
-  <string name="status_install_success">Tor-filerna installerades utan problem!</string>
-  <string name="status_install_fail">De körbara Tor-filerna kunde inte installeras. Kontrollera loggen och underrätta tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Applikationsfel</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Om Orbot</string>
-  <string name="btn_next">Nästa</string>
-  <string name="btn_back">Tillbaka</string>
-  <string name="btn_finish">Slutför</string>
-  <string name="btn_okay">Okej</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Tillstånd givet</string>
-  <string name="wizard_permissions_stock">Orbot rättigheter</string>
-  <string name="wizard_premissions_msg_root">Utmärkt! Vi har upptäckt att du har root tillstånd aktiverat för Orbot. Vi kommer använda denna makt ansvarsfullt.</string>
-  <string name="wizard_permissions_msg_stock">Det är inte nödvändigt, men Orbot kan bli ett kraftfullare verktyg om din enhet har root tillgång. Använd knappen nedan för att ge Orbot superkrafter!</string>
-  <string name="wizard_permissions_no_root">Om du inte har root tillgång eller inte har en aning om vad vi pratar om, använd bara appar som är gjorda att fungera med Orbot.</string>
-  <string name="wizard_permissions_consent">Jag förstår och vill fortsätta utan Superuser.</string>
-  <string name="wizard_permission_enable_root">Ge Orbot root tillgång</string>
-  <string name="wizard_configure">Konfigurera torifikation</string>
-  <string name="wizard_configure_msg">Orbot ger dig möjligheten att skicka all applikationstrafik genom Tor ELLER att själv välja applikationer individuellt.</string>
-  <string name="wizard_configure_all">Proxy alla appar genom Tor</string>
-  <string name="wizard_configure_select_apps">Välj enskilda appar för Tor</string>
-  <string name="wizard_tips_tricks">Orbot-anpassade appar</string>
-  <string name="wizard_tips_msg">Apparna nedanför var utvecklade att fungera med Orbot. Klicka varje knapp för att installera nu, eller hitta dom senare på Google Play, på GuardianProject.info, eller via F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Säker chattklient för Android</string>
-  <string name="wizard_tips_proxy">Proxy-inställningar - Lär dig hur du konfigurerar appar att fungera med Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Sökmotor App</string>
-  <string name="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Skapa en story och ge den till Tor för säkerhet!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-inställningar</string>
-  <string name="wizard_proxy_help_msg">Om Android-appen du använder har stöd för en HTTP- eller SOCKS-proxy, så kan du konfigurera den at ansluta till Orbot och använda Tor.\n\n\nInställningen för värdnamn är 127.0.0.1 eller \"localhost\". För HTTP är portinställningen 8118. För SOCKS är porten 9050. Du bör använda SOCKS4A eller SOCKS5 om möjligt.\n\n\n\nDu kan lära dig mer om proxy på Android via FAQ på: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot är redo!</string>
-  <string name="wizard_final_msg">Miljoner människor världen över använder sig av Tor av flera olika orsaker.\n\nJournalister och bloggare, människorättsförsvarare, brottsbekämpare, soldater, företag, innevånare i repressiva regimer, och bara vanliga innevånare... och nu är du redo också!</string>
-  <string name="wizard_exit_at_first_screen_toast">Vänligen konfigurera Orbot innan du kan använda den!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Du har anslutit till Tor-nätverket - men detta betyder INTE att din enhet är säker. Du kan använda knappen \'Webbläsare\' för att testa din anslutning. \n\nBesök oss på https://guardianproject.info/apps/orbot eller skicka e-post till help@xxxxxxxxxxxxxxxxxxxx för mer information.</string>
-  <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
-  <string name="pref_hs_group">Gömd Service Hosting</string>
-  <string name="pref_general_group">Allmänt</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot tar Tor till Android!\n\nTor hjälper dig att skydda dig från innehållsfiltrering, trafikanalys och nätverksövervakning som hotar integritet, hemlig information och personliga relationer.\n\nDen här guiden hjälper dig att konfigurera Orbot och Tor på din enhet.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Varning</string>
-  <string name="wizard_warning_msg">Bara genom att installera Orbot anonymiseras inte din mobiltrafik.\n\nDu måste ställa in Orbot, din enhet och andra appar för att använda Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Rättigheter</string>
-  <string name="wizard_permissions_root_msg1">Du kan alternativt ge Orbot \'Superuser\' tillgång för att aktivera avancerade inställningar, som till exempel Transparent Proxy.</string>
-  <string name="wizard_permissions_root_msg2">Om du inte vill göra detta, se till att bara använda appar som anpassats till Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Din enhet verkar inte vara rootad eller ge root eller \'Superuser\'-åtkomst.\n\nVänligen försök använda \'Appar\'-läget i huvudmenyn istället.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Anpassade Appar</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Säkert chatt app med Off-the-Record kryptering</string>
-  <string name="wizard_tips_orweb">Orfox: Integritetsförbättrad webbläsare som går genom Tor</string>
-  <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string>
-  <string name="wizard_tips_fdroid">Hitta alla Guardian Project-appar i F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Hitta alla Guardian Project-appar på https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxy</string>
-  <string name="wizard_transproxy_msg">Detta tillåter dina appar att automatiskt köra genom Tor nätverket utan någon konfiguration.</string>
-  <string name="wizard_transproxy_hint">(Markera denna om du inte har någon aning om vad vi pratar om)</string>
-  <string name="wizard_transproxy_none">Ingen</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Aktivera Tor Transparent Proxy för Wifi och USB Thetered Enheter (omstart krävs)</string>
-  <string name="button_grant_superuser">Begär Superuser Tillgång</string>
-  <string name="pref_select_apps">Välj Appar</string>
-  <string name="pref_select_apps_summary">Välj Appar att Leda Genom Tor</string>
-  <string name="pref_node_configuration">Nod Konfiguration</string>
+    <!--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="button_proxy_all">Allt genom proxy</string>
-  <string name="button_proxy_none">Inget genom proxy</string>
-  <string name="button_invert_selection">Invertera val</string>
-  <string name="pref_proxy_title">Utgående nätverksproxy (Valfri)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Utgående proxy lösenord</string>
   <string name="pref_proxy_password_summary">Proxylösenord (Valfri)</string>
   <string name="pref_proxy_password_dialog">Ange proxylösenord</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
-  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERAD</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy aktiverad för Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">VARNING: kunde ej starta transparent proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy regler rensade</string>
-  <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
-  <string name="privoxy_is_running_on_port_">Polipo körs på port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
-  <string name="bridge_error">Bro Error</string>
-  <string name="bridge_requires_ip">För att använda bro funktionen måste du skriva in minst en bro IP adress.</string>
-  <string name="send_email_for_bridges">Skicka ett email till bridges@xxxxxxxxxxxxxx med linjen \"get bridges\" ensamt som meddelande från ett gmail konto.</string>
-  <string name="error">Fel</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Använd *enbart* dessa specificerade noder</string>
   <string name="bridges">Broar</string>
   <string name="use_bridges">Använd Broar</string>
-  <string name="bridges_obfuscated">Förvillande Broar</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångar i Tor-nätverket</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivera om konfigurerade broar är förvillande broar</string>
-  <string name="ip_address_and_port_of_bridges">IP adress och port för broar</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">NÃ¥bara portar</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Portar nåbara bakom en restriktiv brandvägg</string>
   <string name="enter_ports">Skriv in portar</string>
-  <string name="enable_hidden_services">Gömd Tjänstehosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">Tillåt server på enheten att vara tillgänglig via Tor nätverket</string>
-  <string name="enter_localhost_ports_for_hidden_services">Skriv in localhost portar för gömda tjänster</string>
-  <string name="hidden_service_ports">Gömda Tjänsteportar</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserade namnet för din gömda tjänst (genereras automatiskt)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
   <string name="project_home">Projektets hemsidor:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor-licensen</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Tredjepartsprogramvara:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">gömd tjänst på:</string>
-  <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
+    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
   <string name="unable_to_start_tor">Kan inte starta Tor:</string>
-  <string name="unable_to_reset_tor">Starta om din enhet, kunde inte återställa Tor!</string>
-  <string name="pref_use_sys_iptables_title">Använd standard Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Använd den inbyggda iptables binären istället för den som kommer med Orbot</string>
-  <string name="error_installing_binares">Tor binärerna kunde inte installeras eller uppgraderas.</string>
-  <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
+    <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
   <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
   <string name="pref_use_expanded_notifications">Visa utökad notis med Tors utgångsland och IP</string>
   <string name="pref_use_expanded_notifications_title">Utökade notiser</string>
-  <string name="notification_using_bridges">Broar aktiverade!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Språk</string>
-  <string name="set_locale_summary">Välj plats och språk för Orbot</string>
-  <string name="wizard_locale_title">Välj språk</string>
-  <string name="wizard_locale_msg">Lämna standard eller byt nuvarande språk</string>
-  <string name="powered_by">drivs av Tor</string>
-  <string name="btn_save_settings">Spara Inställningar</string>
-  <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</string>
-  <string name="bandwidth_">Bandbredd:</string>
-  <string name="down">nere</string>
-  <string name="up">uppe</string>
-  <string name="pref_disable_network_title">Ingen auto-sömn för nätverket</string>
+    <string name="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="menu_verify_browser">Webbläsare</string>
-  <string name="menu_use_chatsecure">Använd ChatSecure</string>
-  <string name="permission_manage_tor_label">Hantera Tor</string>
-  <string name="permission_manage_tor_description">LÃ¥t denna app kontrollera Tor-servicen</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot fungerar bäst med Orfox Browser. Installera nu?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot fungerar bäst med Orfox Browser. Installera nu?</string>
   <string name="install_apps_">Installera webbläsare?</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>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Torrc anpassad konfiguration</string>
   <string name="pref_torrc_summary">ENDAST EXPERTER: ange torrc konfiguration direkt</string>
   <string name="pref_torrc_dialog">Anpassad Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Ditt publika IP via Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vänligen inaktivera den här appen i Android-&gt;Inställningar-&gt;Appar om du har problem med Orbot:</string>
-  <string name="app_conflict">Appkonflikt</string>
-  <string name="pref_transproxy_refresh_title">Transproxy auto-uppdatering</string>
-  <string name="pref_transproxy_refresh_summary">Sätt Transproxy regler igen när nätverksstatus ändras</string>
-  <string name="pref_transproxy_flush_title">Transproxy TVINGA BORTTAGNING</string>
-  <string name="pref_transproxy_flush_summary">Klicka här för att rensa alla transproxy nätverksregler NU</string>
-  <string name="transparent_proxy_rules_flushed_">Regler för transparent proxy rensade!</string>
-  <string name="you_do_not_have_root_access_enabled">Du har inte root-Ã¥tkomst aktiverad</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Du kan behöva stänga av och starta Orbot för att ändringar i inställningar ska slå igenom.</string>
-  <string name="menu_vpn">Appar</string>
-  <string name="kbps">kb/s</string>
+    <string name="kbps">kb/s</string>
   <string name="mbps">mb/s</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Webb</string>
   <string name="activate">Aktivera</string>
   <string name="apps_mode">VPN-läge</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Du kan aktivera appar för att gå igenom Tor med den inbyggda Orbot VPN.\n\nDetta gör inte dig anonym, men det hjälper dig att komma igenom brandväggar.</string>
-  <string name="send_email">Skicka e-post</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 &amp; klistra in den i inställningen för \"Bryggor\" i Orbot och starta om.</string>
   <string name="install_orweb">Installera Orfox</string>
-  <string name="standard_browser">Standard-webbläsare</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTERA: Endast vanliga Tor-bryggor fungerar på Intel X86/ATOM-enheter</string>
-  <string name="vpn_default_world">Global (automatisk)</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="ports">Portar</string>
-  <string name="local_port">Lokal port</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>
@@ -308,9 +162,7 @@
   <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="permission_granted">Tillstånd beviljat</string>
-  <string name="permission_denied">Tillstånd nekad</string>
-  <string name="restore_backup">�terställa säkerhetskopia</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>
@@ -343,10 +195,8 @@
   <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="please_enable_vpn">Aktivera VPN-läget för att aktivera appar att använda Tor</string>
-  <string name="app_shortcuts">Tor-aktiverade appar</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">Testa broanslutning till Tor....</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>
diff --git a/app/src/main/res/values-ta/poestrings.xml b/app/src/main/res/values-ta/poestrings.xml
index c25c0aee..4a69c50a 100644
--- a/app/src/main/res/values-ta/poestrings.xml
+++ b/app/src/main/res/values-ta/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"பால���ள� தணி����ய� ����� �தவ�ம� த�ர� ���மாற�றி�ள�  �����ம�. த�ர�  ����ள� ISP �ல� த�����ப�ப���ால� ந����ள� பால���ள� ம�யற��ி���லாம�; �வ�வ�ர�  பால���ள�ம� வ�வ�வ�ற� ம�ற�ய�ப� பயன�ப��த�த��ின�றன
-        தணி����ய�த� தவிர�����: �ர�  வ�� வ�ல� ��ய�யவில�ல�ய�னில� மற�ற�ன�ற� ம�யற��ிய����ள�.</string>
-
-    <string name="bridges_no">பால���ள� �ல�ல�: த�ர� ��ன� ந�ர�ியா� �ண����வ�ம�</string>
-    <string name="bridges_provided">பால���ள� வழ����ம�:</string>
-    <string name="bridges_custom">தனிப�பயணா���ப�ப��� பால���ள�</string>
-
-    <string name="bridges_config">பால���ளின� ����ம�ப�ப�</string>
-    <string name="action_done">ம��ிந�தத�</string>
 
     <string name="bridges_sometimes">�ில ந�ர���ளில� ந����ள� Tor � ப�ற �ர� �ண�ப�ப� த�வ�ப�ப���ிறத�.</string>
     <string name="action_more">�ன�ன�ம� �ன���� ��ால�ல����ள�</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">�த� ����ள� �நாமத�யமா�����ிறத�, �னால� �த� �பயர�வால��ள� வழியா� �தவ��ிறத�.</string>
     <string name="action_vpn_choose">பயன�பா���ள�த� த�ர�வ���ய�யவ�ம�</string>
 
-    <string name="status_connected">�ண����ப�ப���த�!</string>
-
-    <string name="loading_claim_1">����ளத� மாற�ப��� �ம��மானத� த�ர� � �ிறந�த� விள����� ��ய��ிறத�!</string>
-    <string name="loading_claim_2">தின�ரி ம���ள� �ந�த� விளம�பர���ள� தவிர���� த�ர� � பயன�ப��த�த��ிறார��ள�.</string>
-    <string name="loading_claim_3">ம��ந�ல� ம�����ப�ப���ால�, ம���ள� த���ள� நண�பர��ள��ன�ம� ����ம�பத�த��ன�ம� �ண�வதற��� த�ர� � பயன�ப��த�த��ின�றனர�.</string>
-    <string name="loading_claim_4">�ர�வலர��ள� த���ள� �ண�ண���ள�ய�ம� நம�பி����ய�ய�ம� �லவ�மா� �����ி� ��ய�ய Tor பயன�ப��த�த��ிறார��ள�.</string>
-    <string name="loading_claim_5">�ம�� ��ர�திர�த�தத�த� ந����ி ம���ள� �ணிதிர����வதற��� Torg � பயன�ப��த�த��ின�றனர�.</string>
-    <string name="loading_claim_6">பத�திரி��யாளர��ள� தா���ள� ப��ாரளி����ம� �த�ய� பாத��ாப�பா� �ராய�வதற��� Tor � பயன�ப��த�த��ின�றனர�.</string>
-    <string name="loading_claim_7">வணி� நிற�வன���ள� த���ளத� நிற�வன �த�தி�ள� தனியார�மயமா����வதற���ப� பயன�ப��த�த��ின�றனர�.</string>
-    <string name="loading_claim_8">த�ழிலாளர��ள� த���ள� வ�ல� �ழந�த�வி��ம� �ன�ற ����ம� �ன�றி ந�தி���ா� ப�ரா��வதற��� Tor பயன�ப��த�த��ின�றனர�.</string>
-
-    <string name="status_connecting">நா���ள� ����ள� �ண�ப�ப�ம�. \"=\" நா���ள� ����ள� �ண�ப�ப�ம�.</string>
-
     <string name="hello">வண���ம�</string>
     <string name="welcome">ம�ப�லில� த�ர� ���� வரவ�ற��ிற�ம�.</string>
 
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 7e0268b8..bb1cbf7c 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -2,84 +2,41 @@
 <resources>
   <string name="app_name">�ர�பா�� </string>
   <string name="app_description">�ர�பா��, �ன�ன�ம பாத��ாப�பான ம�ற�யில� �ண�ய பயன�ப��த�த மற�ற பயன�பா���ள� பலப�ப��த�த��ிறார� �ன�ற� �ர� �லவ� ப�ரா��ஸி பயன�பா�� ���ம�. �ர�பா�� ����ள� �ண�ய ப�ா����வரத�த� ��றியா��� த�ார� பயன�ப��த�த��ிறத� மற�ற�ம� �தன� பின�னர� �ல�ம� ம�ழ�வத�ம� �ணினி�ள� �ர� த�ா�ர� ம�லம� �திர����ிறத� �த� மற�த�தவர�. த�ார� �லவ� ம�ன�ப�ார�ள� மற�ற�ம� ந����ள� ப�ா����வரத�த� ப��ப�பாய�வ�
  �ன�ற தனிப�ப��� ��தந�திரம� மற�ற�ம� தனிய�ரிம�, ர��ிய வணி� ந�வ�ி�����ள� மற�ற�ம� �றவ��ள�, மற�ற�ம� மாநில பாத��ாப�ப� �����ற�த�த�ம� ந���வ�ார��� �ண��ாணிப�ப� வ�ிவ �திரா� பாத��ா��� �தவ��ிறத� �ன�ற� �ர� திறந�த ந���வ�ார��� ���ம�.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">த�ர� த�வ��� மற�ற�ம� நிற�த�த</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">�ர�பா�� த�வ�����ிறத�...</string>
+    <string name="status_starting_up">�ர�பா�� த�வ�����ிறத�...</string>
   <string name="status_activated">த�ார� ந���வ�ார��� �ண����ப�ப���</string>
   <string name="status_disabled">�ர�பா�� நிற�த�தப�ப���த�</string>
   <string name="tor_process_starting">த�ர� த�வ���ப�ப���ிறத�...</string>
   <string name="tor_process_complete">ம��ிந�தத�.</string>
-  <string name="tor_process_waiting">�ாத�திர����ிறத�</string>
-  <string name="not_anonymous_yet">����ரி����: ����ள� ப�ா����வரத�த� �ன�ன�ம� �நாமத�ய �ல�ல! HTTP பதிலாள� 127.0.0.1:8118 �ல�லத� SOCKS4A �ல�லத� SOCKS5 ப�ரா��ஸி 127.0.0.1:9050 பயன�ப��த�த ����ள� பயன�பா���ள� ����ம���� ��ாள�ளவ�ம�</string>
-  <string name="menu_home">ம��ப�ப�</string>
-  <string name="menu_browse">�லவி��</string>
-  <string name="menu_settings">�ம�ப�ப��ள�</string>
+    <string name="menu_settings">�ம�ப�ப��ள�</string>
   <string name="menu_log">பதிவ��ள�</string>
-  <string name="menu_info">�தவி</string>
-  <string name="menu_apps">��யலி�ள�...</string>
-  <string name="menu_start">த�வ����</string>
+    <string name="menu_start">த�வ����</string>
   <string name="menu_stop">நிற�த�த�</string>
   <string name="menu_about">�ர�பா�� பற�றி</string>
-  <string name="menu_promo_apps">��யலி�ள� ப�ர�...</string>
-  <string name="main_layout_download">பதிவிற����</string>
+    <string name="main_layout_download">பதிவிற����</string>
   <string name="main_layout_upload">பதிவ�ற�ற�</string>
-  <string name="button_help">�தவி</string>
-  <string name="button_close">ம���</string>
-  <string name="button_about">பற�றி </string>
-  <string name="button_clear_log">பதிவ��ள� ந�����</string>
-  <string name="menu_verify">�ரி பார�த�தல�</string>
-  <string name="menu_exit">வ�ளிய�ற�</string>
+    <string name="button_about">பற�றி </string>
+    <string name="menu_exit">வ�ளிய�ற�</string>
   <string name="menu_scan">ஸ���ன� BridgeQR</string>
   <string name="menu_share_bridge">BridgeQR ப�ிர�ந�தி��</string>
-  <string name="press_to_start">- த�ா���� த��ர�ந�த� �ழ�த�த�� -</string>
-  <string name="pref_transparent_port_fallback_summary">����ரி����: ப�ாத�வான த�ற��ள� (80, 443, ப�ான�றவ�) circumvents. * பயன�ப��த�த ம����ம� * \'�ன�த�த�\' �ல�லத� \'�ப�\' ம�ற�யில� வ�ல� �ல�ல� �ன�றால�.</string>
-  <string name="wizard_title">�ர�பா�� </string>
-  <string name="wizard_btn_tell_me_more">�ர�பா�� பற�றி</string>
-  <string name="btn_next">���த�த�</string>
-  <string name="btn_back">பின� ��ல�</string>
-  <string name="btn_finish">ம��ித�தி��</string>
-  <string name="btn_okay">�ரி</string>
+    <string name="btn_okay">�ரி</string>
   <string name="btn_cancel">ரத�த� ��ய�</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">�ர�பா�� பற�றிய த�வல�</string>
-  <string name="wizard_permissions_root">�ன�மதி வழ���ப�ப���த�</string>
-  <string name="wizard_permissions_stock">�ர�பா�� �ன�மதி�ள�</string>
-  <string name="wizard_tips_duckgo">��� ��� �� த���ப�ாறி ��யலி</string>
-  <string name="wizard_proxy_help_info">பதிலாள� �ம�ப�ப��ள�</string>
-  <string name="wizard_final">�ர�பா�� தயாரா� �ள�ளத�!</string>
-  <string name="wizard_exit_at_first_screen_toast">தயவ� ��ய�த�, �ர�பா�� ���ம�த�த பின� பயன�ப��த�தவ�ம�</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">ப�ாத�</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">����ரி����</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">�ன�மதி�ள�</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">�ர�பா���ன� ��யல�ப��ம� ��யலி�ள�</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">�த�வ�மில�ல�</string>
-  <string name="pref_select_apps">��யலி�ள� த�ர�ந�த���</string>
-  <string name="pref_proxy_password_summary">பதிலாள� ��வ�����ால� (����ாயமற�ற)</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="pref_proxy_password_summary">பதிலாள� ��வ�����ால� (����ாயமற�ற)</string>
   <string name="pref_proxy_password_dialog">பதிலாள� ��வ�����ால�ல� �ள�ளி�வ�ம�</string>
-  <string name="status">நில�</string>
-  <string name="error">பிழ�</string>
+    <string name="error">பிழ�</string>
   <string name="bridges">Bridge�ள�</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ம�ழி</string>
-  <string name="wizard_locale_title">ம�ழிய� த�ர�ந�த���</string>
-  <string name="btn_save_settings">�ம�ப�ப��ள� ��மி���வ�ம�</string>
-  <string name="bandwidth_">�ல�வரி��</string>
-  <string name="down">��ழ�</string>
-  <string name="up">ம�ல�</string>
-  <string name="install_apps_">�லாவிய� நிற�வ வ�ண���மா?</string>
-  <string name="menu_vpn">�ப�ஸ�</string>
-  <string name="get_bridges_email">மின�ன���ல�</string>
+    <string name="set_locale_title">ம�ழி</string>
+    <string name="install_apps_">�லாவிய� நிற�வ வ�ண���மா?</string>
+    <string name="get_bridges_email">மின�ன���ல�</string>
   <string name="activate">��யல�ப��த�தவ�ம�</string>
   <string name="save">��மி</string>
   <string name="name">ப�யர�</string>
diff --git a/app/src/main/res/values-th/poestrings.xml b/app/src/main/res/values-th/poestrings.xml
index 3a4f25ae..c04547b7 100644
--- a/app/src/main/res/values-th/poestrings.xml
+++ b/app/src/main/res/values-th/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Bridges �ือรี�ลย��อ� Tor �ี���วย�หลือ�ารหล��ลี�ย��าร�ิ��ั�� �ุ�สามาร�ลอ���� Bridges หา� Tor �ู��ล�อ���ย ISP �อ��ุ�; Bridges ���ละ��ิ����วิ�ี�าร�ี������า��ั�
- ��ื�อหล��ลี�ย��าร�ิ��ั��: หา�วิ�ี�ารห�ึ���ม�����ล ���ะลอ����วิ�ี�ารอื��</string>
-
-    <string name="bridges_no">�ม�มี Bridges: ��ื�อม��อ��ย�ร��ั� Tor</string>
-    <string name="bridges_provided">Bridges �ี�มี�ห�:</string>
-    <string name="bridges_custom">Bridges �ี��รั��������าะ</string>
-
-    <string name="bridges_config">�าร�ำห����า�อ� Bridges</string>
-    <string name="action_done">�สร��</string>
 
     <string name="bridges_sometimes">�า��รั���ุ�อา���อ��าร Bridges ��ื�อ��ื�อม��อ�ั� Tor</string>
     <string name="action_more">�อ�รายละ�อีย���ิ�ม��ิม�ั��ั�</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">�าร�ำ��ิ��าร�ี��ะ�ม�\����ำ�ห��ม�มี�ารระ�ุ�ัว���อ��ุ� ����ะ�����าร�ำ�ห���า���ร�วอลล����</string>
     <string name="action_vpn_choose">�ลือ��อ�</string>
 
-    <string name="status_connected">��ื�อม��อ�ล�ว!</string>
-
-    <string name="loading_claim_1">��วย�วามหลา�หลาย�อ��ุม���อ��รา����สิ���ี��ำ�ห� Tor �ั��ยอ��ยี�ยม!</string>
-    <string name="loading_claim_2">�ุ�วั��ี��ู������ Tor ��ื�อหลี��ลี�ย��าร�ู��ิ��าม�า���ษ�า�า��าร�ลา�</string>
-    <string name="loading_claim_3">�มื�อ Facebook �ู��ิ��ั�� �ู����ะ��� Tor ��ื�อ��ื�อม��อ�ั���ื�อ��ละ�รอ��รัว�อ��ว���า</string>
-    <string name="loading_claim_4">�หล�า�ั���ลื�อ��หว��� Tor ��ื�อ�วี��วาม�ิ��ห���ละ�วาม��ื�อ�อ��ว���าอย�า��สรี</string>
-    <string name="loading_claim_5">�ล�อ���อร���� Tor ���ารระ�ม�ู�����ื�อ�าร��ิรู�สั��ม</string>
-    <string name="loading_claim_6"> �ั�สื�อมวล����� Tor ��ื�อสื�สว��รื�อ�ราว�ี��ว���าราย�า�อยู�อย�า��ลอ�ภัย</string>
-    <string name="loading_claim_7">�ั��ุร�ิ���� Tor ��ื�อรั�ษา�ลยุ����อ��ริษั��ห������วามลั�</string>
-    <string name="loading_claim_8">�ู�����ร��า���� Tor ���าร��อสู���ื�อ�วามยุ�ิ�รรม��ย�ม���ร��ลัวว�า�ะ���า�</string>
-
-    <string name="status_connecting">�รา��ื�อม��อ�ั��ุ�\" = \"�รา��ื�อม��อ�ั��ุ�</string>
-
     <string name="hello">สวัส�ี</string>
     <string name="welcome">�อ��อ�รั�สู� Tor ��มือ�ือ</string>
 
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 43ec54ad..33740121 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot à¸?ือà¹?อà¸?à¸?รà¹?อà¸?à¸?ีà¸?รีà¸?ีà¹?à¸?à¹?วยà¹?à¸?ิà¹?มà¸?ระสิà¸?à¸?ิภาà¸?à¹?หà¹?à¸?ัà¸?à¹?อà¸?อืà¹?à¸?à¹? à¹?หà¹?สามารà¸?à¹?à¸?à¹?à¸?าà¸?อิà¸?à¹?à¸?อรà¹?à¹?à¸?à¹?à¸?à¹?à¸?à¹?อยà¹?าà¸?à¸?ลอà¸?ภัยมาà¸?à¸?ึà¹?à¸? Orbot à¹?à¸?à¹? Tor à¹?à¸?à¸?ารà¹?à¸?à¹?ารหัสà¸?ารรัà¸?สà¹?à¸?à¸?à¹?อมูลà¸?าà¸?อิà¸?à¹?à¸?อรà¹?à¹?à¸?à¹?à¸?à¸?อà¸?à¸?ุà¸?à¹?ละà¸?ำà¸?ารà¸?à¹?อà¸?à¸?à¹?อมูลà¹?à¸?ยà¸?ารสะà¸?à¹?อà¸?à¸?ารà¹?à¸?ืà¹?อมà¸?à¹?อà¸?à¹?าà¸?à¸?ลุà¹?มà¸?อà¸?à¹?à¸?รืà¹?อà¸?à¸?อมà¸?ิวà¹?à¸?อรà¹?à¸?ัà¹?วà¹?ลà¸? Tor à¹?à¸?à¹?à¸?à¸?อà¸?à¸?à¹?à¹?วรà¹?à¸?รีà¹?ละà¹?à¸?à¹?à¸?à¹?à¸?รือà¸?à¹?ายà¹?à¸?à¸?à¹?à¸?ิà¸?à¸?ีà¹?à¸?à¹?วยà¸?à¸?à¸?à¹?อà¸?à¸?ุà¸?à¸?าà¸?à¸?ารสอà¸?สà¹?อà¸?à¹?à¸?รือà¸?à¹?ายà¸?ีà¹?à
 ¸?ุà¸?à¸?ามอิสรภาà¸?à¹?ละà¸?วามà¹?à¸?à¹?à¸?สà¹?วà¸?à¸?ัวà¸?อà¸?à¸?ูà¹?à¸?à¸? รัà¸?ษาà¸?วามลัà¸?à¸?าà¸?à¸?ุรà¸?ิà¸?à¹?ละà¸?วามสัมà¸?ัà¸?à¸?à¹? à¹?ละà¸?ารสรà¹?าà¸?à¸?วามà¸?ลอà¸?ภัยà¹?à¸?ยà¸?ารวิà¹?à¸?ราะหà¹?à¸?ารรัà¸?สà¹?à¸?à¸?à¹?อมูล</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">�ริ�ม�ละหยุ� Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot �ำลั��ริ�ม���...</string>
+    <string name="status_starting_up">Orbot �ำลั��ริ�ม���...</string>
   <string name="status_activated">��ื�อม��อ�ั���รือ��าย Tor �ล�ว</string>
   <string name="status_disabled">�ิ��าร����า� Orbot</string>
   <string name="status_shutting_down">�ำลั��ิ��าร�ำ�า� TorService </string>
   <string name="tor_process_starting">�ริ�ม�����ล�อ���� Tor </string>
   <string name="tor_process_complete">�สร��</string>
-  <string name="tor_process_waiting">�ำลั�รอ</string>
-  <string name="not_anonymous_yet">�ำ��ือ�: �ารรั�ส����อมูล�อ��ุ�ยั��ม���������ม�ระ�ุ�ัว��! �รุ�า�ั����า��ร��รม�อ��ุ��ห���� HTTP �ร�อ��ี�ี� 127.0.0.1:8118 หรือ��� SOCKS4A หรือ SOCKS5 �ร�อ��ี�ี� 127.0.0.1:9050</string>
-  <string name="menu_home">ห��าหลั�</string>
-  <string name="menu_browse">�รีย��ู</string>
-  <string name="menu_settings">�าร�ั����า</string>
+    <string name="menu_settings">�าร�ั����า</string>
   <string name="menu_log">�ั��ึ�</string>
-  <string name="menu_info">�วาม��วย�หลือ</string>
-  <string name="menu_apps">�อ�...</string>
-  <string name="menu_start">�ริ�ม</string>
+    <string name="menu_start">�ริ�ม</string>
   <string name="menu_stop">หยุ�</string>
   <string name="menu_about">��ี�ยว�ั�</string>
-  <string name="menu_promo_apps">�หล��อ�...</string>
-  <string name="main_layout_download">�าว���หล�</string>
+    <string name="main_layout_download">�าว���หล�</string>
   <string name="main_layout_upload">อั��หล�</string>
-  <string name="button_help">��วย�หลือ</string>
-  <string name="button_close">�ิ�</string>
-  <string name="button_about">��ี�ยว�ั�</string>
-  <string name="button_clear_log">ล�า��ั��ึ�</string>
-  <string name="menu_verify">�รว�สอ�</string>
-  <string name="menu_exit">ออ�</string>
+    <string name="button_about">��ี�ยว�ั�</string>
+    <string name="menu_exit">ออ�</string>
   <string name="menu_scan">ส��� BridgeQR</string>
   <string name="menu_share_bridge">��ร� BridgeQR</string>
-  <string name="press_to_start">- ��ะ��า���ื�อ�ริ�ม -</string>
-  <string name="pref_trans_proxy_group">�ำลั��ำ�ร�อ��ี��� Transparent (��อ��ำ�าร Root)</string>
-  <string name="pref_trans_proxy_title">�ำลั��ำ�ร�อ��ี��� Transparent</string>
-  <string name="pref_trans_proxy_summary">�ห��อ�����า� Tor ��ยอั���มั�ิ</string>
-  <string name="pref_transparent_all_title">��� Tor �ั��ุ�อย�า�</string>
-  <string name="pref_transparent_all_summary">�ำ�ร�อ��ี�ารรั�ส����อมูล�อ��ุ��อ���า� Tor</string>
-  <string name="pref_transparent_port_fallback_title">�อร�� �ร�อ��ี�ี�������</string>
-  <string name="pref_transparent_port_fallback_summary">�ำ��ือ�: หลี��ลี�ย��อร���ั�ว�� (���� 80, 443) *�������อ�มื�อ* �หม� \'�ั��หม�\' หรือ \'��ร��รม\' ����า��ม����</string>
-  <string name="pref_transparent_port_title">ราย�าร�อร��</string>
-  <string name="pref_transparent_port_summary">ราย�าร�อร���ี���า��ร�อ��ี *�������อ�มื�อ* �หล� \'�ั��หม�\' หรือ \'��ร��รม\' ����า��ม����</string>
-  <string name="pref_transparent_port_dialog">ระ�ุ�อร���ี��ะ�ห���า��ร�อ��ี</string>
-  <string name="pref_has_root">�อ�าร���า�ึ� root</string>
-  <string name="pref_has_root_summary">�อ�าร���า�ึ� root ��ื�อ�ำ�ร�อ��ี��� Transparent</string>
-  <string name="status_install_success">�ิ��ั�����ารี�อ� Tor สำ�ร���ล�ว</string>
-  <string name="status_install_fail">�ม�สามาร��ิ��ั����ล����ารี�อ� Tor ��� ��ร��รว�สอ��ั��ึ��ละ�����ั�หา�ี� tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">��ร��รม�ำ�า��ิ��ลา�</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">��ี�ยว�ั� Orbot</string>
-  <string name="btn_next">��อ��</string>
-  <string name="btn_back">�อยหลั�</string>
-  <string name="btn_finish">�สร��</string>
-  <string name="btn_okay">��ล�</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">�ห�สิ��ิ��ล�ว</string>
-  <string name="wizard_permissions_stock">สิ��ิ��อ� Orbot</string>
-  <string name="wizard_premissions_msg_root">ยอ��ยี�ยม! �รา��ว�า�ุ�����ำ�าร root ��ื�อ��ิ��ารอ�ุ�า��ห��ั� Orbot �ล�ว �รา�ะ���สิ��ิ��ี�อย�า������ระ�ย���</string>
-  <string name="wizard_permissions_msg_stock">�ึ��ะ�ม�����รื�อ��ำ���� ��� Orbot �ะ�ำ�า����อย�า�มี�ระสิ��ิภา�มา��ึ����าอุ��ร���ี����รั��าร���า�ึ� root ���ุ�ม��า�ล�า���ื�อมอ��ลั��ี��ห� Orbot!</string>
-  <string name="wizard_permissions_no_root">��า�ุ��ม�สามาร����า�ึ� root หรือ�ม����า��ว�า�รา�ำลั��ู��ึ�อะ�รอยู� �ห�������าะ��ร��รม�ี�สร�า�มา��ื�อ����ั� Orbot ���า�ั��</string>
-  <string name="wizard_permissions_consent">�ั����า���ละ��อ��าร�ำ��อ��ย�ม����สิ��ิ� Superuser</string>
-  <string name="wizard_permission_enable_root">�ห�สิ��ิ��าร root ��� Orbot</string>
-  <string name="wizard_configure">�ั����า�าร����า���า� Tor</string>
-  <string name="wizard_configure_msg">Orbot มี�ัว�ลือ��ห��ุ��ารรั�ส����อมูล�อ��ุ���ร��รม��า� Tor หรือ�ลือ�����า����าะ��ร��รม�����</string>
-  <string name="wizard_configure_all">�ห��ุ���ร��รม��า��ร�อ��ี�อ� Tor</string>
-  <string name="wizard_configure_select_apps">�ลือ���ร��รม�ี��ะ�ห���� Tor</string>
-  <string name="wizard_tips_tricks">��ร��รม�ี��������ั� Orbot</string>
-  <string name="wizard_tips_msg">��ร��รม�าม��า�ล�า��ู��ั��า�ึ����ื�อ�ำ�า��ั� Orbot �����ละ�ุ�ม��ื�อ�ิ��ั���อ��ี� หรือ�ิ��ั���ีหลั��� Google Play �ี��ว������ GuardianProject.info หรือ��า� F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ����อ��วาม�ลอ�ภัย�อ���ล�อ����ระ����อ�วาม����อ�����ั��ีสำหรั��อ��รอย��</string>
-  <string name="wizard_tips_proxy">�าร�ั����า�ร�อ��ี - �รีย�รู��าร�ั����า��ร��รม�ห��ำ�า��ั� Orbot ���</string>
-  <string name="wizard_tips_duckgo">�อ���ร��รม���หา DuckDuckGo</string>
-  <string name="wizard_tips_twitter">�ั���ร�อ��ี�อ� Twitter ��ื�อ host \"localhost\" �ละ�อร�� 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - สร�า��รื�อ�ราว�ละ�ล�อย�ห� Tor �ั��าร�รื�อ��วาม�ลอ�ภัย</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">�ั����า�ร�อ��ี</string>
-  <string name="wizard_proxy_help_msg">หา��อ��� Android �ี��ุ����รอ�รั��าร��� HTTP หรือ�ร�อ��ี SOCKS �ุ�สามาร��ำห����าอุ��ร���ห���ื�อม��อ�ั� Orbot �ละ��� Tor\n\n\n �ั����า host �ี� 127.0.0.0.1 หรือ \'localhost\' สำหรั� HTTP �าร�ั����า�อร���ือ 8118 สำหรั� SOCKS �ร�อ��ี�ือ 9050 หา�����������วร��� SOCKS4A หรือ SOCKS5\n \n\n\n สามาร��ู�รื�อ��าร����ร�อ��ี�� Android ��ิ�ม��ิม����ี��ำ�าม�ี�����อย ���ว������ http://tinyurl.com/proxyandroid\n ;</string>
-  <string name="wizard_final">Orbot �ร�อม����า��ล�ว!</string>
-  <string name="wizard_final_msg">���ั�ว�ล�หลายล�า������ Tor ��วย�ห�ุ�ลหลา�หลาย��วย�ั�\n\n�ั���าว�ละ�ู���ีย��ล�อ� �ั�����อ�สิ��ิม�ุษย�� ���าห��า�ี��ำรว� �หาร �ริษั� �ล�มือ��ี�อยู�ภาย���ระ�อ��าร���รอ�����ว��ุม �ละ�ล�มือ��ั�ว��... �ละ�อ��ี��ุ����ร�อม�ี��ะ����ล�ว�����ั�</string>
-  <string name="wizard_exit_at_first_screen_toast">�รุ�า�ำห����า Orbot ��อ��ริ�ม���</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">�ุ���ื�อม��อ�ั���รือ��าย Tor สำ�ร���ล�ว ����ม������ลว�าอุ��ร���อ��ุ��ลอ�ภัย �ุ�สามาร�����ุ�ม \'��ราว���อร�\' ��ื�อ��สอ��าร��ื�อม��อ�อ��ุ����\n\n �รีย�รู���ิ�ม��ิม��ย�ยี�ยม�ม�ว�������อ��รา https://guardianproject.info/apps/orbot หรือส��อี�มลมา�ี� help@xxxxxxxxxxxxxxxxxxxx</string>
-  <string name="tor_check">�ะ����ว����ราว���อร��อ��ุ���ิ�ห��า https://check.torproject.org ��ื�อ�รว�สอ�ว�า�าร�ั����า�อ� Orbot �ู���อ�หรือ�ม� �ละ�ุ������ื�อม��อ�ั� Tor หรือ�ม�</string>
-  <string name="pref_hs_group">�ฮส���ริ�าร�ี���อ�</string>
-  <string name="pref_general_group">�ั�ว��</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-->
-  <string name="wizard_title_msg">Orbot �ำ Tor มาสู��อ��รอย���ล�ว!\n\n Tor ��วย����อ��ุ��า��าร�รอ���ื�อหา �ารวิ��ราะห��ารรั�ส����อมูล �ละ�ารสอ�ส�อ���รือ��าย�ี��ุ��าม�วาม����ส�ว��ัว ��อมูล�ี������วามลั� �ละ�วามสัม�ั���ส�ว��ุ��ล\n\n �ัว��วย�ี��ะ��วย�ห��ุ��ำห����า Orbot �ละ Tor ��อุ��ร���อ��ุ�</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">�ำ��ือ�</string>
-  <string name="wizard_warning_msg">�าร�ิ��ั�� Orbot �ม����สร�า��าร�ม�ระ�ุ�ื�อ�ห��ั��ารรั�ส����อมูล����รศั���มือ�ือ�อ��ุ���ยอั���มั�ิ\n\n �ุ���อ��ำห����า Orbot �ห��รีย�ร�อย��ื�อ�ห�อุ��ร���ละ�อ�อื��� ����า� Tor ���สำ�ร��</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">สิ��ิ�</string>
-  <string name="wizard_permissions_root_msg1">�ุ�สามาร��ลือ��ห�สิ��ิ� Superuser ��� Orbot ��ื�อ��ิ�����า��ุ�สม�ั�ิ�ั��สู� �����ร�อ��ี��� Transparent ���</string>
-  <string name="wizard_permissions_root_msg2">��า�ุ��ม���อ��าร ��ร������ว�า�ุ������ร��รม�ี�สร�า�มา��ื�อ����ั� Orbot</string>
-  <string name="wizard_permissions_no_root_msg">อุ��ร���อ��ุ�ยั��ม���� root หรือ�ห��าร���า�ึ� root หรือ�ู��อร�ยูส��อร�\n\n ��ร�ลอ�����หม��อ���ห��า�อหลั����</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">��ร��รม�ี��������ั� Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ��อ��ั��วาม�ลอ�ภัย�อ��อ�ส���า��วย�าร���ารหัสลั�����ม��ั��ึ��ระวั�ิ</string>
-  <string name="wizard_tips_orweb">Orfox: ��ราว���อร��ี��รั�������ื�อ�วาม����ส�ว��ัว�ละ�ำ�า���า� Tor</string>
-  <string name="wizard_tips_play">���หา�อ� Guardian Project �ั��หม�����ี� Google Play</string>
-  <string name="wizard_tips_fdroid">���หา�อ� Guardian Project �ั��หม�����ี� F-Droid</string>
-  <string name="wizard_tips_fdroid_org">���หา�อ� Guardian Project �ั��หม�����ี� https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">�ำลั��ำ�ร�อ��ี��� Transparent</string>
-  <string name="wizard_transproxy_msg">�ะอ�ุ�า��ห���ร��รม�อ��ุ��ำ�า���า���รือ��าย Tor อั���มั�ิ��ย�ม���อ��ั����า���</string>
-  <string name="wizard_transproxy_hint">(�ลือ��ัว�ลือ��ี���า�ุ��ม����า���รื�อ��ี��รา�ำลั�อ�ิ�าย)</string>
-  <string name="wizard_transproxy_none">�ม�มี</string>
-  <string name="pref_transparent_tethering_title">�าร��ื�อม��อ��ว���า� Tor</string>
-  <string name="pref_transparent_tethering_summary">��ิ�����า��ร�อ��ี��� Transparent �อ� Tor �ห��ั�อุ��ร��อื���ี���ื�อม��า� Wifi �ละ USB (��อ��ริ�ม�ำ�า��หม�)</string>
-  <string name="button_grant_superuser">ร�อ��อ�าร���า�ึ�สิ��ิ� Superuser</string>
-  <string name="pref_select_apps">�ลือ���ร��รม</string>
-  <string name="pref_select_apps_summary">�ลือ���ร��รม�ี��ะ�ห���ื�อม��อ��า� Tor</string>
-  <string name="pref_node_configuration">�าร�ั����า�ห��</string>
+    <!--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="button_proxy_all">�ร�อ��ี�ั��หม�</string>
-  <string name="button_proxy_none">�ม�มี�ร�อ��ี</string>
-  <string name="button_invert_selection">สลั�ส�ว��ี��ลือ�</string>
-  <string name="pref_proxy_title">�ร�อ��ี��รือ��าย�าออ� (ระ�ุหรือ�ม������)</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">รหัส��า��ร�อ��ี�าออ�</string>
   <string name="pref_proxy_password_summary">รหัส��า��ร�อ��ี (ระ�ุหรือ�ม������)</string>
   <string name="pref_proxy_password_dialog">�ส�รหัส��า��ร�อ��ี</string>
-  <string name="status">ส�า�ะ</string>
-  <string name="setting_up_full_transparent_proxying_">�ำลั��ิ��ั���ร�อ��ี��� Transparent �</string>
-  <string name="setting_up_app_based_transparent_proxying_">�ำลั��ิ��ั���ร�อ��ี��� Transparent ��รู�����อ��</string>
-  <string name="transparent_proxying_enabled">�ร�อ��ี��� Transparent �ู���ิ�����า�</string>
-  <string name="transproxy_enabled_for_tethering_">�ร�อ��ี��� Transparent �ู���ิ����สำหรั��าร��ื�อม��อ��ว�!</string>
-  <string name="warning_error_starting_transparent_proxying_">�ำ��ือ�: ��ิ���อ�ิ��ลา���ะ�ี��ร�อ��ี��� Transparent �ริ�ม�ำ�า�</string>
-  <string name="transproxy_rules_cleared">���อ��ร�อ��ี��� Transparent �ู�ล�า�</string>
-  <string name="couldn_t_start_tor_process_">�ม�สามาร��ริ�ม�ระ�ว��าร�อ� Tor</string>
-  <string name="privoxy_is_running_on_port_">Polipo �ำลั��ำ�า�อยู����อร��:</string>
-  <string name="setting_up_port_based_transparent_proxying_">�ำลั��ิ��ั���ร�อ��ี��� Transparent ���ระ�ุ�อร���</string>
-  <string name="bridge_error">Bridge �ั���อ�</string>
-  <string name="bridge_requires_ip">���าร����า��ุ�สม�ั�ิ Bridge �ุ���อ�ระ�ุ�ี�อยู��อ�ี�อ� Bridge อย�า���อย 1 �อ�ี </string>
-  <string name="send_email_for_bridges">ส��อี�มล���ี� bridges@xxxxxxxxxxxxxx ��ยระ�ุ��� \"get bridges\" ����ื�อ�วามอี�มล �ล�วส����ย����ั��ี�ู���� gmail</string>
-  <string name="error">�ิ��ลา�</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">��� *���าะ* �ห���ี�ระ�ุ�หล�า�ี����า�ั��</string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">����า� Bridges</string>
-  <string name="bridges_obfuscated">Bridges �ี��ู�อำ�รา�</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">��ิ�����า��า����าอื�����าสู���รือ��าย Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">��ิ�����า���า Bridge �ี��ู��ั����า���� Bridges �ี��ู�อำ�รา�</string>
-  <string name="ip_address_and_port_of_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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">�อร���ี����า�ึ����</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">�อร���ี����า�ึ����หลั���ร�วอลล��ี�มี�วาม���ม�ว�</string>
   <string name="enter_ports">ระ�ุ�อร��</string>
-  <string name="enable_hidden_services">�ฮส���ริ�าร�ี���อ�</string>
-  <string name="run_servers_accessible_via_the_tor_network">อ�ุ�า��ห����า�ึ���ิร���วอร���อุ��ร�������า���รือ��าย Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">ระ�ุ�อร���อ� localhost สำหรั��ริ�าร�ี���อ�</string>
-  <string name="hidden_service_ports">�อร���อ��ริ�าร�ี���อ�</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">�ื�อ�ี����ระ�ุสำหรั��ริ�าร�ี���อ��อ��ุ� (สร�า���ยอั���มั�ิ)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">��ิ�����า��ารส��ออ��ั��ึ��ี�ั�� (��อ���� adb หรือ aLogCat ��ื�อ�ู)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">��ิ�����า��ารส��ออ��ั��ึ��ี�ั�� (��อ���� adb หรือ aLogCat ��ื�อ�ู)</string>
   <string name="project_home">�ี�อยู���ร��าร:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">สั��าอ�ุ�า��อ� Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">�อ����วร���ย�ู��ลิ�อื��:</string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">�ริ�าร�ี���อ���:</string>
-  <string name="unable_to_read_hidden_service_name">�ม�สามาร�อ�า��ื�อ�อ��ริ�าร�ี���อ�</string>
+    <string name="unable_to_read_hidden_service_name">�ม�สามาร�อ�า��ื�อ�อ��ริ�าร�ี���อ�</string>
   <string name="unable_to_start_tor">�ม�สามาร��ริ�ม Tor:</string>
-  <string name="unable_to_reset_tor">รี�ู�อุ��ร���อ��ุ� Tor �ม�สามาร�รี�������</string>
-  <string name="pref_use_sys_iptables_title">��� ��า�ริ�ม����อ� Iptables</string>
-  <string name="pref_use_sys_iptables_summary">������ารี�อ� iptables �ี�มีอยู��ล�ว����ัว�ี�มา�ร�อม�ั� Orbot</string>
-  <string name="error_installing_binares">�ม�สามาร��ิ��ั��หรือ�รั�รุ�����ารี�อ� Tor</string>
-  <string name="pref_use_persistent_notifications">�ส���อ�อ����ูล�าร��สมอ�มื�อ Orbot ��ื�อม��ออยู�</string>
+    <string name="pref_use_persistent_notifications">�ส���อ�อ����ูล�าร��สมอ�มื�อ 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="notification_using_bridges">��ิ�����า� Bridges �ล�ว!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ภาษา</string>
-  <string name="set_locale_summary">�ลือ��ำ�ห����ี��ั���ละภาษาสำหรั� Orbot</string>
-  <string name="wizard_locale_title">�ลือ�ภาษา</string>
-  <string name="wizard_locale_msg">�����า�ริ�ม���หรือ�ลือ�ภาษา�ั��ุ�ั�</string>
-  <string name="powered_by">ส�ั�ส�ุ���ย Tor</string>
-  <string name="btn_save_settings">�ั��ึ��าร�ั����า</string>
-  <string name="no_internet_connection_tor">�ม�มี�าร��ื�อม��ออิ���อร����� Tor �ร�อมรอ����า�...</string>
-  <string name="bandwidth_">�����วิ�:</string>
-  <string name="down">ล�</string>
-  <string name="up">�ึ��</string>
-  <string name="pref_disable_network_title">�ม�����รือ��าย �ั��าร����า�อั���มั�ิ</string>
+    <string name="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="menu_verify_browser">��ราว���อร�</string>
-  <string name="menu_use_chatsecure">��� ChatSecure</string>
-  <string name="permission_manage_tor_label">�ั��าร Tor</string>
-  <string name="permission_manage_tor_description">����อ��ี���ื�อ�ว��ุม�ริ�าร Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot �ำ�า�����ี�ี�สุ�����ราว���อร� Orfox ��อ��าร�ิ��ั��หรือ�ม�</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot �ำ�า�����ี�ี�สุ�����ราว���อร� Orfox ��อ��าร�ิ��ั��หรือ�ม�</string>
   <string name="install_apps_">��อ��าร�ิ��ั����ราว���อร�หรือ�ม�</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">�ม�มี�าร��ื�อม��อ��รือ��าย �ั��าร����า� Tor</string>
   <string name="network_connectivity_is_good_waking_tor_up_">�าร��ื�อม��อ�ส�ียร ��ิ�����า� Tor...</string>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">�ำห����า Torrc �อ�</string>
   <string name="pref_torrc_summary">สำหรั��ู���ี�ยว�า����า�ั��: ระ�ุ�รร�ั��ี��ำห����า torcc ��ย�ร�</string>
   <string name="pref_torrc_dialog">Torrc �ี��ำห���อ�</string>
-  <string name="wizard_tips_martus">Mobile Martus - �อ������อ�สาร�า���า�สิ��ิม�ุษย���อ� Benetech</string>
-  <string name="your_tor_public_ips_">IP สา�าร�ะ�อ� Tor �อ��ุ�</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">�รุ�า�ิ��าร����า��อ��ี��� �อ�-&gt;�าร�ั����า-&gt; �อ��อ��รอย��หา��ุ�มี�ั�หา�าร����า� Orbot</string>
-  <string name="app_conflict">�าร�ั��ย���อ��อ�</string>
-  <string name="pref_transproxy_refresh_title">�ส���ร�อ��ี��� Transparent �หม�อั���มั�ิ</string>
-  <string name="pref_transproxy_refresh_summary">������ร�อ��ี��� Transparent ��ำ�มื�อส�า�ะ��รือ��าย��ลี�ย�</string>
-  <string name="pref_transproxy_flush_title">�ั��ั��ห�ล��ร�อ��ี��� Transparent</string>
-  <string name="pref_transproxy_flush_summary">��ะ�ี��ี���ื�อล�า�����รือ��าย�ร�อ��ี��� Transparent �ั��หม��ั��ี</string>
-  <string name="transparent_proxy_rules_flushed_">ล�า�����รือ��าย������ร�อ��ี��� Transparent �ล�ว</string>
-  <string name="you_do_not_have_root_access_enabled">�ุ�ยั��ม������ิ�����า��าร���า�ึ� root</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">�ุ�อา���อ�หยุ��ละ�ริ�ม Orbot ��ื�อ�ห��าร�ั����า�ี���ลี�ย���ล�������า����</string>
-  <string name="menu_vpn">�อ�</string>
-  <string name="kbps">�ิ�ล�ิ���อวิ�า�ี</string>
+    <string name="kbps">�ิ�ล�ิ���อวิ�า�ี</string>
   <string name="mbps">�ม�ะ�ิ���อวิ�า�ี</string>
   <string name="kb">�ิ�ล����</string>
   <string name="mb">�ม�ะ����</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">�ว��</string>
   <string name="activate">��ิ�����า�</string>
   <string name="apps_mode">�หม� VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">�ุ�สามาร���ิ�����า��อ���า� Tor ��ย��� VPN Orbot �ี�มี�ิ��ั��มา�ห�\n\n �ึ���ม�����ำ�ห��ุ��ริ�ม�าร����า�����ม�ระ�ุ�ัว�� ����ะ�����าร�ำ�ห���า���ร�วอลล����</string>
-  <string name="send_email">ส��อี�มล</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�มื�อ�ุ�����ี�อยู��ล�ว �ห��ั�ลอ� &amp; วา�ล����าร�รั�����ลั�ษ�ะ�อ� \"Bridge\" ���าร�ั����า�อ� Orbit �ละ�ริ�ม�าร�ำ�า��หม�</string>
   <string name="install_orweb">�ิ��ั�� Orfox</string>
-  <string name="standard_browser">��ราว���อร�มา�ร�า�</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">หมาย�ห�ุ: มี��ีย� Bridge �อ� Tor มา�ร�า����า�ั���ี��ำ�า���อุ��ร�� Intel X86/ATOM ���</string>
-  <string name="vpn_default_world">ส�ว�รวม (อั���มั�ิ)</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="ports">�อร��</string>
-  <string name="local_port">�อร������รื�อ�</string>
+    <string name="local_port">�อร������รื�อ�</string>
   <string name="onion_port">�อร�� Onion</string>
   <string name="name">�ื�อ�อ�สาร</string>
   <string name="done">�สร��สิ��!</string>
@@ -308,9 +162,7 @@
   <string name="backup_restored">�ื���า��อมูลสำรอ�</string>
   <string name="filemanager_not_available">�ม�สามาร���� Filemanager ���</string>
   <string name="please_grant_permissions_for_external_storage">�รุ�าอ�ุ�า��ห����า�ึ��ี�������อมูลภาย�อ�</string>
-  <string name="permission_granted">อ�ุ�า�</string>
-  <string name="permission_denied">�ม�อ�ุ�า�</string>
-  <string name="restore_backup">�ื���า��อมูลสำรอ�</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>
@@ -343,10 +195,8 @@
   <string name="pref_connection_padding_summary">��ิ�����า���อ�ว�า�ภาย����รือ��าย�สมอ��ื�อ��อ��ั��ารวิ��ราะห��ารรั�ส����อมูล�า�รู���� �ั����า�ริ�ม�������: อั���มั�ิ</string>
   <string name="pref_reduced_connection_padding">ล���อ�ว�า�ภาย����รือ��าย</string>
   <string name="pref_reduced_connection_padding_summary">�ลือ��าร��ื�อม��อรี�ลย��ห��ร�ว�ึ���ละส����อ�ว�า�ภาย����������ห���อยล���ื�อล��าร����า���อมูล�ละ�����อรี�</string>
-  <string name="please_enable_vpn">�รุ�า��ิ�����า��หม� VPN ��ื�อยอม�ห��อ��ำ�า���ย��� Tor</string>
-  <string name="app_shortcuts">�อ��ี��������ั� Tor</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">��สอ��าร��ื�อม��อ Bridge �ั� Tor</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>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 92f605a1..853866dc 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -1,127 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">simulan at ihinto ang Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Nagsisimula na ang Orbotâ?¦</string>
+    <string name="status_starting_up">Nagsisimula na ang Orbotâ?¦</string>
   <string name="status_activated">Konektado sa Tor network</string>
   <string name="status_disabled">Naka-deactivate ang Orbot</string>
   <string name="tor_process_starting">Binubuksan ang Tor clientâ?¦</string>
   <string name="tor_process_complete">kumpleto na.</string>
-  <string name="tor_process_waiting">nag-hihintay</string>
-  <string name="not_anonymous_yet">BABALA: Ang iyong traffic ay hindi pa anonimo! Kung maaari sana ay ikompigura muna ang iyong applications na gumamit ng HTTP proxy 127.0.0.1:8118 o kaya ay SOCKS4A o kaya ay SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Tahanan</string>
-  <string name="menu_browse">Mag-browse</string>
-  <string name="menu_settings">Settings</string>
+    <string name="menu_settings">Settings</string>
   <string name="menu_log">Tala</string>
-  <string name="menu_info">Tulong</string>
-  <string name="menu_start">Simulan</string>
+    <string name="menu_start">Simulan</string>
   <string name="menu_stop">Ihinto</string>
   <string name="menu_about">Tungkol</string>
   <string name="main_layout_download">Download</string>
   <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Tulong</string>
-  <string name="button_close">Isara</string>
-  <string name="button_about">Tungkol</string>
-  <string name="button_clear_log">Linisin ang tala</string>
-  <string name="menu_verify">Tiyakin</string>
-  <string name="menu_exit">Labasan</string>
+    <string name="button_about">Tungkol</string>
+    <string name="menu_exit">Labasan</string>
   <string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>
-  <string name="press_to_start">- pindutin ng matagal para mag umpisa -</string>
-  <string name="pref_trans_proxy_group">Nanganganinag na pag Po-proxy (Kailangan ang Root)</string>
-  <string name="pref_trans_proxy_title">Nanganganinag na pag Po-proxy </string>
-  <string name="pref_trans_proxy_summary">Kusang pag Torifying ng mga Apps</string>
-  <string name="pref_transparent_all_title">Tor lahat</string>
-  <string name="pref_transparent_all_summary">I-proxy ang traffic ng lahat ng apps gamit ang Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">BABALA: Dayain ang mga karaniwang ports (80, 443, etc). *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
-  <string name="pref_transparent_port_title">Lisatahan ng Port</string>
-  <string name="pref_transparent_port_summary">Lisatahan ng mga ports sa proxy. *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
-  <string name="pref_transparent_port_dialog">Ipasok ang ports sa proxy</string>
-  <string name="pref_has_root">Humiling ng daanan sa Root</string>
-  <string name="pref_has_root_summary">Humiling ng daanan sa Root para sa nanganganinag na pag Po-proxy</string>
-  <string name="status_install_success">Ang Tor binaries ay matagumpay na i-install.</string>
-  <string name="status_install_fail">Ang Tor binary files ay hindi na install. Paki tignan ang tala at magbigay alam sa tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">May mali sa Application</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tungkol sa Orbot</string>
-  <string name="btn_next">Susunod</string>
-  <string name="btn_back">Balik</string>
-  <string name="btn_finish">Wakas</string>
-  <string name="btn_okay">Okay</string>
+    <string name="btn_okay">Okay</string>
   <string name="btn_cancel">Kanselahin</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Ilang detalye sa Orbot</string>
-  <string name="wizard_permissions_root">Napahintulotan na</string>
-  <string name="wizard_permissions_stock">Pahintulot ng Orbot</string>
-  <string name="wizard_premissions_msg_root">Mahusay! Natuklasan namin na mayroon pahintulot ang Orbot para sa root. Gagamitin namin ito ng mabuti.</string>
-  <string name="wizard_permissions_msg_stock">Ito ay hindi kinakailangan, ngunit mas mapapalawig ang kakayahan ng Orbot kung ang iyong device ay meron access sa root. Gamitin ang pindutan sa ibaba para bigyan ng superpowers ang Orbot!</string>
-  <string name="wizard_permissions_no_root">Kung wala kang access sa root o wala kang alam sa sinasabi namin, siguraduhin mu nalamang na gagamit ka ng mga apps na ginawa para sa Orbot.</string>
-  <string name="wizard_permissions_consent">Nauunawaan ko at mag-papatuloy ng walang Superuser</string>
-  <string name="wizard_permission_enable_root">Pahintulutan ang Orbot para sa Root</string>
-  <string name="wizard_configure">Kompigurahin ang Torification</string>
-  <string name="wizard_configure_msg">Binibigyan ka ng Orbot ng pagpipilian na i-route lahat ng application traffic gamit ang Tor o piliin ang application isa-isa.</string>
-  <string name="wizard_configure_all">I-proxy lahat ng Apps gamit ang Tor</string>
-  <string name="wizard_configure_select_apps">Pumili ng isa-isang apps para sa Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">Ang mga apps sa ibaba ay dinevelop upang gumana sa Orbot. I-click ang button para i-install, o sila ay mahahanap sa Google Play, sa GuardianProject.info website o sa F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Isang Secure instant messaging client para sa Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Alamin paano magkompigura ng apps para gumana sa Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
-  <string name="wizard_tips_twitter">I-set ang Twitter proxy sa host \"localhost\" at port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">Kung ang ginagamit na Android app ay gumagamit ng HTTP o SOCKS proxy, ibig sabihin lang noon ay pwede mong isaayos para kumunekta sa Orbot sa paggamit ng Tor.\n\n\n Ang host settings ay 127.0.0.1 o \"localhost\". Para naan sa HTTP, ang port setting ay 8118. Para naman sa SOCKS, ang proxy ay 9050. Kailangan mong gamitin ang SOCKS4A o SOCKS5 kung posible.\n \n\n\n Mas marami kang matututunan sa proxying sa Android sa pamamagitan ng FAQ sa: http://tinyurl.com/proxyandroid .\n </string>
-  <string name="wizard_final">Handa na ang Orbot!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Bubuksan nito ang iyong browser sa https://check.torproject.org para matignan kung ang Orbot ay na-kompigura at konektado ka sa Tor.</string>
-  <string name="pref_hs_group">Tagong Service Hosting</string>
-  <string name="pref_general_group">Pangkalahatan</string>
+    <!--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-->
-  <string name="wizard_title_msg">Ang Orbot ang nagdala ng Tor sa Android!\n\nAng Tor ay tumutulong sa iyo na sanggain ang pagsala ng nilalaman, pag-analisa ng trapiko at pangmamatyag sa network na mapanganib sa iyong privacy, conpidensyal na impormasyon at personal na relasyon.\n\nAng wizard ang makakatulong sa iyo para isaayos ang Orbot at Tor sa iyong device.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Babala</string>
-  <string name="wizard_warning_msg">Sa pag-install nang Orbot, hindi nito awtomatikong ina-anonymize ang iyong trapiko sa iyong mobile.\n\nKailangan mong isaayos ng tama ang Orbot, sa iyong device at sa iba pang apps para matagumpay na magamit ang Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Mga Pahintulot</string>
-  <string name="wizard_permissions_root_msg1">Maari mong piliin bigyan ng pahintulot ang Orbot ng \'Superuser\' access para ma-enable ang mga advanced features tulad ng Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Kapag ayaw mo itong gawin, siguraduhing gumamit ng apps na ginawa upang gumana kasama ang Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Mukang ang iyong device ay hindi pa rooted o hindi nagbibigay ng daan sa root o \'Superuser\'.\n\nPakiusap, o hindi kaya subukan ang paraan ng \'Apps\' sa pangunahing screen.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Isang secure chat app na may Off-the-Record Encryption</string>
-  <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser na gumagana sa pamamagitan ng Tor.</string>
-  <string name="wizard_tips_play">Hanapin ang lahat ng Guardian Project apps sa Google Play</string>
-  <string name="wizard_tips_fdroid">Hanapin ang lahat ng Guardian Project apps sa F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Hanapin ang lahat ng Guardian Project apps sa https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">Ito ay bibigyan ng pahintulot ang iyong mga apps na kusang mag-run sa Tor network kahit walang pag-kompigura na ginawa.</string>
-  <string name="wizard_transproxy_hint">(Lagyan ng check ang box na ito kung wala kang alam sa sinasabi namin)</string>
-  <string name="wizard_transproxy_none">Wala</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">I-enable ang Tor Transparent Proxying para sa Wifi at USB Tethered Devices (kailangan mag restart)</string>
-  <string name="button_grant_superuser">Humiling ng Superuser Access</string>
-  <string name="pref_select_apps">Pumili ng Apps</string>
-  <string name="pref_select_apps_summary">Pumili ng Apps para i-route sa Tor</string>
-  <string name="pref_node_configuration">Pagkompigura ng Node</string>
+    <!--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="button_proxy_all">Proxy All</string>
-  <string name="button_proxy_none">Proxy None</string>
-  <string name="button_invert_selection">Baliktarin ang napili</string>
-  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
+    <string name="pref_proxy_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>
@@ -137,20 +53,8 @@
   <string name="pref_proxy_password_title">Outbound Proxy Password</string>
   <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
   <string name="pref_proxy_password_dialog">Ilagay ang Proxy Password</string>
-  <string name="status">Katayuan</string>
-  <string name="setting_up_full_transparent_proxying_">Isinasaayos ang kabuuang transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Isinasaayos ang app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Na i-enable na ang Transparent proxying</string>
-  <string name="transproxy_enabled_for_tethering_">Na i-enable na ang TransProxy para sa Thethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">BABALA: error sa pag start ng transparent proxying!</string>
-  <string name="transproxy_rules_cleared">Nalinis na ang mga batas ng TransProxy</string>
-  <string name="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</string>
-  <string name="privoxy_is_running_on_port_">Ang Polipo ay gumagana ngayon sa port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Isinasaayos ang port-based transpaprent proxying...</string>
-  <string name="bridge_error">Error sa Bridge</string>
-  <string name="bridge_requires_ip">Para magamit ang feature ng bridge, kailangan mong mag lagay ng kahit isang bridge IP address.</string>
-  <string name="send_email_for_bridges">Magpadala ng email sa bridges@xxxxxxxxxxxxxx na mayroong linyang  \"get bridges\" at wala ng iba pang kasama sa katawa ng email gamit ang isang gmail account.</string>
-  <string name="error">Error</string>
+    <string name="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>
@@ -163,9 +67,7 @@
   <string name="use_only_these_specified_nodes">Gumamit ng *only* sa mga ispesipikong nodes </string>
   <string name="bridges">Bridges</string>
   <string name="use_bridges">Gumamit ng Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">I-enable kung ang naisaayos na bridges ay obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address at port ng bridges</string>
+    <string name="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>
@@ -181,54 +83,28 @@
   <string name="reachable_ports">Reachable Ports</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable sa likod ng istriktong firewall</string>
   <string name="enter_ports">I-lagay ang ports</string>
-  <string name="enable_hidden_services">Nakatagong Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">pahintulutan sa on-device server na maging malalapitan sa pamamagitan ng Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">I-lagay ang localhost ports para sa nakatagong serbisyo</string>
-  <string name="hidden_service_ports">Tagong Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ang addressable na pangalan sa iyong tagong serbisyo (awtomatikong nabuo)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">paganahiin ang debug log para sa output (kailangang gamitin ang adb o aLogCat para makita)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">paganahiin ang debug log para sa output (kailangang gamitin ang adb o aLogCat para makita)</string>
   <string name="project_home">Project Home(s):</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
 </string>
-  <string name="the_tor_license">Ang Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software:</string>
+    <string name="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="hidden_service_on">nakatagong serbisyo sa:</string>
-  <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
+    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
   <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
-  <string name="unable_to_reset_tor">I-reboot ang iyong device, hindi ma-reset ang Tor!</string>
-  <string name="pref_use_sys_iptables_title">Gumamit ng Default na Iptables</string>
-  <string name="pref_use_sys_iptables_summary">gamitin ang built-in iptables binary kaysa sa isang nabigkis kasama ng Orbot</string>
-  <string name="error_installing_binares">Ang Tor binaries ay hindi ma-install o ma-upgrade.</string>
-  <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
+    <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
   <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
   <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
   <string name="pref_use_expanded_notifications_title">Pinalawak na Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Wika</string>
-  <string name="set_locale_summary">Pumili ng locale at wika para sa Orbot</string>
-  <string name="wizard_locale_title">Pumili ng Wika</string>
-  <string name="wizard_locale_msg">Iwanang default o palitan ang kasalukuyang wika</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">I-Save ang Settings</string>
-  <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">baba</string>
-  <string name="up">taas</string>
-  <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string>
+    <string name="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="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Gamitin ang ChatSecure</string>
-  <string name="permission_manage_tor_label">Manage Tor</string>
-  <string name="menu_vpn">Apps</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -237,7 +113,6 @@
   <string name="activate">Activate</string>
   <string name="send_email">Send Email</string>
   <string name="install_orweb">I-install ang Orfox</string>
-  <string name="standard_browser">Standard Browser</string>
-  <string name="save">I-save</string>
+    <string name="save">I-save</string>
   <string name="name">Name</string>
 </resources>
diff --git a/app/src/main/res/values-tr/poestrings.xml b/app/src/main/res/values-tr/poestrings.xml
index f03a1814..2051efcc 100644
--- a/app/src/main/res/values-tr/poestrings.xml
+++ b/app/src/main/res/values-tr/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Köprüler engellemeyi almak için kullanılan Tor aktarıcılarıdır. Ä°nternet hizmeti saÄ?layıcınız Tor kullanımını engelliyorsa köprüleri kullanmayı deneyebilirsiniz. Her bir köprü türü engellemeyi aÅ?mak için farklı bir yöntem kullanılır.
-Bir köprü türü çalıÅ?mazsa baÅ?ka birini deneyin.</string>
-
-    <string name="bridges_no">Köprü Kullanılmasın: Tor AÄ?ına DoÄ?rudan BaÄ?lan</string>
-    <string name="bridges_provided">Hazır Köprüler:</string>
-    <string name="bridges_custom">�zel Köprüler</string>
-
-    <string name="bridges_config">Köprü Yapılandırması</string>
-    <string name="action_done">Tamam</string>
 
     <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>
@@ -17,19 +8,6 @@ Bir köprü türü çalıÅ?mazsa baÅ?ka birini deneyin.</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="status_connected">BaÄ?landı!</string>
-
-    <string name="loading_claim_1">Tor uygulamasını harika yapan adanmıÅ? topluluÄ?umuz!</string>
-    <string name="loading_claim_2">Günlük kullanıcılar pazarlama reklamlarını engellemek için kullanır.</string>
-    <string name="loading_claim_3">Facebook engellendiÄ?inde insanlar arkadaÅ? ve aileleri ile iletiÅ?im kullanmak için Tor kullanır.</string>
-    <string name="loading_claim_4">Aktivistler görüÅ? ve inançlarını Tweeter üzerine özgürce göndermek için kullanır.</string>
-    <string name="loading_claim_5">Blog yazarları insanlara sosyal reformlara çaÄ?ırmak için kullanır.</string>
-    <string name="loading_claim_6">Gazeteciler inceledikleri konuları güvenli bir Å?ekilde soruÅ?turmak için Tor kullanır.</string>
-    <string name="loading_claim_7">Ä°Å? insanları kurumsal bilgilerini gizli tutmak için Tor kullanır.</string>
-    <string name="loading_claim_8">Ã?alıÅ?anlar iÅ?lerini kaybetme korkusu olmadan adalet mücadelesi vermekte kullanır.</string>
-
-    <string name="status_connecting">Sizi baÄ?lıyoruz.\" =\"Sizi baÄ?lıyoruz.</string>
-
     <string name="hello">Merhaba</string>
     <string name="welcome">Mobil Tor uygulamasına hoÅ? geldiniz</string>
 
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index c44cad3b..b99672e8 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2,125 +2,38 @@
 <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="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">https://check.torproject.org/?lang=tr</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=tr</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor\'u baÅ?lat ve durdur</string>
-  <string name="tor_proxy_service_process">torvekilhizmeti</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="tor_process_waiting">bekliyor.</string>
-  <string name="not_anonymous_yet">UYARI: BaÄ?lantınız henüz isimsiz deÄ?il! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118 ya da SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak Å?ekilde ayarlayın.</string>
-  <string name="menu_home">BaÅ?langıç</string>
-  <string name="menu_browse">Gözat</string>
   <string name="menu_settings">Ayarlar</string>
   <string name="menu_log">Günlük</string>
-  <string name="menu_info">Yardım</string>
-  <string name="menu_apps">Uygulamalar...</string>
   <string name="menu_start">BaÅ?lat</string>
   <string name="menu_stop">Durdur</string>
   <string name="menu_about">Hakkında</string>
-  <string name="menu_promo_apps">Uygulamaları alın... </string>
   <string name="main_layout_download">Ä°ndir</string>
   <string name="main_layout_upload">Yükle</string>
-  <string name="button_help">Yardım</string>
-  <string name="button_close">Kapat</string>
   <string name="button_about">Hakkında</string>
-  <string name="button_clear_log">GünlüÄ?ü Temizle</string>
-  <string name="menu_verify">Denetle</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="press_to_start">- baÅ?latmak için uzun basın -</string>
-  <string name="pref_trans_proxy_group">Saydam Vekil Sunucu (Root Gerekir)</string>
-  <string name="pref_trans_proxy_title">Saydam Vekil Sunucu</string>
-  <string name="pref_trans_proxy_summary">Uygulamalar için Otomatik Tor Kullanımı</string>
-  <string name="pref_transparent_all_title">HerÅ?ey Tor Kullansın</string>
-  <string name="pref_transparent_all_summary">Tor kullanan uygulamaların vekil sunucu trafiÄ?i</string>
-  <string name="pref_transparent_port_fallback_title">Vekil Sunucu Ä°Å?lemediÄ?inde Kapı</string>
-  <string name="pref_transparent_port_fallback_summary">UYARI: Genel kapı numaralarını (80,443, v.b.) kullanmaktan kaçının. YALNIZ \'Tümü\' ya da \'Uygulama\' kipi çalıÅ?madıÄ?ında kullanın.</string>
-  <string name="pref_transparent_port_title">Kapı Listesi</string>
-  <string name="pref_transparent_port_summary">Vekil sunucudan geçirilecek kapıların listesi. *YALNIZ* \'Tümü\' ya da \'Uygulama\' kipi çalıÅ?madıÄ?ında kullanın</string>
-  <string name="pref_transparent_port_dialog">Vekil sunucudan geçecek kapı numaralarını yazın</string>
-  <string name="pref_has_root">Root EriÅ?imi Ä°steÄ?i</string>
-  <string name="pref_has_root_summary">Saydam vekil sunucu kullanımı için root eriÅ?imi isteÄ?i</string>
-  <string name="status_install_success">Tor yazılımları kuruldu!</string>
-  <string name="status_install_fail">Tor yazılım dosyaları kurulamadı. Lütfen günlüÄ?ü denetleyip sorunu tor-assistants@xxxxxxxxxxxxxx adresine bildirin</string>
-  <string name="title_error">Uygulama Hatası</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot Hakkında</string>
-  <string name="btn_next">Sonraki</string>
-  <string name="btn_back">Ã?nceki</string>
-  <string name="btn_finish">Bitti</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>
-  <string name="wizard_permissions_root">Ä°zin Verildi</string>
-  <string name="wizard_permissions_stock">Orbot Ä°zinleri</string>
-  <string name="wizard_premissions_msg_root">Mükemmel! Orbot için root izinlerinizin verilmiÅ?. Bu gücü akıllıca kullanacaÄ?ız.</string>
-  <string name="wizard_permissions_msg_stock">Gerekli olmamakla birlikte, aygıtınızın root izinleri varsa Orbot daha da güçlü bir araç olabilir. Orbot yazılımına süper güçler vermek için aÅ?aÄ?ıdaki düÄ?meyi kullanın!</string>
-  <string name="wizard_permissions_no_root">Root eriÅ?imi izniniz ya da neden bahsettiÄ?imiz hakkında bir fikriniz yoksa yalnız uygulamaların Orbot ile çalıÅ?ması için gerekli ayarların yapıldıÄ?ından emin olun.</string>
-  <string name="wizard_permissions_consent">Anlıyorum ve root izinleri olmadan devam etmek istiyorum</string>
-  <string name="wizard_permission_enable_root">Orbot Root Ä°zinlerini Ver</string>
-  <string name="wizard_configure">Tor Bildirimlerini Ayarla</string>
-  <string name="wizard_configure_msg">Orbot, tüm uygulamaların ya da seçtiÄ?iniz uygulamaların veri akıÅ?ını Tor üzerinden geçirme seçeneÄ?i sunar.</string>
-  <string name="wizard_configure_all">Tüm Uygulamalar Tor Kullansın</string>
-  <string name="wizard_configure_select_apps">Tor Kullanacak Uygulamaları Seçin</string>
-  <string name="wizard_tips_tricks">Orbot Kullanılan Uygulamalar</string>
-  <string name="wizard_tips_msg">AÅ?aÄ?ıdaki uygulamalar Orbot ile birlikte çalıÅ?mak üzere geliÅ?tirilmiÅ?tir. Uygulamaları Å?imdi kurmak için ilgili düÄ?melere tıklayabileceÄ?iniz gibi daha sonra kurmak için Google Play, GuardianProject.info web sitesi ya da F-Droid.org sitesini kullanabilirsiniz.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android için güvenli anlık iletiÅ?im istemcisi</string>
-  <string name="wizard_tips_proxy">Vekil Sunucu Ayarları - Uygulamaların Orbot ile çalıÅ?ması için ayarların nasıl yapılacaÄ?ını öÄ?renin.</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Arama Motoru uygulaması</string>
-  <string name="wizard_tips_twitter">Twitter vekil sunucusunu \"localhost\" ve kapı numarasını 8118 olarak ayarlayın</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Bir öykü oluÅ?turun, güvenliÄ?ini tor saÄ?lasın!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Vekil Sunucu Ayarları</string>
-  <string name="wizard_proxy_help_msg">KullandıÄ?ınız Android uygulaması HTTP ya da SOCKS vekil sunucu kullanımını destekliyorsa Orbot baÄ?lantısı kurmak ve Tor kullanmak için ayarlanabilir. \n\n\nSunucu 127.0.0.1 ya da \"localhost\" olarak, HTTP için kapı numarası 8118, SOCKS için vekil sunucu 9050 olarak ayarlanmalıdır. Olabiliyorsa SOCKS4A ya da SOCKS5 kullanmalısınız. \n\n\nAndroid üzerinde vekil sunucu kullanımı hakkında ayrıntılı bilgi almak için http://tinyurl.com/proxyandroid adresinden sık sorulan sorulara bakabilirsiniz. \n</string>
-  <string name="wizard_final">Orbot hazır!</string>
-  <string name="wizard_final_msg">Dünya üzerindeki milyonlarca kiÅ?i çeÅ?itli nedenlerle Tor kullanıyor.\n\nGazeteci ve blog yazarları, insan hakları savunucuları, avukatlar, askerler ve devlet kurumları, baskıcı rejim altında yaÅ?ayan halklar ve sıradan kiÅ?iler. Å?imdi siz de onlara katıldınız!</string>
-  <string name="wizard_exit_at_first_screen_toast">Lütfen kullanmaya baÅ?lamadan önce Orbot ayarlarınızı yapın!</string>
   <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Tor aÄ?ına baÄ?landınız ancak bu aygıtınızın güvenli olduÄ?u anlamına gelMÄ°yor. BaÄ?lantınızı sınamak için \'Tarayıcı\' düÄ?mesini kullanabilirsiniz. \n\nAyrıntılı bilgi almak için https://guardianproject.info/apps/orbot adresimize bakın ya da help@xxxxxxxxxxxxxxxxxxxx adresine e-posta gönderin.</string>
-  <string name="tor_check">Orbot ayarlarının doÄ?ruluÄ?unu ve Tor baÄ?lantınızı denetlemek için tarayıcınızda https://check.torproject.org adresi açılacak.</string>
-  <string name="pref_hs_group">Gizli Hizmet Barındırma</string>
   <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-->
-  <string name="wizard_title_msg">Orbot, Tor platformunu Android üzerine getirir! \n\nTor içerik süzme, trafik incelemesi ve aÄ? gözleme gibi kiÅ?isel bilgi ve iliÅ?kileirnizi tehdit eden uygulamalardan korunmanıza yardımcı olur. \n\nBu yardımcıyı kullanarak aygıtınız için Orbot ve Tor ayarlarını yapabilirsiniz.</string>
   <!--Warning screen-->
-  <string name="wizard_warning_title">Uyarı</string>
-  <string name="wizard_warning_msg">Orbot kurmak tek baÅ?ına mobil trafiÄ?inizin otomatik olarak isimsiz olmasını saÄ?lamaz. \n\nAygıtınızın ve diÄ?er uygulamalarınızın Tor kullanabilmesi için Orbot ayarlarının doÄ?ru Å?ekilde yapılması gerekir.</string>
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ä°zinler</string>
-  <string name="wizard_permissions_root_msg1">Ä°sterseniz Orbot için \'Superuser\' eriÅ?im izni vererek saydam vekil sunucu gibi geliÅ?miÅ? özellikleri kullanabilirsiniz.</string>
-  <string name="wizard_permissions_root_msg2">Bunu yapmak istemiyorsanız, Orbot ile birlikte çalıÅ?abilen uygulamaları kullandıÄ?ınızdan emin olun</string>
-  <string name="wizard_permissions_no_root_msg">Aygıtınız rootlanmamıÅ? ya da root \'Superuser\' eriÅ?im izni verilmemiÅ?. \n\nLütfen bunun yerine ana sayfadaki \'Uygulamalar\' kipini deneyin.</string>
   <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot Kullanılabilecek Uygulamalar</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Güvenli KayıtdıÅ?ı Å?ifreleme yapabilen sohbet uygulaması</string>
-  <string name="wizard_tips_orweb">Orfox: Tor üzerinden çalıÅ?an gizliliÄ?i arttırılmıÅ? web tarayıcısı</string>
-  <string name="wizard_tips_play">Google Play üzerindeki tüm Guardian Projesi uygulamalarına bakın</string>
-  <string name="wizard_tips_fdroid">F-Droid üzerindeki tüm Guardian Project uygulamalarına bakın</string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org üzerindeki tüm Guardian Project uygulamalarına bakın</string>
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Saydam Vekil Sunucu</string>
-  <string name="wizard_transproxy_msg">Bu özellik uygulamalarınızı herhangi bir ayar yapmadan Tor üzerinden çalıÅ?tırmanızı saÄ?lar.</string>
-  <string name="wizard_transproxy_hint">(Bu konuda bir fikriniz yoksa bu seçeneÄ?i iÅ?aretleyin)</string>
-  <string name="wizard_transproxy_none">Hiçbiri</string>
-  <string name="pref_transparent_tethering_title">Tor Kısıtlaması</string>
-  <string name="pref_transparent_tethering_summary">Kablosuz aÄ?lar için Tor saydam vekil sunucusu ve USB KısıtlanmıÅ? aygıtları kullanılabilsin (yeniden baÅ?latmayı gerektirir)</string>
-  <string name="button_grant_superuser">Superuser EriÅ?im Ä°zni Ä°steÄ?i</string>
-  <string name="pref_select_apps">Uygulamaları Seçin</string>
-  <string name="pref_select_apps_summary">Tor �zerinden Kullanılacak Uygulamaları Seçin</string>
   <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>
@@ -128,9 +41,6 @@
   <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="button_proxy_all">Tümünde Vekil Sunucu Kullanılsın</string>
-  <string name="button_proxy_none">Vekil Sunucu Kullanılmasın</string>
-  <string name="button_invert_selection">Seçimi Tersine �evir</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>
@@ -147,19 +57,7 @@
   <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="status">Durum</string>
-  <string name="setting_up_full_transparent_proxying_">Tam saydam vekil sunucu ayarlanıyor...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Uygulamaya özel saydam vekil sunucu ayarlanıyor...</string>
-  <string name="transparent_proxying_enabled">Saydam vekil sunucu ETKÄ°N</string>
-  <string name="transproxy_enabled_for_tethering_">Kısıtlama için Aktarım Vekil Sunucusu etkileÅ?tirildi!</string>
-  <string name="warning_error_starting_transparent_proxying_">UYARI: Saydam vekil sunucu baÅ?latılırken bir sorun çıktı!</string>
-  <string name="transproxy_rules_cleared">Aktarım Vekil Sunucusu kuralları temizlendi</string>
   <string name="couldn_t_start_tor_process_">Tor iÅ?lemi baÅ?latılamadı:</string>
-  <string name="privoxy_is_running_on_port_">Polipo Å?u kapı numarasında çalıÅ?ıyor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Kapı numarasına göre saydam vekil sunucu ayarlanıyor...</string>
-  <string name="bridge_error">Köprü Hatası</string>
-  <string name="bridge_requires_ip">Köprü özelliÄ?ini kullanabilmek için en az bir tane köprü IP adresi yazmalısınız.</string>
-  <string name="send_email_for_bridges">Bir gmail hesabından bridges@xxxxxxxxxxxxxx adresine içinde yalnız \"get bridges\" yazan bir eposta gönderin.</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>
@@ -173,9 +71,7 @@
   <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="bridges_obfuscated">KarartılmıÅ? Köprüler</string>
   <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatif Tor aÄ?ı giriÅ?leri kullanılabilsin</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">AyarlanmıÅ? köprüler karartılmıÅ? ise etkinleÅ?tirin</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>
@@ -192,16 +88,9 @@
   <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_hidden_services">Gizli Hizmet Barındırma</string>
-  <string name="run_servers_accessible_via_the_tor_network">aygıt üzerindeki sunucuya Tor aÄ?ından eriÅ?ilebilsin</string>
-  <string name="enter_localhost_ports_for_hidden_services">gizli hizmet barındırması için localhost kapı numarasını yazın</string>
-  <string name="hidden_service_ports">Gizli Hizmet Kapı Numaraları</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">gizli hizmetinizin adreslenebilir adı (otomatik olarak verilir)</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="the_tor_license">Tor Lisansı</string>
-  <string name="https_torproject_org">https://torproject.org</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>
@@ -211,36 +100,17 @@
   <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="hidden_service_on">Å?unun üzerindeki gizli hizmet:</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="unable_to_reset_tor">Aygıtınızı yeniden baÅ?latın, Tor sıfırlanamadı!</string>
-  <string name="pref_use_sys_iptables_title">Varsayılan Ip tabloları kullanılsın</string>
-  <string name="pref_use_sys_iptables_summary">Orbot ile gelen yerine önceden yüklü olan iptables yazılımı kullanılsın</string>
-  <string name="error_installing_binares">Tor yazılımı kurulamadı ya da yükseltilemedi.</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="notification_using_bridges">Köprüler etkinleÅ?tirildi!</string>
-  <string name="default_bridges"></string>
   <string name="set_locale_title">Dil</string>
-  <string name="set_locale_summary">Orbot için kullanılacak yerel ayarları ve dili seçin</string>
-  <string name="wizard_locale_title">Dili seçin</string>
-  <string name="wizard_locale_msg">Varsayılanda bırakın ya da geçerli dile geçin</string>
-  <string name="powered_by">Tor ile sunulmaktadır</string>
-  <string name="btn_save_settings">Ayarları Kaydet</string>
   <string name="no_internet_connection_tor">Ä°nternet baÄ?lantısı yok; Tor hazırda bekliyor...</string>
-  <string name="bandwidth_">Bant geniÅ?liÄ?i:</string>
-  <string name="down">gelen</string>
-  <string name="up">giden</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="menu_verify_browser">Tarayıcı</string>
-  <string name="menu_use_chatsecure">ChatSecure Kullanılsın</string>
-  <string name="permission_manage_tor_label">Tor Yönetimi</string>
-  <string name="permission_manage_tor_description">Tor hizmetini denetlemek için bu uygulamayı etkinleÅ?tirin</string>
   <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot en iyi Orfox Tarayıcı ile çalıÅ?ır. Å?imdi kurmak ister misiniz?</string>
   <string name="install_apps_">Tarayıcı kurulsun mu?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Herhangi bir aÄ? baÄ?lantısı yok. Tor uyutuluyor...</string>
@@ -258,18 +128,6 @@
   <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="wizard_tips_martus">Mobile Martus - Benetech İnsan Hakları Belgeleri Uygulaması</string>
-  <string name="your_tor_public_ips_">Herkese Açık Tor IP Adresleriniz:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbot ile sorun yaÅ?ıyorsanız lütfen bu uygulamayı Android-&gt;Ayarlar-&gt;Uygulamalar bölümünden devre dıÅ?ı bırakın:</string>
-  <string name="app_conflict">Uygulama Ã?atıÅ?ması</string>
-  <string name="pref_transproxy_refresh_title">Aktarım Vekil Sunucusu Otomatik Yenileme</string>
-  <string name="pref_transproxy_refresh_summary">AÄ? durumu deÄ?iÅ?tiÄ?inde Aktarım Vekil Sunucusu kuralları yeniden uygulansın</string>
-  <string name="pref_transproxy_flush_title">Aktarım Vekil Sunucusu Kurallarını SİL</string>
-  <string name="pref_transproxy_flush_summary">Tüm Aktarım Vekil Sunucusu aÄ? kurallarını temizlemek için buraya dokunun</string>
-  <string name="transparent_proxy_rules_flushed_">Aktarım vekil sunucusu kuralları silindi!</string>
-  <string name="you_do_not_have_root_access_enabled">ROOT eriÅ?imi izniniz yok</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ayarların etkin olması için Orbot uygulamasını durdurup yeniden baÅ?latmanız gerekebilir.</string>
-  <string name="menu_vpn">Uygulamalar</string>
   <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
@@ -283,18 +141,14 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">EtkinleÅ?tir</string>
   <string name="apps_mode">VPN Kipi</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Orbot VPN özelliÄ?ini kullanarak aygıtınızdaki tüm uygulamaların Tor üzerinden Ä°nternete baÄ?lanmasını saÄ?layabilirsiniz.\n\nBu özellik isimsiz gizlilik saÄ?lamaz ancak güvenlik duvarlarının aÅ?ılmasını saÄ?lar.</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="install_orweb">Orfox Kurulsun</string>
-  <string name="standard_browser">Standart Tarayıcı</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOT: Intel X86/ATOM cihazlarda yalnız standart Tor köprüleri çalıÅ?ır</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="ports">Kapılar</string>
   <string name="local_port">Yerel Kapı</string>
   <string name="onion_port">Onion Kapısı</string>
   <string name="name">Ad</string>
@@ -308,8 +162,6 @@
   <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="permission_granted">Ä°zin verildi</string>
-  <string name="permission_denied">Ä°zin verilmedi</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>
@@ -343,9 +195,7 @@
   <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="please_enable_vpn">Lütfen uygulamaların Tor kullanmasını saÄ?lamak için VPN kipini etkinleÅ?tirin</string>
   <string name="app_shortcuts">Tor Kullanan Uygulamalar</string>
-  <string name="title_activity_bridge_wizard">KöprüYardımcısıİÅ?lemi</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>
diff --git a/app/src/main/res/values-uk/poestrings.xml b/app/src/main/res/values-uk/poestrings.xml
index 86be81e6..c4b4ba6b 100644
--- a/app/src/main/res/values-uk/poestrings.xml
+++ b/app/src/main/res/values-uk/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"Ð?оÑ?Ñ?и â?? Ñ?е пеÑ?едаваÑ?Ñ? Tor, Ñ?кÑ? допомагаÑ?Ñ?Ñ? обÑ?йÑ?и Ñ?ензÑ?Ñ?Ñ?. Ð?и можеÑ?е Ñ?пÑ?обÑ?ваÑ?и моÑ?Ñ?и, Ñ?кÑ?о Tor заблоковано ваÑ?им пÑ?овайдеÑ?ом; кожен Ñ?ип моÑ?Ñ?Ñ? викоÑ?иÑ?Ñ?овÑ?Ñ? Ñ?накÑ?ий меÑ?од
-Ñ?об Ñ?никнÑ?Ñ?и Ñ?ензÑ?Ñ?и: Ñ?кÑ?о один Ñ?ип не пÑ?аÑ?Ñ?Ñ?, Ñ?пÑ?обÑ?йÑ?е викоÑ?иÑ?Ñ?аÑ?и Ñ?нÑ?ий.</string>
-
-    <string name="bridges_no">Ð?емаÑ? Ð?оÑ?Ñ?Ñ?в: Ð?езпоÑ?еÑ?еднÑ?о пÑ?дклÑ?Ñ?иÑ?иÑ?Ñ? до Tor</string>
-    <string name="bridges_provided">Ð?аданÑ? Ð?оÑ?Ñ?и:</string>
-    <string name="bridges_custom">Ð?оÑ?иÑ?Ñ?Ñ?ваÑ?Ñ?кÑ? Ð?оÑ?Ñ?и</string>
-
-    <string name="bridges_config">Ð?онÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? Ð?оÑ?Ñ?Ñ?</string>
-    <string name="action_done">Ð?Ñ?облено</string>
 
     <string name="bridges_sometimes">Ð?нодÑ? вам поÑ?Ñ?Ñ?бен мÑ?Ñ?Ñ?, Ñ?об пÑ?д\'Ñ?днаÑ?иÑ?Ñ? до Tor.</string>
     <string name="action_more">РÐ?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð? Ð?Ð?Ð?ЬШÐ?</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">Це не зÑ?обиÑ?Ñ? ваÑ? анонÑ?мним, але допоможе пÑ?ойÑ?и Ñ?еÑ?ез Ñ?аÑ?Ñ?воли.</string>
     <string name="action_vpn_choose">Ð?Ð?Ð?РÐ?ТЬ Ð?РÐ?Ð?РÐ?Ð?Ð?</string>
 
-    <string name="status_connected">Ð?Ñ?д\'Ñ?днаний!</string>
-
-    <string name="loading_claim_1">Ð?аÑ?а Ñ?Ñ?Ñ?окаÑ?а Ñ?пÑ?лÑ?ноÑ?а â?? Ñ?е, Ñ?о Ñ?обиÑ?Ñ? Tor Ñ?Ñ?довим!</string>
-    <string name="loading_claim_2">Щоденно лÑ?ди викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor, Ñ?об Ñ?никнÑ?Ñ?и Ñ?Ñ?еженнÑ? Ñ?екламними оголоÑ?еннÑ?ми.</string>
-    <string name="loading_claim_3">Ð?оли Facebook заблокований, лÑ?ди викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor длÑ? зв\'Ñ?зкÑ? з Ñ?Ñ?нÑ?ми дÑ?Ñ?зÑ?ми Ñ?а Ñ?одиноÑ?.</string>
-    <string name="loading_claim_4">Ð?кÑ?ивÑ?Ñ?Ñ?и викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor Ñ?об вÑ?лÑ?но Ñ?вÑ?Ñ?иÑ?и Ñ?воÑ? дÑ?мки Ñ?а пеÑ?еконаннÑ?.</string>
-    <string name="loading_claim_5">Ð?логеÑ?и викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor длÑ? згÑ?Ñ?Ñ?Ñ?ваннÑ? лÑ?дей до Ñ?оÑ?Ñ?алÑ?ноÑ? Ñ?еÑ?оÑ?ми.</string>
-    <string name="loading_claim_6">Ð?Ñ?Ñ?налÑ?Ñ?Ñ?и викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor Ñ?об заÑ?иÑ?ено Ñ?озÑ?лÑ?дÑ?ваÑ?и Ñ?Ñ?Ñ?оÑ?Ñ?Ñ?, пÑ?о Ñ?кÑ? вони Ñ?епоÑ?Ñ?Ñ?Ñ?Ñ?Ñ?.</string>
-    <string name="loading_claim_7">Ð?Ñ?дпÑ?иÑ?мÑ?Ñ? викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor, Ñ?об збеÑ?егÑ?и Ñ?Ñ?Ñ?аÑ?егÑ?Ñ? Ñ?воÑ?Ñ? компанÑ?Ñ? Ñ? Ñ?екÑ?еÑ?Ñ?.</string>
-    <string name="loading_claim_8">Ð?Ñ?аÑ?Ñ?вники викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? ТоÑ? длÑ? боÑ?оÑ?Ñ?би за Ñ?пÑ?аведливÑ?Ñ?Ñ?Ñ?, не боÑ?Ñ?иÑ?Ñ? вÑ?Ñ?аÑ?иÑ?и Ñ?воÑ? Ñ?обоÑ?Ñ?.</string>
-
-    <string name="status_connecting">Ð?и з\'Ñ?днÑ?Ñ?мо ваÑ?.\"=\"Ð?и з\'Ñ?днÑ?Ñ?мо ваÑ?.</string>
-
     <string name="hello">Ð?Ñ?ивÑ?Ñ?!</string>
     <string name="welcome">Ð?аÑ?каво пÑ?оÑ?имо до Tor на мобÑ?лÑ?ниÑ? пÑ?иÑ?Ñ?Ñ?оÑ?Ñ?.</string>
 
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ba32ec23..aca5a26c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2,136 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot â?? Ñ?е вÑ?лÑ?на пÑ?огÑ?ама длÑ? пÑ?окÑ?Ñ?-з\'Ñ?днанÑ?, Ñ?ка дозволÑ?Ñ? Ñ?нÑ?им додаÑ?кам безпеÑ?нÑ?Ñ?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?. Orbot викоÑ?иÑ?Ñ?овÑ?Ñ? Tor длÑ? Ñ?иÑ?Ñ?Ñ?ваннÑ? Ñ?нÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?Ñ?кÑ?, Ñ?кий далÑ? пÑ?иÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?д Ñ?аÑ? пеÑ?еÑ?иланнÑ? Ñ?еÑ?ез кÑ?лÑ?ка комп\'Ñ?Ñ?еÑ?Ñ?в Ñ? Ñ?Ñ?зниÑ? Ñ?аÑ?Ñ?инаÑ? планеÑ?и. Tor Ñ? вÑ?лÑ?ним пÑ?огÑ?амним забезпеÑ?еннÑ?м, а Ñ?акож вÑ?дкÑ?иÑ?оÑ? меÑ?ежеÑ?, Ñ?о допомагаÑ? заÑ?иÑ?Ñ?иÑ?иÑ?Ñ? вÑ?д меÑ?ежевого Ñ?Ñ?еженнÑ?, Ñ?ке загÑ?ожÑ?Ñ? оÑ?обиÑ?Ñ?Ñ?й Ñ?вободÑ? Ñ?а пÑ?иваÑ?номÑ? жиÑ?Ñ?Ñ?, конÑ?Ñ?денÑ?Ñ?йнÑ?й бÑ?знеÑ?-дÑ?Ñ?лÑ?ноÑ?Ñ?Ñ? Ñ? конÑ?акÑ?ам, а Ñ?акож деÑ?жавноÑ? пÑ?огÑ?ами безпеки, Ñ?о в
 Ñ?дома Ñ?к аналÑ?з Ñ?Ñ?аÑ?Ñ?кÑ?.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">запÑ?Ñ?к Ñ? зÑ?пинка Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Ð?апÑ?Ñ?к Orbot...</string>
+    <string name="status_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="tor_process_waiting">оÑ?Ñ?кÑ?ваннÑ?...</string>
-  <string name="not_anonymous_yet">Ð?опеÑ?едженнÑ?: Ð?аÑ? Ñ?Ñ?аÑ?Ñ?к Ñ?е не анонÑ?мний! Ð?Ñ?дÑ? лаÑ?ка, налаÑ?Ñ?Ñ?йÑ?е Ñ?воÑ? заÑ?Ñ?оÑ?Ñ?нки длÑ? викоÑ?иÑ?Ñ?аннÑ? HTTP пÑ?окÑ?Ñ? 127.0.0.1:8118 або ж SOCKS4A або SOCKS5 пÑ?окÑ?Ñ? 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?омÑ?вка</string>
-  <string name="menu_browse">Ð?еÑ?еглÑ?д</string>
-  <string name="menu_settings">Ð?алаÑ?Ñ?Ñ?ваннÑ?</string>
+    <string name="menu_settings">Ð?алаÑ?Ñ?Ñ?ваннÑ?</string>
   <string name="menu_log">Ð?Ñ?Ñ?нал</string>
-  <string name="menu_info">Ð?овÑ?дка</string>
-  <string name="menu_apps">Ð?аÑ?Ñ?оÑ?Ñ?нки</string>
-  <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?и</string>
+    <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?и</string>
   <string name="menu_stop">Ð?Ñ?пиниÑ?и</string>
   <string name="menu_about">Ð?Ñ?о пÑ?огÑ?амÑ?</string>
-  <string name="menu_promo_apps">Ð?Ñ?Ñ?иманнÑ? заÑ?Ñ?оÑ?Ñ?нкÑ?в...</string>
-  <string name="main_layout_download">Ð?аванÑ?ажиÑ?и</string>
+    <string name="main_layout_download">Ð?аванÑ?ажиÑ?и</string>
   <string name="main_layout_upload">Ð?иванÑ?ажиÑ?и</string>
-  <string name="button_help">Ð?овÑ?дка</string>
-  <string name="button_close">Ð?акÑ?иÑ?и</string>
-  <string name="button_about">Ð?Ñ?о пÑ?огÑ?амÑ?</string>
-  <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?иÑ?и жÑ?Ñ?нал</string>
-  <string name="menu_verify">Ð?еÑ?евÑ?Ñ?ка</string>
-  <string name="menu_exit">Ð?иÑ?Ñ?д</string>
+    <string name="button_about">Ð?Ñ?о пÑ?огÑ?амÑ?</string>
+    <string name="menu_exit">Ð?иÑ?Ñ?д</string>
   <string name="menu_scan">СканÑ?ваÑ?и BridgeQR</string>
   <string name="menu_share_bridge">Ð?одÑ?лиÑ?иÑ?Ñ? BridgeQR</string>
-  <string name="press_to_start">- довге наÑ?иÑ?неннÑ? длÑ? запÑ?Ñ?кÑ? -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озоÑ?ий пÑ?окÑ?Ñ? (Ð?оÑ?Ñ?Ñ?бен root)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?озоÑ?ий пÑ?окÑ?Ñ?</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?на Ñ?оÑ?иÑ?Ñ?каÑ?Ñ?Ñ? заÑ?Ñ?оÑ?Ñ?нкÑ?в</string>
-  <string name="pref_transparent_all_title">Ð?апÑ?авлÑ?Ñ?и вÑ?е Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_all_summary">Ð?апÑ?авлÑ?Ñ?и Ñ?Ñ?аÑ?Ñ?к Ñ?Ñ?Ñ?Ñ? заÑ?Ñ?оÑ?Ñ?нкÑ?в Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?вний пÑ?окÑ?Ñ? поÑ?Ñ?</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?Ð?РÐ?Ð?Ð?Ð?Ð?Ð?Я: Ð?бÑ?одиÑ?Ñ? загалÑ?нÑ? поÑ?Ñ?и (80, 443, Ñ? Ñ?.д.). *Ð?Ð?Ð?Ð?РÐ?СТУÐ?УÐ?Ð?ТÐ? ТÐ?Ð?ЬÐ?Ð?* Ñ?кÑ?о Ñ?ежими «Ð?Ñ?е» або «Ð?аÑ?Ñ?оÑ?Ñ?нки» не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпиÑ?ок Ð?оÑ?Ñ?Ñ?в</string>
-  <string name="pref_transparent_port_summary">СпиÑ?ок поÑ?Ñ?Ñ?в длÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?. *Ð?Ð?Ð?Ð?РÐ?СТÐ?Ð?УÐ?Ð?ТÐ? ТÐ?Ð?ЬÐ?Ð?* Ñ?кÑ?о Ñ?ежими «Ð?Ñ?е» або «Ð?аÑ?Ñ?оÑ?Ñ?нки» не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?ведÑ?Ñ?Ñ? поÑ?Ñ?и длÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="pref_has_root">Ð?апиÑ?аÑ?и root доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?апиÑ?аÑ?и root доÑ?Ñ?Ñ?п длÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="status_install_success">Ð?одаÑ?ок Tor Ñ?Ñ?пÑ?Ñ?но вÑ?Ñ?ановленей!</string>
-  <string name="status_install_fail">Ð?е вдалоÑ?Ñ? вÑ?Ñ?ановиÑ?и додаÑ?ок Tor. Ð?Ñ?дÑ? лаÑ?ка, пеÑ?евÑ?Ñ?Ñ?е Ñ?иÑ?Ñ?емний жÑ?Ñ?нал Ñ? повÑ?домÑ?е нам: tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?омилка заÑ?Ñ?оÑ?Ñ?нка</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?Ñ?о Orbot</string>
-  <string name="btn_next">Ð?пеÑ?ед</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?авеÑ?Ñ?иÑ?и</string>
-  <string name="btn_okay">OK</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">Ð?озвÑ?л оÑ?Ñ?имано</string>
-  <string name="wizard_permissions_stock">Ð?озволи Orbot</string>
-  <string name="wizard_premissions_msg_root">ЧÑ?дово! Ð?и визнаÑ?или, Ñ?о ви надалили root пÑ?ава длÑ? Orbot. Ð?и бÑ?демо викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?Ñ? можливÑ?Ñ?Ñ?Ñ? з Ñ?озÑ?мом.</string>
-  <string name="wizard_permissions_msg_stock"> ХоÑ?а Ñ?е й не вимагаÑ?Ñ?Ñ?Ñ?Ñ?, Orbot може бÑ?Ñ?и поÑ?Ñ?жнÑ?Ñ?им Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?ом, Ñ?кÑ?о ваÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й маÑ? пÑ?ава root. Ð?аÑ?иÑ?нÑ?Ñ?Ñ? на кнопкÑ? нижÑ?е Ñ? надайÑ?е Orbot Ñ?Ñ?пеÑ?Ñ?илÑ?! </string>
-  <string name="wizard_permissions_no_root">ЯкÑ?о Ñ? ваÑ? немаÑ? root пÑ?ав або ви не Ñ?озÑ?мÑ?Ñ?Ñ?е пÑ?о Ñ?о говоÑ?имо, пÑ?оÑ?Ñ?о впевнÑ?Ñ?Ñ?Ñ?Ñ?, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е заÑ?Ñ?оÑ?Ñ?нки, Ñ?озÑ?обленÑ? длÑ? Orbot.</string>
-  <string name="wizard_permissions_consent">Я Ñ?озÑ?мÑ?Ñ? Ñ? Ñ?оÑ?Ñ? пÑ?одовжиÑ?и без пÑ?ав Ñ?Ñ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а</string>
-  <string name="wizard_permission_enable_root">Ð?адаÑ?и root пÑ?ава Orbot</string>
-  <string name="wizard_configure">Ð?алаÑ?Ñ?Ñ?ваÑ?и Tor-иÑ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?огÑ?ама Orbot даÑ? вам можливÑ?Ñ?Ñ?Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?изÑ?ваÑ?и Ñ?Ñ?аÑ?Ñ?к Ñ?Ñ?Ñ?Ñ? заÑ?Ñ?оÑ?Ñ?нкÑ?в Ñ?еÑ?ез Tor Ð?Ð?Ð? вибÑ?аÑ?и заÑ?Ñ?оÑ?Ñ?нки длÑ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?Ñ?Ñ? Ñ?амоÑ?Ñ?Ñ?йно.</string>
-  <string name="wizard_configure_all">Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изÑ?ваÑ?и вÑ?Ñ? заÑ?Ñ?оÑ?Ñ?нки Ñ?еÑ?ез Tor</string>
-  <string name="wizard_configure_select_apps">Ð?ибеÑ?Ñ?Ñ?Ñ? заÑ?Ñ?оÑ?Ñ?нки длÑ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?Ñ?Ñ? Ñ?еÑ?ез Tor</string>
-  <string name="wizard_tips_tricks">Orbot-задÑ?Ñ?нÑ? Ð?аÑ?Ñ?оÑ?Ñ?нки</string>
-  <string name="wizard_tips_msg">Ð?и Ñ?адимо вам заванÑ?ажиÑ?и Ñ?а викоÑ?иÑ?Ñ?овÑ?ваÑ?и заÑ?Ñ?оÑ?Ñ?нки, Ñ?кÑ? вмÑ?Ñ?Ñ?Ñ? пÑ?аÑ?Ñ?ваÑ?и напÑ?Ñ?мÑ? Ñ?еÑ?ез Orbot. Ð?аÑ?иÑ?нÑ?Ñ?Ñ? на кнопки нижÑ?е, Ñ?об запÑ?Ñ?Ñ?иÑ?и пÑ?оÑ?еÑ? вÑ?Ñ?ановленнÑ?.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?аÑ?иÑ?ений обмÑ?н повÑ?домленнÑ?ми в Android</string>
-  <string name="wizard_tips_proxy">Ð?алаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ? â?? дÑ?знайÑ?еÑ?Ñ? Ñ?к налаÑ?Ñ?Ñ?ваÑ?и заÑ?Ñ?оÑ?Ñ?нки длÑ? Ñ?обоÑ?и з Orbot</string>
-  <string name="wizard_tips_duckgo">Ð?аÑ?Ñ?оÑ?Ñ?нок поÑ?Ñ?ковоÑ? Ñ?иÑ?Ñ?еми DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Twitter пÑ?дÑ?Ñ?имÑ?Ñ? http пÑ?окÑ?Ñ? «localhost:8118»</string>
-  <string name="wizard_tips_story_maker">StoryMaker â?? Ð?апиÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? Ñ? залиÑ?Ñ?е Ñ?Ñ? Tor\'Ñ? длÑ? безпеки!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?алаÑ?Ñ?Ñ?ваннÑ? Ð?Ñ?окÑ?Ñ?</string>
-  <string name="wizard_proxy_help_msg">ЯкÑ?о пÑ?огÑ?амка длÑ? Android, Ñ?кÑ? Ð?и викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е, пÑ?дÑ?Ñ?имÑ?Ñ? HTTP або SOCKS пÑ?окÑ?Ñ?, Ñ?о Ð?и можеÑ?е налаÑ?Ñ?Ñ?ваÑ?и Ñ?Ñ? на пÑ?д\'Ñ?днаннÑ? до Orbot Ñ? викоÑ?иÑ?Ñ?аннÑ? Tor.\n\n\n Ð?наÑ?еннÑ? Ñ?оÑ?Ñ?а â?? 127.0.0.1 або «localhost». Ð?лÑ? HTTP, номеÑ? поÑ?Ñ?Ñ? â?? 8118. Ð?лÑ? SOCKS пÑ?окÑ?Ñ? â?? 9050. Ð?о можливоÑ?Ñ?Ñ?, викоÑ?иÑ?Ñ?овÑ?йÑ?е SOCKS4A або SOCKS5.\n \n\n\n Ð?и можеÑ?е дÑ?знаÑ?иÑ?Ñ? бÑ?лÑ?Ñ?е пÑ?о Ñ?обоÑ?Ñ? Ñ?еÑ?ез пÑ?окÑ?Ñ? на Android, пÑ?оÑ?иÑ?авÑ?и Ñ?ей FAQ: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Ð?Ñ?огÑ?ама Orbot гоÑ?ова до викоÑ?иÑ?Ñ?аннÑ?!</string>
-  <string name="wizard_final_msg">Ð?Ñ?лÑ?йони лÑ?дей Ñ? вÑ?Ñ?омÑ? Ñ?вÑ?Ñ?Ñ? викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor з Ñ?Ñ?зниÑ? пÑ?иÑ?ин.\n\nÐ?Ñ?Ñ?налÑ?Ñ?Ñ?и Ñ? блогеÑ?и, акÑ?ивÑ?Ñ?Ñ?и заÑ?иÑ?Ñ?Ñ? пÑ?ав лÑ?дини, Ñ?Ñ?довÑ? виконавÑ?Ñ?, Ñ?олдаÑ?и, коÑ?поÑ?аÑ?Ñ?Ñ?, гÑ?омадÑ?ни кÑ?аÑ?н з Ñ?епÑ?еÑ?ивним Ñ?ежимом, Ñ? пÑ?оÑ?Ñ?Ñ? лÑ?диâ?¦ а Ñ?епеÑ? гоÑ?овÑ? Ñ? Ð?и!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?Ñ?дÑ? лаÑ?ка, налаÑ?Ñ?Ñ?йÑ?е Orbot, пеÑ?Ñ? нÑ?ж поÑ?неÑ?е ним коÑ?иÑ?Ñ?Ñ?ваÑ?иÑ?Ñ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ð?и Ñ?Ñ?пÑ?Ñ?но пÑ?д\'Ñ?дналиÑ?Ñ? до меÑ?ежÑ? Tor - але Ñ?е не ознаÑ?аÑ?, Ñ?о ваÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й заÑ?иÑ?ено. Ð?и можеÑ?е наÑ?иÑ?нÑ?Ñ?и кнопкÑ? \"Ð?Ñ?аÑ?зеÑ?\" длÑ? пеÑ?евÑ?Ñ?ки Ñ?вого з\'Ñ?днаннÑ?. Ð?лÑ? Ñ?ого, Ñ?об дÑ?знаÑ?иÑ?Ñ? бÑ?лÑ?Ñ?е Ñ?нÑ?оÑ?маÑ?Ñ?Ñ?, вÑ?двÑ?дайÑ?е наÑ? Ñ?айÑ? https://guardianproject.info/apps/orbot або надÑ?Ñ?лÑ?Ñ?Ñ? елекÑ?Ñ?онне повÑ?домленнÑ? на help@xxxxxxxxxxxxxxxxxxxx</string>
-  <string name="tor_check">Це пÑ?изведе до запÑ?Ñ?кÑ? веб-бÑ?аÑ?зеÑ?а, вибÑ?аного на ваÑ?омÑ? пÑ?иÑ?Ñ?Ñ?оÑ? за замовÑ?Ñ?ваннÑ?м, Ñ? пÑ?дклÑ?Ñ?еннÑ? до Ñ?айÑ?Ñ? https://check.torproject.org, з меÑ?оÑ? пеÑ?евÑ?Ñ?ки пÑ?авилÑ?ноÑ?Ñ?Ñ? Ñ?обоÑ?и Orbot Ñ? визнаÑ?еннÑ?, Ñ?и пÑ?д\'Ñ?днанÑ? ви до меÑ?ежÑ? Tor.</string>
-  <string name="pref_hs_group">Ð?Ñ?иÑ?ованÑ? Ñ?еÑ?вÑ?Ñ?и</string>
-  <string name="pref_general_group">Ð?Ñ?новнÑ?</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-->
-  <string name="wizard_title_msg">Orbot дозволÑ?Ñ? викоÑ?иÑ?Ñ?овÑ?ваÑ?и Tor на Android!\n\nTor дозволÑ?Ñ? Ð?ам заÑ?иÑ?Ñ?иÑ?иÑ?Ñ? вÑ?д Ñ?Ñ?лÑ?Ñ?Ñ?аÑ?Ñ?Ñ? вмÑ?Ñ?Ñ?Ñ?, аналÑ?зÑ? Ñ?Ñ?аÑ?Ñ?кÑ? Ñ? Ñ?поÑ?Ñ?еÑ?еженнÑ? за меÑ?ежеÑ?, Ñ?кÑ? Ñ?Ñ?авлÑ?Ñ?Ñ? пÑ?д загÑ?озÑ? пÑ?иваÑ?нÑ?Ñ?Ñ?Ñ?, конÑ?Ñ?денÑ?Ñ?йнÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? Ñ?а оÑ?обиÑ?Ñ?Ñ? Ñ?Ñ?оÑ?Ñ?нки.\n\nЦей майÑ?Ñ?еÑ? допоможе Ð?ам налаÑ?Ñ?Ñ?ваÑ?и Orbot Ñ? Tor на Ð?аÑ?омÑ? пÑ?иÑ?Ñ?Ñ?оÑ?.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?опеÑ?едженнÑ?</string>
-  <string name="wizard_warning_msg">Ð?Ñ?оÑ?Ñ?е вÑ?Ñ?ановленнÑ? Orbot не зÑ?обиÑ?Ñ? авÑ?омаÑ?иÑ?но Ð?аÑ? мобÑ?лÑ?ний Ñ?Ñ?аÑ?Ñ?к анонÑ?мним.\n\nÐ?и повиннÑ? пÑ?авилÑ?но налаÑ?Ñ?Ñ?ваÑ?и Orbot, Ð?аÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й Ñ?а инÑ?Ñ? заÑ?Ñ?оÑ?Ñ?нки, Ñ?об Ñ?Ñ?пÑ?Ñ?но викоÑ?иÑ?Ñ?овÑ?ваÑ?и Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?озволи</string>
-  <string name="wizard_permissions_root_msg1">Ð?и Ñ?акож можеÑ?е за бажаннÑ?м надаÑ?и Orbot пÑ?ава «СÑ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а» длÑ? доÑ?Ñ?Ñ?пÑ? до пÑ?оÑ?Ñ?нÑ?Ñ?иÑ? можливоÑ?Ñ?ей, Ñ?ипÑ? \"Ð?Ñ?озоÑ?а Ð?Ñ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?\".</string>
-  <string name="wizard_permissions_root_msg2">ЯкÑ?о ви не Ñ?оÑ?еÑ?е Ñ?обиÑ?и Ñ?е, Ñ?одÑ? бÑ?дÑ? лаÑ?ка, впевнÑ?Ñ?Ñ?Ñ?Ñ?, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е заÑ?Ñ?оÑ?Ñ?нки Ñ?Ñ?воÑ?енÑ? длÑ? Ñ?обоÑ?и з Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">СÑ?оже, ваÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й не маÑ? root-пÑ?ав або не надаÑ? доÑ?Ñ?Ñ?пÑ? до «СÑ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а».\n\nÐ?Ñ?дÑ? лаÑ?ка, Ñ?пÑ?обÑ?йÑ?е наÑ?омÑ?Ñ?Ñ?Ñ? Ñ?ежим «Ð?аÑ?Ñ?оÑ?Ñ?нки» на головномÑ? екÑ?анÑ?.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?аÑ?Ñ?оÑ?Ñ?нки, Ñ?о пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Orbot:</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: заÑ?Ñ?оÑ?Ñ?нок длÑ? Ñ?пÑ?лкÑ?ваннÑ? з пÑ?дÑ?Ñ?имкоÑ? Off-the-Record Ñ?иÑ?Ñ?Ñ?ваннÑ?</string>
-  <string name="wizard_tips_orweb">Orfox: бÑ?аÑ?зеÑ? з пÑ?двиÑ?еноÑ? конÑ?Ñ?денÑ?Ñ?йнÑ?Ñ?Ñ?Ñ?, Ñ?кий пÑ?аÑ?Ñ?Ñ? в меÑ?ежÑ? Tor</string>
-  <string name="wizard_tips_play">Ð?найÑ?и вÑ?Ñ? заÑ?Ñ?оÑ?Ñ?нки Guardian Project на Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?найÑ?и вÑ?Ñ? заÑ?Ñ?оÑ?Ñ?нки Guardian Project на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?найÑ?и вÑ?Ñ? заÑ?Ñ?оÑ?Ñ?нки Guardian Project на https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?озоÑ?е Ð?Ñ?окÑ?Ñ?ваннÑ?</string>
-  <string name="wizard_transproxy_msg">Це дозволиÑ?Ñ? ваÑ?им заÑ?Ñ?оÑ?Ñ?нкам авÑ?омаÑ?иÑ?но пÑ?аÑ?Ñ?ваÑ?и в меÑ?ежÑ? Tor без бÑ?дÑ?-Ñ?коÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?.</string>
-  <string name="wizard_transproxy_hint">(Ð?ознаÑ?Ñ?е даний пÑ?нкÑ?, Ñ?кÑ?о ви не знаÑ?Ñ?е пÑ?о Ñ?о йде мова)</string>
-  <string name="wizard_transproxy_none">Ð?Ñ?</string>
-  <string name="pref_transparent_tethering_title">РоздаÑ?а Tor</string>
-  <string name="pref_transparent_tethering_summary">Ð?вÑ?мкнÑ?Ñ?и Ð?Ñ?озоÑ?Ñ? Ð?Ñ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ? Tor длÑ? пÑ?иÑ?Ñ?Ñ?оÑ?в з Ñ?оздаÑ?еÑ? по Wi-Fi Ñ? USB (поÑ?Ñ?Ñ?бен пеÑ?езапÑ?Ñ?к)</string>
-  <string name="button_grant_superuser">Ð?апиÑ?аÑ?и Ð?оÑ?Ñ?Ñ?п СÑ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а</string>
-  <string name="pref_select_apps">Ð?ибÑ?аÑ?и заÑ?Ñ?оÑ?Ñ?нки</string>
-  <string name="pref_select_apps_summary">Ð?ибÑ?аÑ?и заÑ?Ñ?оÑ?Ñ?нки длÑ? напÑ?авленнÑ? Ñ?еÑ?ез Tor</string>
-  <string name="pref_node_configuration">Ð?онÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? вÑ?зла</string>
+    <!--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="button_proxy_all">УÑ?Ñ? Ñ?еÑ?ез пÑ?окÑ?Ñ?</string>
-  <string name="button_proxy_none">Ð?оден Ñ?еÑ?ез пÑ?окÑ?Ñ?</string>
-  <string name="button_invert_selection">Ð?нвеÑ?Ñ?Ñ?ваÑ?и видÑ?леннÑ?</string>
-  <string name="pref_proxy_title">Ð?иÑ?Ñ?дна пÑ?окÑ?Ñ? меÑ?ежа</string>
+    <string name="pref_proxy_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>
@@ -147,20 +57,8 @@
   <string name="pref_proxy_password_title">Ð?аÑ?олÑ? виÑ?Ñ?дного пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ?</string>
   <string name="pref_proxy_password_summary">Ð?аÑ?олÑ? пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ? (вказÑ?ваÑ?и не обов\'Ñ?зково)</string>
   <string name="pref_proxy_password_dialog">Ð?ведÑ?Ñ?Ñ? паÑ?олÑ? пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ?</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?Ñ?Ñ?ановленнÑ? загалÑ?ноÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?Ñ?Ñ?ановленнÑ? заÑ?нованоÑ? на заÑ?Ñ?оÑ?Ñ?нкаÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?озоÑ?а пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy пÑ?дÑ?Ñ?имÑ?Ñ? РоздаÑ?Ñ?!</string>
-  <string name="warning_error_starting_transparent_proxying_">УÐ?Ð?Ð?Ð?: помилка запÑ?Ñ?кÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?!</string>
-  <string name="transproxy_rules_cleared">Ð?Ñ?авила TransProxy видаленÑ?</string>
-  <string name="couldn_t_start_tor_process_">Ð?еможливо запÑ?Ñ?Ñ?иÑ?и Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo пÑ?аÑ?Ñ?Ñ? на поÑ?Ñ?Ñ?: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?Ñ?Ñ?ановленнÑ? заÑ?новане на поÑ?Ñ?аÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?...</string>
-  <string name="bridge_error">Ð?омилка Ð?оÑ?Ñ?Ñ?</string>
-  <string name="bridge_requires_ip">Ð?лÑ? викоÑ?иÑ?Ñ?аннÑ? моÑ?Ñ?Ñ?, необÑ?Ñ?дно задаÑ?и IP адÑ?еÑ?Ñ? Ñ?к мÑ?нÑ?мÑ?м одного моÑ?Ñ?Ñ?.</string>
-  <string name="send_email_for_bridges">Ð?Ñ?дпÑ?авÑ?е email на адÑ?еÑ?Ñ? bridges@xxxxxxxxxxxxxx з Ñ?Ñ?дком «get bridges» в Ñ?Ñ?лÑ? повÑ?домленнÑ? Ñ?з облÑ?кового запиÑ?Ñ? gmail.</string>
-  <string name="error">Ð?омилка</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>
@@ -173,10 +71,8 @@
   <string name="use_only_these_specified_nodes">Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и *Ñ?Ñ?лÑ?ки* Ñ?Ñ? заданÑ? вÑ?зли</string>
   <string name="bridges">Ð?оÑ?Ñ?и</string>
   <string name="use_bridges">Ð?икоÑ?иÑ?Ñ?аÑ?и Ð?оÑ?Ñ?и</string>
-  <string name="bridges_obfuscated">Ð?бÑ?Ñ?Ñ?кованÑ? Ð?оÑ?Ñ?и</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">УвÑ?мкнÑ?Ñ?Ñ? алÑ?Ñ?еÑ?наÑ?ивнÑ? вÑ?оди Ñ? меÑ?ежÑ? Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?аданÑ? моÑ?Ñ?и обÑ?Ñ?Ñ?кованÑ?</string>
-  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ?и Ñ? поÑ?Ñ?и моÑ?Ñ?Ñ?в</string>
+    <string name="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>
@@ -192,17 +88,10 @@
   <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пнÑ? поÑ?Ñ?и</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?и доÑ?Ñ?Ñ?пнÑ? Ñ?з обмежÑ?ваного бÑ?андмаÑ?еÑ?а</string>
   <string name="enter_ports">Ð?ведÑ?Ñ?Ñ? поÑ?Ñ?и</string>
-  <string name="enable_hidden_services">Ð?вÑ?мкнÑ?Ñ?и Ð?Ñ?иÑ?ованÑ? СлÑ?жби</string>
-  <string name="run_servers_accessible_via_the_tor_network">запÑ?Ñ?Ñ?иÑ?и Ñ?еÑ?веÑ?и доÑ?Ñ?Ñ?пнÑ? Ñ?еÑ?ез меÑ?ежÑ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">введÑ?Ñ?Ñ? локалÑ?нÑ? поÑ?Ñ?и длÑ? пÑ?иÑ?ованиÑ? Ñ?лÑ?жб</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?и Ð?Ñ?иÑ?ованоÑ? СлÑ?жби</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адÑ?еÑ?оване Ñ?м\'Ñ? длÑ? ваÑ?оÑ? пÑ?иÑ?ованоÑ? Ñ?лÑ?жби (Ñ?генеÑ?овано авÑ?омаÑ?иÑ?но)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ввÑ?мкнÑ?Ñ?и вивÑ?д логÑ? налогодженнÑ? (поÑ?Ñ?Ñ?бно викоÑ?иÑ?Ñ?овÑ?ваÑ?и adb або aLogCat длÑ? пеÑ?еглÑ?дÑ?)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ввÑ?мкнÑ?Ñ?и вивÑ?д логÑ? налогодженнÑ? (поÑ?Ñ?Ñ?бно викоÑ?иÑ?Ñ?овÑ?ваÑ?и adb або aLogCat длÑ? пеÑ?еглÑ?дÑ?)</string>
   <string name="project_home">Ð?омаÑ?нÑ? Ñ?Ñ?оÑ?Ñ?нка(и) пÑ?оекÑ?Ñ?: </string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ð?Ñ?Ñ?ензÑ?Ñ? Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Ð?Ñ?огÑ?ами Ñ?Ñ?оÑ?оннÑ?Ñ? Ñ?озÑ?обникÑ?в: </string>
+    <string name="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>
@@ -211,37 +100,18 @@
   <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="hidden_service_on">пÑ?иÑ?ована Ñ?лÑ?жба на:</string>
-  <string name="unable_to_read_hidden_service_name">неможливо пÑ?оÑ?иÑ?аÑ?и Ñ?м\'Ñ? пÑ?иÑ?ованоÑ? Ñ?лÑ?жби</string>
+    <string name="unable_to_read_hidden_service_name">неможливо пÑ?оÑ?иÑ?аÑ?и Ñ?м\'Ñ? пÑ?иÑ?ованоÑ? Ñ?лÑ?жби</string>
   <string name="unable_to_start_tor">Ð?еможливо запÑ?Ñ?Ñ?иÑ?и Tor:</string>
-  <string name="unable_to_reset_tor">Ð?еÑ?езаванÑ?ажÑ?е Ñ?вÑ?й пÑ?иÑ?Ñ?Ñ?Ñ?й, не вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?езапÑ?Ñ?Ñ?иÑ?и Tor!</string>
-  <string name="pref_use_sys_iptables_title">Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Iptables за замовÑ?Ñ?ваннÑ?м</string>
-  <string name="pref_use_sys_iptables_summary">викоÑ?иÑ?Ñ?овÑ?ваÑ?и вбÑ?дований бÑ?наÑ?ник iptables замÑ?Ñ?Ñ?Ñ? Ñ?ого Ñ?о надаÑ?Ñ?Ñ?Ñ?Ñ? з Orbot</string>
-  <string name="error_installing_binares">Ð?Ñ?наÑ?нÑ? Ñ?айли Tor не змогли вÑ?Ñ?ановиÑ?иÑ?Ñ? або оновиÑ?иÑ?Ñ?.</string>
-  <string name="pref_use_persistent_notifications">Ð?авжди показÑ?ваÑ?и Ñ?конкÑ? в панелÑ? завданÑ? коли Orbot пÑ?дклÑ?Ñ?ений</string>
+    <string name="pref_use_persistent_notifications">Ð?авжди показÑ?ваÑ?и Ñ?конкÑ? в панелÑ? завданÑ? коли Orbot пÑ?дклÑ?Ñ?ений</string>
   <string name="pref_use_persistent_notifications_title">СповÑ?Ñ?еннÑ? пÑ?о поÑ?Ñ?Ñ?йнÑ? Ñ?обоÑ?Ñ?</string>
   <string name="pref_use_expanded_notifications">Ð?оказаÑ?и Ñ?озÑ?иÑ?ене Ñ?повÑ?Ñ?еннÑ? з кÑ?аÑ?ноÑ? виÑ?одÑ? Tor Ñ?а IP</string>
   <string name="pref_use_expanded_notifications_title">РозÑ?иÑ?енÑ? Ñ?повÑ?Ñ?еннÑ?</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?и ввÑ?мкнÑ?Ñ?Ñ?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ð?ова</string>
-  <string name="set_locale_summary">Ð?ибÑ?аÑ?и локалÑ? Ñ? мовÑ? длÑ? Orbot</string>
-  <string name="wizard_locale_title">Ð?ибÑ?аÑ?и Ð?овÑ?</string>
-  <string name="wizard_locale_msg">Ð?алиÑ?иÑ?и за замовÑ?Ñ?ваннÑ?м або пеÑ?еклÑ?Ñ?иÑ?и поÑ?оÑ?нÑ? мовÑ?</string>
-  <string name="powered_by">вÑ?д Tor</string>
-  <string name="btn_save_settings">Ð?беÑ?егÑ?и Ð?алаÑ?Ñ?Ñ?ваннÑ?</string>
-  <string name="no_internet_connection_tor">Ð?емаÑ? Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?; Tor в Ñ?ежимÑ? оÑ?Ñ?кÑ?ваннÑ?â?¦</string>
-  <string name="bandwidth_">Ð?анал:</string>
-  <string name="down">вÑ?</string>
-  <string name="up">виÑ?</string>
-  <string name="pref_disable_network_title">Ð?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?ежим Ñ?нÑ?</string>
+    <string name="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="menu_verify_browser">Ð?Ñ?аÑ?зеÑ?</string>
-  <string name="menu_use_chatsecure">Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и ChatSecure</string>
-  <string name="permission_manage_tor_label">Ð?еÑ?Ñ?ваннÑ? Tor</string>
-  <string name="permission_manage_tor_description">Ð?озволиÑ?и заÑ?Ñ?оÑ?Ñ?нкÑ? кеÑ?Ñ?ваÑ?и Ñ?еÑ?вÑ?Ñ?ом Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot найкÑ?аÑ?е пÑ?аÑ?Ñ?Ñ? з бÑ?аÑ?зеÑ?ом Orfox. УÑ?Ñ?ановиÑ?и заÑ?аз?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot найкÑ?аÑ?е пÑ?аÑ?Ñ?Ñ? з бÑ?аÑ?зеÑ?ом Orfox. УÑ?Ñ?ановиÑ?и заÑ?аз?</string>
   <string name="install_apps_">Ð?Ñ?Ñ?ановиÑ?и бÑ?аÑ?зеÑ??</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?емаÑ? доÑ?Ñ?Ñ?пÑ? до меÑ?ежÑ? Ñ?нÑ?еÑ?неÑ?. Tor пеÑ?еÑ?одиÑ?Ñ? в Ñ?ежим Ñ?нÑ?â?¦</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Ð?оÑ?Ñ?Ñ?п до меÑ?ежÑ? Ñ?оÑ?оÑ?ий. Tor виÑ?одиÑ?Ñ? з Ñ?ежимÑ? Ñ?нÑ?â?¦</string>
@@ -258,19 +128,7 @@
   <string name="pref_torrc_title">Ð?одаÑ?ковÑ? налаÑ?Ñ?Ñ?ваннÑ? Torrc</string>
   <string name="pref_torrc_summary">Ð?Ð?ШÐ? Ð?Ð?Я Ð?Ð?СÐ?Ð?РТÐ?Ð?: введÑ?Ñ?Ñ? безпоÑ?еÑ?еднÑ? Ñ?Ñ?дки налаÑ?Ñ?Ñ?ванÑ? torrc</string>
   <string name="pref_torrc_dialog">Ð?одаÑ?кове Ñ? Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus â?? пÑ?огÑ?ама Benetech Human Rights Documentation </string>
-  <string name="your_tor_public_ips_">Ð?аÑ?Ñ? пÑ?блÑ?Ñ?нÑ? Tor IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?Ñ?дÑ? лаÑ?ка, вимкнÑ?Ñ?Ñ? Ñ?ей заÑ?Ñ?оÑ?Ñ?нок Ñ? Android-&gt;Ð?алаÑ?Ñ?Ñ?ваннÑ?-&gt;Ð?Ñ?огÑ?ами, Ñ?кÑ?о Ñ? Ð?аÑ? виникаÑ?Ñ?Ñ? пÑ?облеми з Orbot: </string>
-  <string name="app_conflict">Ð?онÑ?лÑ?кÑ? пÑ?огÑ?ам</string>
-  <string name="pref_transproxy_refresh_title">Ð?вÑ?опеÑ?езапÑ?Ñ?к Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Ð?овÑ?оÑ?но заÑ?Ñ?оÑ?Ñ?ваÑ?и пÑ?авила Transproxy, коли змÑ?ниÑ?Ñ?Ñ?Ñ? Ñ?Ñ?ан меÑ?ежÑ?</string>
-  <string name="pref_transproxy_flush_title">Ð?РÐ?Ð?УСÐ?Ð?Ð? Ð?Ð?Ð?УЧÐ?Ð?Ð?Я Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ð?аÑ?иÑ?нÑ?Ñ?Ñ? Ñ?Ñ?Ñ?, Ñ?об зÑ?Ñ?внÑ?Ñ?и Ñ?Ñ?Ñ? пÑ?авила меÑ?ежÑ? transproxy Ð?Ð?РÐ?Ð?</string>
-  <string name="transparent_proxy_rules_flushed_">Ð?Ñ?авила пÑ?озоÑ?ого пÑ?окÑ?Ñ? зÑ?Ñ?внÑ?но!</string>
-  <string name="you_do_not_have_root_access_enabled">У Ð?аÑ? не ввÑ?мкнено ROOT-доÑ?Ñ?Ñ?п</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?ам може бÑ?Ñ?и поÑ?Ñ?Ñ?бно зÑ?пиниÑ?и Ñ? запÑ?Ñ?Ñ?иÑ?и Orbot, Ñ?об змÑ?ни налаÑ?Ñ?Ñ?ванÑ? вÑ?Ñ?Ñ?пили в дÑ?Ñ?.</string>
-  <string name="menu_vpn">Ð?аÑ?Ñ?оÑ?Ñ?нки</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,19 +141,15 @@
   <string name="get_bridges_web">Ð?еб</string>
   <string name="activate">Ð?кÑ?ивÑ?ваÑ?и</string>
   <string name="apps_mode">VPN СпоÑ?Ñ?б</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?и можеÑ?е дозволиÑ?и заÑ?оÑ?Ñ?нкам пÑ?аÑ?Ñ?ваÑ?и Ñ?еÑ?ез Tor за допомогоÑ? вбÑ?дованоÑ? Orbot VPN.\n\nЦе не зÑ?обиÑ?Ñ? ваÑ? анонÑ?мним, але допоможе пÑ?ойÑ?и Ñ?еÑ?ез Ñ?аÑ?Ñ?воли.</string>
-  <string name="send_email">Ð?адÑ?Ñ?лаÑ?и лиÑ?Ñ?а</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="install_orweb">Ð?Ñ?Ñ?ановиÑ?и Orfox</string>
-  <string name="standard_browser">СÑ?андаÑ?Ñ?ний бÑ?аÑ?зеÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?РÐ?Ð?Ð?ТÐ?Ð?: Ð?иÑ?е Ñ?Ñ?андаÑ?Ñ?нÑ? моÑ?Ñ?и Tor пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? на пÑ?иÑ?Ñ?Ñ?оÑ?Ñ? з Intel X86/Atom</string>
-  <string name="vpn_default_world">Ð?лобалÑ?ний (авÑ?омаÑ?иÑ?ний)</string>
+    <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="ports">Ð?оÑ?Ñ?и</string>
-  <string name="local_port">Ð?Ñ?Ñ?Ñ?евий Ð?оÑ?Ñ?</string>
+    <string name="local_port">Ð?Ñ?Ñ?Ñ?евий Ð?оÑ?Ñ?</string>
   <string name="onion_port">Ð?оÑ?Ñ? Onion</string>
   <string name="name">Ð?м\'Ñ?</string>
   <string name="done">Ð?Ñ?облено!</string>
@@ -308,9 +162,7 @@
   <string name="backup_restored">РезеÑ?вне копÑ?Ñ?ваннÑ? вÑ?дновлено</string>
   <string name="filemanager_not_available">Ð?енеджеÑ? Ñ?айлÑ?в недоÑ?Ñ?Ñ?пний</string>
   <string name="please_grant_permissions_for_external_storage">Ð?адайÑ?е дозволи на зовнÑ?Ñ?нÑ? пам\'Ñ?Ñ?Ñ?</string>
-  <string name="permission_granted">Ð?озвÑ?л надано</string>
-  <string name="permission_denied">Ð?озвÑ?л вÑ?дÑ?илено</string>
-  <string name="restore_backup">Ð?Ñ?дновиÑ?и Ñ?езеÑ?внÑ? копÑ?Ñ?</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>
@@ -340,10 +192,8 @@
   <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="please_enable_vpn">Ð?Ñ?дÑ? лаÑ?ка, акÑ?ивÑ?йÑ?е Ñ?ежим VPN, Ñ?об дозволиÑ?и заÑ?Ñ?оÑ?Ñ?нкам викоÑ?иÑ?Ñ?овÑ?ваÑ?и Tor</string>
-  <string name="app_shortcuts">Ð?аÑ?Ñ?оÑ?Ñ?нки, Ñ?о пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Tor</string>
-  <string name="title_activity_bridge_wizard">Ð?Ñ?Ñ?лÑ?нÑ?Ñ?Ñ?Ñ? Ð?айÑ?Ñ?Ñ?а Ð?оÑ?Ñ?Ñ?в</string>
-  <string name="testing_bridges">ТеÑ?Ñ?Ñ?ваннÑ? моÑ?Ñ?а з\'Ñ?днаннÑ? з Tor....</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>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index bf610924..17c15bd2 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -2,21 +2,12 @@
 <resources>
   <string name="app_name">آربÙ?Ù¹</string>
   <string name="app_description">آربÙ?Ù¹ اÛ?Ú© Ù?Ù?ت پراکسÛ? اÛ?Ù¾ Ú¾Û? جÙ? Ú©Û? دÙ?سرÛ? اÛ?پس Ú©Ù? زÛ?ادÛ? Ù?Ø­Ù?Ù?ظ طرÛ?Ù?Û? سÛ? اÙ?ٹرÙ?Û?Ù¹ استعÙ?اÙ? کرÙ?Û? کا Ø­Ù? دÛ?تÛ? Ú¾Û?.آرباٹ آپ Ú©Û? اÙ?ٹرÙ?Û?Ù¹ ٹرÛ?Ù?Ú© Ú©Ù? Û?Ù?کرÛ?پٹ کرÙ?Û? Ú©Û?Ù?ئÛ? ٹار کا استعÙ?اÙ? کرتÛ? Ú¾Û? اÙ?ر اسÛ? Ù¾Ù?رÛ? دÙ?Û?ا Ú©Û? Ú©Ù?Ù¾Û?Ù?ٹرز Ú©Û? سÛ?رÛ?ز Ù?Û?Úº سÛ? اÚ?ھاÙ?تÛ? Û?Ù?Û? دÙ?سرÙ?Úº سÛ? Ù?Ø­Ù?Ù?ظ رکھتÛ? Ú¾Û?.ٹار اÛ?Ú© Ù?Ù?ت ساÙ?Ù¹Ù?Û?ر اÙ?ر اÛ?Ú© آزاد Ù?صدر Ù?Û?Ù¹ Ù?رک Ú¾Û? جÙ? Ú©Û? آپ Ú©Ù? اÛ?Ú© طرح Ú©Û? Ù?Û?Ù¹ Ù?رک Ú©Û? Ù?گراÙ?Û? سÛ? بÚ?اؤ Ú©Û?Ù?ئÛ? Ù?دد دÛ?تا Ú¾Û? جس سÛ?Ú©Û? ذاتÛ? آزادÛ?, Ù?جÛ? Ù?عÙ?Ù?Ù?ات, رازداراÙ?Û? کارÙ?بارÛ? سرگرÙ?Û?اں, رشتÛ? دارÛ? اÙ?ر رÛ?استÛ? سÙ?اÙ?تÛ? جÙ? Ú©Û? Ù?Û?Ù¹Ù?رک ٹرÛ?Ù?Ú© کا تجزÛ?Û? Ú©Û?Ù?اتا Ú¾Û?,Ú©Ù? Ù?Ù?صاÙ? Ù¾Û?Ù?Ú? سکتا Ú¾Û?.</string>
-  <string name="menu_home">ابتدائÛ? صحÙ?Û?</string>
-  <string name="menu_browse">براؤز Ú©Û?جÛ?Û?</string>
-  <string name="menu_info">Ù?دد</string>
-  <string name="menu_start">شرÙ?ع کرئÛ?Úº</string>
+    <string name="menu_start">شرÙ?ع کرئÛ?Úº</string>
   <string name="menu_about">Ú©Û? بارÛ? Ù?Û?Úº</string>
-  <string name="button_help">Ù?دد</string>
-  <string name="button_close">بÙ?د Ú©Û?جÛ?Û?</string>
-  <string name="button_about">Ú©Û? بارÛ? Ù?Û?Úº</string>
-  <string name="wizard_title">آربÙ?Ù¹</string>
-  <string name="btn_next">اگÙ?ا </string>
-  <string name="btn_back">Ù¾Û?Ú?Ú¾Û?</string>
-  <string name="btn_cancel">تÙ?سÛ?Ø® Ú©Û?جÛ?Û?</string>
+    <string name="button_about">Ú©Û? بارÛ? Ù?Û?Úº</string>
+    <string name="btn_cancel">تÙ?سÛ?Ø® Ú©Û?جÛ?Û?</string>
   <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">عاÙ? </string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -24,10 +15,8 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Ø­Û?Ø«Û?ت Û?ا اسٹÛ?ٹس</string>
-  <string name="error">غÙ?Ø·Û?</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">زباÙ?</string>
+    <string name="error">غÙ?Ø·Û?</string>
+    <string name="set_locale_title">زباÙ?</string>
   <string name="save">Ù?Ø­Ù?Ù?ظ کرÛ?Úº</string>
   <string name="name">Name</string>
 </resources>
diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml
index ac5e479d..2ae0bcfa 100644
--- a/app/src/main/res/values-uz/strings.xml
+++ b/app/src/main/res/values-uz/strings.xml
@@ -1,35 +1,18 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Torni ishga tushirish va to\'htatish</string>
-  <string name="status_starting_up">Orbot ishga tushirilmoqdaâ?¦</string>
+    <string name="status_starting_up">Orbot ishga tushirilmoqdaâ?¦</string>
   <string name="status_activated">Tor tarmog\'iga ulangan</string>
-  <string name="menu_home">Uy</string>
-  <string name="menu_browse">Tanlash</string>
-  <string name="menu_settings">Moslamalar</string>
-  <string name="menu_info">Yordam</string>
-  <string name="menu_stop">Toâ??xtatish</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_help">Yordam</string>
-  <string name="button_close">Yopish</string>
-  <string name="button_about">Dasur haqida</string>
-  <string name="menu_verify">Tekshirish</string>
-  <string name="menu_exit">Chiqish</string>
-  <string name="title_error">Dastur xatosi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="btn_next">Keyingi</string>
-  <string name="btn_cancel">Bekor qilish</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)-->
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proksi moslamalari</string>
-  <string name="wizard_final">Orbot tayyor!</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <string name="pref_general_group">Umumiy</string>
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -40,18 +23,10 @@
   <string name="pref_proxy_type_dialog">Proksi turini kiriting</string>
   <string name="pref_proxy_password_summary">Proksi maxfiy so\'zi (Qo\'shimcha)</string>
   <string name="pref_proxy_password_dialog">Proksi maxfiy so\'zini kiriting</string>
-  <string name="status">Holati</string>
-  <string name="error">Xato</string>
-  <string name="the_tor_license">Tor litsenziyasi</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Til</string>
-  <string name="set_locale_summary">Orbot uchun lokal va tilni tanlash</string>
-  <string name="wizard_locale_title">Tilni tanlansh</string>
-  <string name="btn_save_settings">Moslamalarni saqlash</string>
-  <string name="menu_vpn">Dasturlar</string>
-  <string name="get_bridges_email">E-pochta manzili</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="install_orweb">Orfoxni o\'rnatish</string>
   <string name="save">Saqlash</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index fd2b2133..972869f3 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2,134 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot là má»?t ứng dụng proxy miá»?n phí, Ä?ược thiết kế Ä?á»? làm cho các ứng dụng khác kết ná»?i vá»?i Internet má»?t cách an toàn. Orbot sá»­ dụng Tor Ä?á»? mã hóa các kết ná»?i Internet rá»?i ẩn danh nó thông qua má»?t loạt các nút trong mạng Tor. Tor là phần má»?m miá»?n phí và là má»?t mạng lÆ°á»?i má»? giúp bạn chá»?ng lại sá»± giám sát mạng, vá»?n Ä?e dá»?a riêng tÆ° trá»±c tuyến, hay các hoạt Ä?á»?ng bí mật...</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">khá»?i Ä?á»?ng và ngừng Tor</string>
-  <string name="tor_proxy_service_process">d�ch vụ tor proxy</string>
-  <string name="status_starting_up">Ortbot Ä?ang khá»?i Ä?á»?ng...</string>
+    <string name="status_starting_up">Ortbot Ä?ang khá»?i Ä?á»?ng...</string>
   <string name="status_activated">Ä?ã kết ná»?i vá»?i mạng Tor</string>
   <string name="status_disabled">Orbot Ä?ã Ä?ược vô hiá»?u hóa</string>
   <string name="status_shutting_down">Ä?ang tắt dá»?ch vụ Tor</string>
   <string name="tor_process_starting">Bắt Ä?ầu Tor</string>
   <string name="tor_process_complete">hoàn thành.</string>
-  <string name="tor_process_waiting">Ä?ang chá»?.</string>
-  <string name="not_anonymous_yet">Chú ý: Kết ná»?i của bạn chÆ°a phải là ẩn danh! Hãy cài Ä?ặt các ứng dụng của bạn Ä?á»? sá»­ dụng HTTP Proxy 127.0.0.1:8118, Proxy SOCKS4A hoặc proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Trang chủ</string>
-  <string name="menu_browse">Trình duy�t</string>
-  <string name="menu_settings">Thiết lập</string>
+    <string name="menu_settings">Thiết lập</string>
   <string name="menu_log">Nhật ký</string>
-  <string name="menu_info">Giúp Ä?ỡ</string>
-  <string name="menu_start">Bắt Ä?ầu</string>
+    <string name="menu_start">Bắt Ä?ầu</string>
   <string name="menu_stop">Ngừng</string>
   <string name="menu_about">Vá»?</string>
-  <string name="menu_promo_apps">Các ứng dụng khác...</string>
-  <string name="main_layout_download">Tải v�</string>
+    <string name="main_layout_download">Tải v�</string>
   <string name="main_layout_upload">Tải lên</string>
-  <string name="button_help">Giúp Ä?ỡ</string>
-  <string name="button_close">Ä?óng</string>
-  <string name="button_about">Giá»?i thiá»?u</string>
-  <string name="button_clear_log">Xóa nhật ký</string>
-  <string name="menu_verify">Kiá»?m tra</string>
-  <string name="menu_exit">Thoát</string>
+    <string name="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="press_to_start">- nhấn giữ Ä?á»? khá»?i Ä?á»?ng -</string>
-  <string name="pref_trans_proxy_group">Proxy trong su�t (Yêu cầu root)</string>
-  <string name="pref_trans_proxy_title">Proxy trong suá»?t</string>
-  <string name="pref_trans_proxy_summary">Tá»± Ä?á»?ng áp dụng Tor cho ứng dụng</string>
-  <string name="pref_transparent_all_title">�p dụng Tor cho tất cả ứng dụng</string>
-  <string name="pref_transparent_all_summary">Chuy�n tất cả các kết n�i của các ứng dụng qua Tor</string>
-  <string name="pref_transparent_port_fallback_title">C�ng Proxy dự phòng</string>
-  <string name="pref_transparent_port_fallback_summary">CHÃ? Ã?: Tránh dùng các cá»?ng thông dụng (80, 443, v.v...). *CHá»?* dùng nếu chế Ä?á»? \"áp dụng Tor cho tất cả\" hoặc \"chá»?n ứng dụng\" không dùng Ä?ược.</string>
-  <string name="pref_transparent_port_title">Danh sách c�ng</string>
-  <string name="pref_transparent_port_summary">Liá»?t kê các cá»?ng Ä?á»? áp dụng proxy. *CHá»?* dùng nếu chế Ä?á»? \"áp dụng Tor cho tất cả\" hoặc \"chá»?n ứng dụng\" không dùng Ä?ược.</string>
-  <string name="pref_transparent_port_dialog">Ä?iá»?n sá»? cá»?ng Ä?á»? áp dụng proxy</string>
-  <string name="pref_has_root">Yêu cầu root</string>
-  <string name="pref_has_root_summary">Yêu cầu root Ä?á»? kích hoạt proxy trong suá»?t</string>
-  <string name="status_install_success">Tập nhá»? phân của Tor Ä?ã Ä?ược cài Ä?ặt!</string>
-  <string name="status_install_fail">Tập nhá»? phân của Tor bá»? lá»?i khi cài Ä?ặt. Xin hãy kiá»?m tra nhật ký và thông báo cho tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ứng dụng b� l�i</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Vá»? Orbot</string>
-  <string name="btn_next">Tiếp</string>
-  <string name="btn_back">Trá»? vá»?</string>
-  <string name="btn_finish">Kết thúc</string>
-  <string name="btn_okay">Ä?á»?ng ý</string>
+    <string name="btn_okay">Ä?á»?ng ý</string>
   <string name="btn_cancel">Hủy</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">Vài chi tiết v� Orbot</string>
-  <string name="wizard_permissions_root">Ä?ã cho phép quyá»?n</string>
-  <string name="wizard_permissions_stock">Quy�n truy cập của Orbot</string>
-  <string name="wizard_premissions_msg_root">Tuyá»?t! Chúng tôi Ä?ã nhận ra máy bạn có root Ä?ược kích hoạt cho Orbot. Chúng tôi sẽ tận dụng Ä?iá»?u này.</string>
-  <string name="wizard_permissions_msg_stock">Mặc dù không cần thiết, nhÆ°ng Orbot có thá»? trá»? thành má»?t công cụ mạnh mẽ hÆ¡n nếu thiết bá»? của bạn có root. Hãy ấn nút dÆ°á»?i Ä?ây Ä?á»? cho phép Orbot có \"siêu nÄ?ng lá»±c\"!</string>
-  <string name="wizard_permissions_no_root">Nếu bạn không root hoặc không rành vá»? những gì chúng tôi trình bày, xin chá»? dùng những ứng dụng Ä?ã Ä?ược tạo ra Ä?á»? dùng kết hợp vá»?i Orbot.</string>
-  <string name="wizard_permissions_consent">Tôi hi�u rõ và sẽ tiếp tục dùng mà không cần root</string>
-  <string name="wizard_permission_enable_root">Cho phép Orbot truy cập root</string>
-  <string name="wizard_configure">Cài Ä?ặt thông báo cho Tor</string>
-  <string name="wizard_configure_msg">Orbot cho phép chuy�n tất cả các kết n�i của các ứng dụng qua Tor HOẶC áp dụng cho từng ứng dụng riêng lẻ.</string>
-  <string name="wizard_configure_all">�p dụng proxy Tor cho tất cả các ứng dụng</string>
-  <string name="wizard_configure_select_apps">Lá»±a chá»?n từng ứng dụng Ä?á»? áp dụng Tor</string>
-  <string name="wizard_tips_tricks">Các ứng dụng Ä?ã Ä?ược áp dụng Tor</string>
-  <string name="wizard_tips_msg">Những ứng dụng sau Ä?ây Ä?ã Ä?ược thiết lập Ä?á»? dùng vá»?i Orbot. Nhấn ứng dụng bất kỳ Ä?á»? cài Ä?ặt ngay bây giá»?, hoặc bạn có thá»? tìm những ứng dụng này trên Google Play, tại trang GuardianProject.info hoặc qua F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ứng dụng IM (tin nhắn tức th�i) bảo mật cho Android</string>
-  <string name="wizard_tips_proxy">Cài Ä?ặt Proxy - Tìm hiá»?u cách thiết lập ứng dụng Ä?á»? dùng vá»?i Orbot</string>
-  <string name="wizard_tips_duckgo">Ứng dụng tìm kiếm DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Cài proxy của Twitter v�i host là \"localhost\" và c�ng là 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Viết má»?t câu chuyá»?n rá»?i Ä?á»? nó cho Tor Ä?á»? bảo mật!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Cài Ä?ặt proxy</string>
-  <string name="wizard_proxy_help_msg">Nếu ứng dụng Android mà bạn Ä?ang dùng há»? trợ giao thức proxy HTTP hay SOCKS, thì bạn có thá»? cấu hình nó kết ná»?i tá»?i Orbot và sá»­ dụng Tor.\n\n\n Cài Ä?ặt host mặc Ä?á»?nh là 127.0.0.1 hoặc \"localhost\". Vá»?i HTTP, cá»?ng là 8118, còn SOCKS là 9050. Bạn nên dùng SOCKS4A hoặc SOCKS5 nếu có thá»?.\n \n\n\n Bạn có thá»? tìm hiá»?u thêm vá»? cấu hình proxy trên Android qua mục FAQ tại: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot Ä?ã sẵn sàng!</string>
-  <string name="wizard_final_msg">Hàng trÄ?m ngàn ngÆ°á»?i trên toàn thế giá»?i dùng Tor vá»?i nhiá»?u lý do. Những nhà báo, blogger, các nhà hoạt Ä?á»?ng nhân quyá»?n, an ninh, quân Ä?á»?i, tá»? chức, công dân của những nÆ°á»?c bá»? Ä?ang bá»? Ä?àn áp, hoặc chá»? là những ngÆ°á»?i dân bình thÆ°á»?ng... và bây giá»? là bạn cÅ©ng Ä?ang chuẩn bá»? là má»?t trong sá»? há»?!</string>
-  <string name="wizard_exit_at_first_screen_toast">Vui lòng thiết lập Orbot trư�c khi bạn sử dụng nó!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Bạn Ä?ã kết ná»?i thành công tá»?i mạng Tor - nhÆ°ng Ä?iá»?u Ä?ó KHÃ?NG có nghÄ©a là thiết bá»? của bạn Ä?ã hoàn toàn an toàn. Bạn có thá»? kiá»?m tra kết ná»?i của bạn qua nút \"Trình duyá»?t\". \n\nTruy cập ttps://guardianproject.info/apps/orbot hoặc gá»­i email tá»?i help@xxxxxxxxxxxxxxxxxxxx Ä?á»? biết thêm chi tiết.</string>
-  <string name="tor_check">Sẽ má»? trang web https://check.torproject.org Ä?á»? kiá»?m tra xem Orbot Ä?ã Ä?ược cài Ä?ặt Ä?úng chÆ°a và bạn có Ä?ang kết ná»?i qua Tor hay không.</string>
-  <string name="pref_hs_group">D�ch vụ web hosting ẩn</string>
-  <string name="pref_general_group">T�ng quát</string>
+    <!--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-->
-  <string name="wizard_title_msg">Orbot mang Tor Ä?ến Android! \n\nTor giúp bạn chá»?ng lại bá»? lá»?c ná»?i dung mạng, các hoạt Ä?á»?ng phân tích kết ná»?i mạng và theo dõi mạng, vá»?n Ä?e dá»?a tá»?i sá»± riêng tÆ°, các thông tin bí mật và các má»?i quan há»? cá nhân trên mạng. \n\nHÆ°á»?ng dẫn này sẽ giúp bạn thiết lập Orbot và Tor trên thiết bá»? của bạn.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Cảnh báo</string>
-  <string name="wizard_warning_msg">Chá»? Ä?Æ¡n thuần cài Ä?ặt Orbot sẽ không tá»± Ä?á»?ng ẩn danh các kết ná»?i mạng di Ä?á»?ng của bạn.\n\nBạn bắt buá»?c phải thiết lập Orbot Ä?úng cách, Ä?á»? thiết bá»? của bạn và các ứng dụng khác sá»­ dụng Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Quy�n ứng dụng</string>
-  <string name="wizard_permissions_root_msg1">Bạn có thá»? tuỳ ý cho phép Orbot có truy cập root Ä?á»? kích hoạt những tính nÄ?ng nâng cao, nhÆ° dùng proxy trong suá»?t chẳng hạn.</string>
-  <string name="wizard_permissions_root_msg2">Nếu bạn không muá»?n làm Ä?iá»?u này, xin hãy dùng những ứng dụng Ä?ược tạo Ä?á»? dùng vá»?i Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Thiết bá»? của bạn hình nhÆ° chÆ°a root hoặc Ä?ã cấp quyá»?n root hoặc truy cập root.\n\nVui lòng chá»?n chế Ä?á»? \"VPN\" trên màn hình chính Ä?á»? thay thế.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Các ứng dụng Ä?ã Ä?ược áp dụng Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ứng dụng chat an toàn v�i mã hóa không-theo-dõi</string>
-  <string name="wizard_tips_orweb">Orfox: Trình duyá»?t vá»?i tính nÄ?ng bảo mật nâng cao, hoạt Ä?á»?ng thông qua Tor</string>
-  <string name="wizard_tips_play">Tìm những ứng dụng của Guardian Project trên Google Play</string>
-  <string name="wizard_tips_fdroid">Tìm những ứng dụng của Guardian Project trên F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Tìm những ứng dụng của Guardian Project trên https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy trong suá»?t</string>
-  <string name="wizard_transproxy_msg">Cài Ä?ặt này cho phép các ứng dụng của bạn tá»± Ä?á»?ng kết ná»?i qua mạng Tor mà không cần thiết lập.</string>
-  <string name="wizard_transproxy_hint">(Hãy chá»?n ô này nếu bạn không hiá»?u những gì chúng tôi Ä?ang nói)</string>
-  <string name="wizard_transproxy_none">Không có</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Kích hoạt proxy Tor trong suá»?t Ä?á»? dùng cho WiFi/USB Tethering (cần khá»?i Ä?á»?ng lại)</string>
-  <string name="button_grant_superuser">Y�u cầu truy cập root</string>
-  <string name="pref_select_apps">Ch�n ứng dụng</string>
-  <string name="pref_select_apps_summary">Ch�n những ứng dụng mà bạn mu�n kết n�i qua Tor</string>
-  <string name="pref_node_configuration">Cấu hình nút</string>
+    <!--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="button_proxy_all">Proxy tất cả</string>
-  <string name="button_proxy_none">Không dùng proxy</string>
-  <string name="button_invert_selection">Ä?ảo ngược lá»±a chá»?n</string>
-  <string name="pref_proxy_title">Proxy mạng ngõ ra (Outbound Network) (Tùy ch�n)</string>
+    <string name="pref_proxy_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>
@@ -145,20 +56,8 @@
   <string name="pref_proxy_password_title">Mật khẩu Proxy ngõ ra</string>
   <string name="pref_proxy_password_summary">Mật khẩu proxy (tùy ch�n)</string>
   <string name="pref_proxy_password_dialog">Nhập mật khẩu proxy</string>
-  <string name="status">Tình trạng</string>
-  <string name="setting_up_full_transparent_proxying_">Ä?ang cấu hình proxy trong suá»?t cho tất cả...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ä?ang cấu hình proxy trong suá»?t cho các ứng dụng Ä?ược chá»?n...</string>
-  <string name="transparent_proxying_enabled">Proxy trong suá»?t Ä?ƯỢC KÃ?CH HOẠT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Ä?ã Ä?ược kích hoạt Ä?á»? dùng cho tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">CHÃ? Ã?: có lá»?i khi khá»?i Ä?á»?ng proxy trong suá»?t!</string>
-  <string name="transproxy_rules_cleared">Quy tắc TransProxy Ä?ã Ä?ược xóa</string>
-  <string name="couldn_t_start_tor_process_">Không thá»? khá»?i Ä?á»?ng tiến trình Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo Ä?ang chạy á»? cá»?ng:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ä?ang cài Ä?ặt proxy trong suá»?t theo cá»?ng</string>
-  <string name="bridge_error">Lá»?i bridge</string>
-  <string name="bridge_requires_ip">Ä?á»? dùng chức nÄ?ng bridge, bạn phải nhập ít nhất má»?t Ä?á»?a chá»? IP dùng cho bridge.</string>
-  <string name="send_email_for_bridges">Gá»­i má»?t email Ä?ến bridges@xxxxxxxxxxxxxx vá»?i dòng chữ \"get bridges\" trong thÆ° từ má»?t tài khoản gmail.</string>
-  <string name="error">Lá»?i</string>
+    <string name="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>
@@ -171,9 +70,7 @@
   <string name="use_only_these_specified_nodes">*Chá»?* dùng những nút Ä?ược liá»?t kê</string>
   <string name="bridges">Bridge</string>
   <string name="use_bridges">Dùng bridge</string>
-  <string name="bridges_obfuscated">Các bridge Ä?ược che giấu</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Kích hoạt nếu nhÆ° các bridge Ä?ã Ä?ược cấu hình là bridge Ä?ã Ä?ược che giấu</string>
-  <string name="ip_address_and_port_of_bridges">Ä?á»?a chá»? IP và cá»?ng của bridge</string>
+    <string name="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>
@@ -189,53 +86,27 @@
   <string name="reachable_ports">Cá»?ng truy cập Ä?ược</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">Cá»?ng truy cập Ä?ược Ä?ằng sau tÆ°á»?ng lá»­a</string>
   <string name="enter_ports">Nhập s� c�ng</string>
-  <string name="enable_hidden_services">Host web ẩn</string>
-  <string name="run_servers_accessible_via_the_tor_network">Cho phép máy chủ Ä?ược thiết lập trong thiết bá»? của bạn có thá»? truy cập Ä?ược qua mạng Tor.</string>
-  <string name="enter_localhost_ports_for_hidden_services">Nhập c�ng localhost cho web ẩn</string>
-  <string name="hidden_service_ports">C�ng web ẩn</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ä?á»?a chá»? hợp lá»? cho web ẩn của bạn (Ä?ược tá»± Ä?á»?ng tạo ra)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Kích hoạt nhật ký gỡ lá»?i á»? Ä?ầu ra (phải dùng adb hoặc aLogCat Ä?á»? xem)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Kích hoạt nhật ký gỡ lá»?i á»? Ä?ầu ra (phải dùng adb hoặc aLogCat Ä?á»? xem)</string>
   <string name="project_home">Các trang chủ dự án:</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Giấy phép của Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Phần m�m bên thứ 3:</string>
+    <string name="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="hidden_service_on">web ẩn trong:</string>
-  <string name="unable_to_read_hidden_service_name">không thá»? Ä?á»?c Ä?ược tên dá»?ch vụ ẩn</string>
+    <string name="unable_to_read_hidden_service_name">không thá»? Ä?á»?c Ä?ược tên dá»?ch vụ ẩn</string>
   <string name="unable_to_start_tor">Không thá»? khá»?i Ä?á»?ng Tor Ä?ược: </string>
-  <string name="unable_to_reset_tor">Khá»?i Ä?á»?ng lại thiết bá»? của bạn, không thá»? thiết Ä?ặt lại Tor!</string>
-  <string name="pref_use_sys_iptables_title">Dùng Iptables mặc Ä?á»?nh</string>
-  <string name="pref_use_sys_iptables_summary">dùng tập nhá»? phân iptables của há»? thá»?ng thay vì dùng tập nhá»? phân Ä?ược  Ä?i kèm vá»?i Orbot</string>
-  <string name="error_installing_binares">Tập nhá»? phân của Tor không thá»? cài hoặc nâng cấp Ä?ược.</string>
-  <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot Ä?ược kết ná»?i</string>
+    <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot Ä?ược kết ná»?i</string>
   <string name="pref_use_persistent_notifications_title">Thông báo thư�ng trực</string>
   <string name="pref_use_expanded_notifications">Hi�n th� thông báo m� r�ng v�i IP và qu�c gia của nút cu�i (Tor exit-node)</string>
   <string name="pref_use_expanded_notifications_title">Thông báo m� r�ng</string>
-  <string name="notification_using_bridges">Bridge Ä?ã Ä?ược kích hoạt!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ngôn ngữ</string>
-  <string name="set_locale_summary">Ch�n ngôn ngữ cho Orbot</string>
-  <string name="wizard_locale_title">Ch�n ngôn ngữ</string>
-  <string name="wizard_locale_msg">Giữ cài Ä?ặt mặc Ä?á»?nh hoặc chuyá»?n qua ngôn ngữ khác</string>
-  <string name="powered_by">Ä?ược há»? trợ bá»?i Tor</string>
-  <string name="btn_save_settings">Lưu thiết lập</string>
-  <string name="no_internet_connection_tor">Không có kết ná»?i Internet; Tor Ä?ang á»? chế Ä?á»? chá»?...</string>
-  <string name="bandwidth_">BÄ?ng thông:</string>
-  <string name="down">tải xu�ng</string>
-  <string name="up">tải lên</string>
-  <string name="pref_disable_network_title">Tá»± Ä?á»?ng \"ngủ\" khi không có mạng</string>
+    <string name="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="menu_verify_browser">Trình duy�t</string>
-  <string name="menu_use_chatsecure">Dùng ChatSecure</string>
-  <string name="permission_manage_tor_label">Quản lý Tor</string>
-  <string name="permission_manage_tor_description">Cho phép ứng dụng này Ä?iá»?u khiá»?n dá»?ch vụ Tor</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Không có mạng. Ä?ang chuyá»?n Tor sang chế Ä?á»? ngủ...</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">Không có mạng. Ä?ang chuyá»?n Tor sang chế Ä?á»? ngủ...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Kết ná»?i mạng tá»?t. Ä?ang \"Ä?ánh thức\" Tor...</string>
   <string name="updating_settings_in_tor_service">Ä?ang cập nhật cài Ä?ặt dá»?ch vụ Tor</string>
   <string name="pref_socks_title">Cá»?ng SOCKS</string>
@@ -250,19 +121,7 @@
   <string name="pref_torrc_title">Cấu hình tùy ch�nh cho Torrc</string>
   <string name="pref_torrc_summary">CH� NGƯ�I D�NG CHUY�N M�N: nhập các thiết lập trực tiếp cho torrc</string>
   <string name="pref_torrc_dialog">Torrc tùy ch�nh</string>
-  <string name="wizard_tips_martus">Mobile Martus - Ứng dụng cung cấp các tài li�u v� nhân quy�n của Benetech</string>
-  <string name="your_tor_public_ips_">Các IP Tor công c�ng của bạn là:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vui lòng vô hiá»?u hóa ứng dụng này trong Android-&gt;Settings-&gt;Apps nếu bạn Ä?ang gặp vấn Ä?á»? vá»?i Orbot:</string>
-  <string name="app_conflict">Xung Ä?á»?t ứng dụng</string>
-  <string name="pref_transproxy_refresh_title">Tá»± Ä?á»?ng làm má»?i proxy trong suá»?t</string>
-  <string name="pref_transproxy_refresh_summary">Ã?p dụng lại các quy tắc proxy trong suá»?t khi trạng thái mạng thay Ä?á»?i</string>
-  <string name="pref_transproxy_flush_title">�P BU�C X�A các quy tắc proxy trong su�t</string>
-  <string name="pref_transproxy_flush_summary">Chạm vào Ä?ây Ä?á»? xóa sạch các quy tắc proxy trong suá»?t NGAY BÃ?Y GIá»?</string>
-  <string name="transparent_proxy_rules_flushed_">Quy tắc proxy trong suá»?t Ä?ã Ä?ược xóa!</string>
-  <string name="you_do_not_have_root_access_enabled">Bạn không có quy�n truy cập ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Bạn có thá»? cần kết ná»?i lại Orbot Ä?á»? các thay Ä?á»?i Ä?ược áp dụng</string>
-  <string name="menu_vpn">Ứng dụng Ä?ã cấp quyá»?n</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -276,9 +135,7 @@
   <string name="send_email">Gá»­i email</string>
   <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Bạn có thá»? lấy má»?t Ä?á»?a chá»? bridge qua email, web hoặc quét mã QR. Chá»?n \"Email\" hoặc \"Web\" bên dÆ°á»?i Ä?á»? yêu cầu má»?t Ä?á»?a chá»? bridge.\n\nMá»?t khi Ä?ã có Ä?á»?a chá»?, hãy sao chép nó vào thiết Ä?ặt \"Bridge\" trong cài Ä?ặt Orbot rá»?i khá»?i Ä?á»?ng lại phần má»?m.</string>
   <string name="install_orweb">Cài Ä?ặt Orfox</string>
-  <string name="standard_browser">Trình duy�t thư�ng</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LƯU Ã?: Chá»? có bridge Tor chuẩn má»?i hoạt Ä?á»?ng trên các thiết bá»? Intel x86/Atom</string>
-  <string name="save">LÆ°u</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>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5f2c7965..c7b18981 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2,139 +2,45 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot æ?¯ä¸?款å??è´¹ç??代ç??åº?ç?¨ï¼?è?½å¤?让å?¶ä»?åº?ç?¨æ?´å®?å?¨å?°ä½¿ç?¨äº?è??ç½?ã??é??è¿?å?¨ä½?äº?ä¸?ç??å??å?°ç??ä¸?ç³»å??计ç®?æ?ºä¹?é?´è¿?è¡?跳转ï¼?Orbot å?¯å?©ç?¨ Tor 对ç½?ç»?é??ä¿¡è¿?è¡?å? å¯?并é??è??ã??Tor æ?¯ä¸?款å??è´¹ç??软件ï¼?并ä¸?æ?¯ä¸?个å¼?æ?¾ç??ç½?ç»?ã??å®?å?¯ä»¥ä¿?æ?¤ç?¨æ?·å??å??æµ?é??å??æ??ç??å?±å®³ï¼?è¿?ç§?ç½?ç»?ç??æ?§å?¯å¯¹ä¸ªäººè?ªç?±ä¸?é??ç§?ã??å??ä¸?æ?ºå¯?æ´»å?¨å??å?³ç³»ä»¥å??å?½å®¶å®?å?¨é? æ??å¨?è??ã??</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">å?¯å?¨å??å??æ­¢ Tor</string>
-  <string name="tor_proxy_service_process">Tor 代ç??æ??å?¡</string>
-  <string name="status_starting_up">Orbot 正���...</string>
+    <string name="status_starting_up">Orbot 正���...</string>
   <string name="status_activated">已��� Tor ��</string>
   <string name="status_disabled">Orbot å·²å??ç?¨</string>
   <string name="status_shutting_down">Toræ??å?¡ æ­£å?¨å?³é?­</string>
   <string name="tor_process_starting">正��� Tor 客�端...</string>
   <string name="tor_process_complete">å®?æ??ã??</string>
-  <string name="tor_process_waiting">ç­?å¾?ã??</string>
-  <string name="not_anonymous_yet">è­¦å??ï¼?ä½ ç??ç½?ç»?é??讯并é??å?¿å??ï¼?请设置åº?ç?¨ç¨?åº?ï¼?使ç?¨ HTTP 代ç?? 127.0.0.1:8118 æ??è?? SOCKS4Aã??SOCKS5 代ç?? 127.0.0.1:9050</string>
-  <string name="menu_home">�页</string>
-  <string name="menu_browse">��</string>
-  <string name="menu_settings">设置</string>
+    <string name="menu_settings">设置</string>
   <string name="menu_log">��</string>
-  <string name="menu_info">帮�</string>
-  <string name="menu_start">��</string>
+    <string name="menu_start">��</string>
   <string name="menu_stop">å??æ­¢</string>
   <string name="menu_about">��</string>
-  <string name="menu_promo_apps">è?·å??åº?ç?¨â?¦</string>
-  <string name="main_layout_download">�载</string>
+    <string name="main_layout_download">�载</string>
   <string name="main_layout_upload">�传</string>
-  <string name="button_help">帮�</string>
-  <string name="button_close">��</string>
-  <string name="button_about">��</string>
-  <string name="button_clear_log">����</string>
-  <string name="menu_verify">��</string>
-  <string name="menu_exit">é??å?º</string>
+    <string name="button_about">��</string>
+    <string name="menu_exit">é??å?º</string>
   <string name="menu_scan">æ?«æ??ç½?æ¡¥QRç ?</string>
   <string name="menu_share_bridge">å??享ç½?æ¡¥QRç ?</string>
-  <string name="press_to_start">- é?¿æ??å?¯å?¨ -</string>
-  <string name="pref_trans_proxy_group">é??æ??代ç??ï¼?é??è¦? Root æ??é??ï¼?</string>
-  <string name="pref_trans_proxy_title">é??æ??代ç??</string>
-  <string name="pref_trans_proxy_summary">������使� Tor</string>
-  <string name="pref_transparent_all_title">æ??æ??åº?ç?¨ç¨?åº?使ç?¨ Tor</string>
-  <string name="pref_transparent_all_summary">æ??æ??åº?ç?¨ç¨?åº?é?½é??è¿? Tor è¿?æ?¥ç½?ç»?</string>
-  <string name="pref_transparent_port_fallback_title">å¤?ç?¨ä»£ç??端å?£</string>
-  <string name="pref_transparent_port_fallback_summary">è­¦å??ï¼?é?¿å??使ç?¨å¸¸ç?¨ç«¯å?£ï¼?80ã??443 ç­?ï¼?ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
-  <string name="pref_transparent_port_title">端å?£å??表</string>
-  <string name="pref_transparent_port_summary">代ç??端å?£å??表ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
-  <string name="pref_transparent_port_dialog">è¾?å?¥ä»£ç??端å?£</string>
-  <string name="pref_has_root">请æ±? Root 访é?®æ??é??</string>
-  <string name="pref_has_root_summary">为é??æ??代ç??请æ±?è?·å?? Root 访é?®æ??é??</string>
-  <string name="status_install_success">Tor ç¨?åº?å®?è£?æ??å??ï¼?</string>
-  <string name="status_install_fail">Tor ç¨?åº?æ? æ³?å®?è£?ã??请æ?¥ç??æ?¥å¿?并å°?å?¶å??é??å?° tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">åº?ç?¨ç¨?åº?é??误</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">�� Orbot</string>
-  <string name="btn_next">��步</string>
-  <string name="btn_back">��步</string>
-  <string name="btn_finish">å®?æ??</string>
-  <string name="btn_okay">确�</string>
+    <string name="btn_okay">确�</string>
   <string name="btn_cancel">å??æ¶?</string>
   <!--Welcome Wizard strings (DJH)-->
   <string name="wizard_details">�� Orbot 信�</string>
-  <string name="wizard_permissions_root">å·²è?·å??æ??é??</string>
-  <string name="wizard_permissions_stock">Orbot æ??é??</string>
-  <string name="wizard_premissions_msg_root">好æ??äº?ï¼?æ??们æ£?æµ?å?° Orbot å·²è?·å?? Root æ??é?? ã??æ??们ä¼?è°¨æ??å?°ä½¿ç?¨è¿?ä¸?æ??é??ã??</string>
-  <string name="wizard_permissions_msg_stock">è?½é??å¿?é¡»ï¼?ä½?æ?¯å?·æ?? Root 访é?®æ??é??ç??设å¤?å?¯ä»¥è®© Orbot å??å¾?æ?´å¼ºå¤§ã??请使ç?¨ä¸?é?¢ç??æ??é?®æ??äº? Orbot è¿?ä¸?强大ç??è?½å??ï¼?</string>
-  <string name="wizard_permissions_no_root">å¦?æ??没æ?? Root 访é?®æ??é??æ??ä¸?æ??ç?½æ­¤å¤?æ??说ç??å??容ï¼?å?ªé??ç¡®ä¿? Orbot æ?¯æ??æ??ç?¨ç??åº?ç?¨å?³å?¯ã??</string>
-  <string name="wizard_permissions_consent">æ??æ??ç?½å¹¶æ?¿æ??å?¨æ?ªè?·å?? Root æ??é??ç??æ??å?µä¸?继续æ??ä½?</string>
-  <string name="wizard_permission_enable_root">为 Orbot è?·å?? Root æ??é??</string>
-  <string name="wizard_configure">é??ç½® Tor ç½?ç»?</string>
-  <string name="wizard_configure_msg">Orbot æ??ä¾?äº?é??项ï¼?å?¯æ??å®?æ??æ??åº?ç?¨ç¨?åº?使ç?¨ Tor ç½?ç»?æ??æ??å®?æ??äº?åº?ç?¨é??è¿? Tor ç½?ç»?è¿?è¡?é??讯ã??</string>
-  <string name="wizard_configure_all">æ??æ??åº?ç?¨ç¨?åº?é?½ä½¿ç?¨ Tor</string>
-  <string name="wizard_configure_select_apps">é??æ?©ä½¿ç?¨ Tor ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_tricks">Orbot æ?¯æ??ç??åº?ç?¨</string>
-  <string name="wizard_tips_msg">以ä¸?åº?ç?¨å?¯ä¸? Orbot ä¸?起使ç?¨ã??ç?¹å?»ä¸?é?¢ç??æ??é?®å®?è£?ï¼?ä¹?å?¯ä»¥é??è¿? Google Play å??åº?ã??GuardianProject.info ç½?ç«?æ?? F-Droid.org æ?¥æ?¾ã??</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android ä¸?ç??å®?å?¨å?³æ?¶é??讯客æ?·ç«¯</string>
-  <string name="wizard_tips_proxy">代ç??设置 - 学习å¦?ä½?é??ç½®åº?ç?¨ç¨?åº?使ç?¨ Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo æ??ç´¢å¼?æ??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_twitter">å°? Twitter 代ç??ç??主æ?ºè®¾ç½® localhost 并å°?端å?£è®¾ç½®ä¸º 8118</string>
-  <string name="wizard_tips_story_maker">æ??äº?å?¶é? è??--乱说äº?ä»?ä¹?ï¼?并ç?¨Torä¿?è¯?æ?¨ç??å®?å?¨ï¼?</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">代ç??设置</string>
-  <string name="wizard_proxy_help_msg">å¦?æ?? Android åº?ç?¨ç¨?åº?æ?¯æ?? HTTP æ?? SOCKS 代ç??ï¼?é?£ä¹?æ?¨å?¯å¯¹å®?è¿?è¡?é??ç½®æ?¥è¿?æ?¥å?° Orbot 并使ç?¨ Tor ç½?ç»?ã?? 主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£è®¾ç½®ä¸º 8118ï¼?对äº? SOCKSï¼?端å?£è®¾ç½®ä¸º 9050ã??å¦?æ??å?¯ä»¥ï¼?请尽é??使ç?¨ SOCKS4A æ?? SOCKS5 代ç??ã?? æ?´å¤?æ??å?³ Android 代ç??ä¿¡æ?¯ï¼?请å??é?? http://tinyurl.com/proxyandroid 中ç??常è§?é?®é¢?</string>
-  <string name="wizard_final">Orbot 已就绪�</string>
-  <string name="wizard_final_msg">å?¨ç??æ?°ä»¥ä¸?计ç??人正å?¨ä½¿ç?¨Torï¼?ä»?们中æ??åª?ä½?è®°è??ï¼?å??客家ï¼?人æ??主ä¹?è??ï¼?æ?¹é?©å®£æ?¬è??ï¼?å??å®?ï¼?å?¬å?¸è??å·¥ï¼?以å??å??æ?¨ä¸?æ ·ç??æ?®é??å¸?æ°?ï¼?ç?°å?¨ï¼?æ?¨ä¹?å??å¤?好äº?ï¼?</string>
-  <string name="wizard_exit_at_first_screen_toast">请å?¨æ?¨å¼?å§?使ç?¨å®?å??é??ç½® Orbotï¼?</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">æ?¨å·²ç»?æ??å??è¿?æ?¥å?°Torç½?ç»?ï¼?ä½?ä¸?代表æ?¨ç??设å¤?æ?¯å®?å?¨ç??ã??æ?¨å?¯ä»¥ä½¿ç?¨â??æµ?è§?å?¨â??æ??é?®æµ?è¯?æ?¨ç??è¿?æ?¥ã??
-
-访é?®https://guardianproject.info/apps/orbot æ??å??é??é?®ä»¶è?³help@xxxxxxxxxxxxxxxxxxxx æ?¥äº?解æ?´å¤?ã??</string>
-  <string name="tor_check">æµ?è§?å?¨å°?å?¯å?¨å¹¶è®¿é?®ï¼?https://check.torproject.orgï¼?以便æ£?æ?¥; Orbot é??ç½®æ?¯å?¦æ­£ç¡®ä»¥å??æ?¯å?¦å?¯è¿?æ?¥ Tor ç½?ç»?ã??</string>
-  <string name="pref_hs_group">é??è??æ??å?¡ä¸»æ?º</string>
-  <string name="pref_general_group">常�</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-->
-  <string name="wizard_title_msg">Orbot使Androidæ?¯æ??Torç½?ç»?!
-Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??å??容è¿?滤ï¼?æµ?é??å??æ??以å??ç½?ç»?审æ?¥ã??
-è¿?个å??导å°?帮å?©ä½ é??ç½®Orbotå?¨ä½ è®¾å¤?å??以便访é?®Torã??</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">è­¦å??</string>
-  <string name="wizard_warning_msg">ç®?å??ç??å®?è£?å®?Orbot并ä¸?è?½è?ªå?¨ç??å?¿å??ä½ ç??移å?¨æµ?é??ã??
-ä½ å¿?é¡»é??å½?ç??é??ç½®Orbotï¼?以å??ä½ ç??设å¤?å??åº?ç?¨ä»¥æ??å??å?¿å??使ç?¨Torã??</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">æ??é??</string>
-  <string name="wizard_permissions_root_msg1">å?¯é??æ?©æ??äº? Orbot â??Superuserâ??访é?®æ??é??ï¼?以便å?¯ç?¨é«?级å??è?½ï¼?ä¾?å¦?é??æ??代ç??ã??</string>
-  <string name="wizard_permissions_root_msg2">å¦?æ??ä¸?æ?¿æ??äº? Orbot 该æ??é??ï¼?请确ä¿?åº?ç?¨ç¨?åº?å?¯ä½¿ç?¨ Orbotã??</string>
-  <string name="wizard_permissions_no_root_msg">æ?¨ç??设å¤?ä¼¼ä¹?å°?æ?ª rootï¼?æ??è??æ?ªæ??ä¾? root æ??â??è¶?级ç?¨æ?·â??ç??访é?®æ??é??ã??\n\n请æ?¹ä¸ºå°?è¯?主å±?å¹?ç??â??åº?ç?¨â??模å¼?ã??</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">使ç?¨ Orbot ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_gibberbot">ChatSecureï¼?å?·æ?? OTF å? å¯?å?±ç??å®?å?¨é??讯åº?ç?¨</string>
-  <string name="wizard_tips_orweb">Orfoxï¼?é??ç§?å¢?强æµ?è§?å?¨é??ç?¨ Tor å·¥ä½?</string>
-  <string name="wizard_tips_play">å?¨ Google Play å??åº?æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_fdroid">å?¨ F-Droid æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_fdroid_org">å?¨ https://f-droid.org æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">é??æ??代ç??</string>
-  <string name="wizard_transproxy_msg">å?¯ä½¿åº?ç?¨ç¨?åº?æ? é??é??ç½®å?³å?¯è?ªå?¨é??è¿? Tor è¿?æ?¥ç½?ç»?ã??</string>
-  <string name="wizard_transproxy_hint">ï¼?å¦?æ??ä¸?æ??ç?½è¿?é??æ??说ç??é?®é¢?ï¼?请é??æ?©è¯¥é??项ï¼?</string>
-  <string name="wizard_transproxy_none">æ? </string>
-  <string name="pref_transparent_tethering_title">Tor ���享</string>
-  <string name="pref_transparent_tethering_summary">对 Wi-Fi å?? USB ç½?ç»?å?±äº«è®¾å¤?å?¯ç?¨é??æ??代ç??ï¼?é??é??æ?°å?¯å?¨ï¼?</string>
-  <string name="button_grant_superuser">请æ±? Superuser 访é?®æ??é??</string>
-  <string name="pref_select_apps">é??æ?©åº?ç?¨ç¨?åº?</string>
-  <string name="pref_select_apps_summary">é??æ?©é??è¿? Tor è¿?æ?¥ç½?ç»?ç??åº?ç?¨ç¨?åº?</string>
-  <string name="pref_node_configuration">è??ç?¹é??ç½®</string>
+    <!--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="button_proxy_all">å?¨é?¨ä»£ç??</string>
-  <string name="button_proxy_none">å?¨ä¸?代ç??</string>
-  <string name="button_invert_selection">å??é??</string>
-  <string name="pref_proxy_title">å?ºç«?ç½?ç»?代ç??ï¼?å?¯é??ï¼?</string>
+    <string name="pref_proxy_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>
@@ -150,20 +56,8 @@ Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??
   <string name="pref_proxy_password_title">å?ºç«?代ç??å¯?ç ?</string>
   <string name="pref_proxy_password_summary">代ç??å¯?ç ?ï¼?å?¯é??ï¼?</string>
   <string name="pref_proxy_password_dialog">请è¾?å?¥ä»£ç??å¯?ç ?</string>
-  <string name="status">ç?¶æ??</string>
-  <string name="setting_up_full_transparent_proxying_">æ­£å?¨å¯¹æ??æ??åº?ç?¨ç¨?åº?è¿?è¡?é??æ??代ç??设置...</string>
-  <string name="setting_up_app_based_transparent_proxying_">æ­£å?¨å¯¹æ??é??åº?ç?¨ç¨?åº?è¿?è¡?é??æ??代ç??设置...</string>
-  <string name="transparent_proxying_enabled">é??æ??代ç??å·²å?¯ç?¨</string>
-  <string name="transproxy_enabled_for_tethering_">已为���享�活 TransProxy �</string>
-  <string name="warning_error_starting_transparent_proxying_">è­¦å??ï¼?å?¯å?¨é??æ??代ç??æ?¶å??ç??é??误ï¼?</string>
-  <string name="transproxy_rules_cleared">å·²æ¸?é?¤ TransProxy è§?å??</string>
-  <string name="couldn_t_start_tor_process_">���� Tor ���</string>
-  <string name="privoxy_is_running_on_port_">Polipo 正���端�:</string>
-  <string name="setting_up_port_based_transparent_proxying_">æ­£å?¨å¯¹å?ºäº?端å?£ç??é??æ??代ç??è¿?è¡?设置...</string>
-  <string name="bridge_error">ç½?æ¡¥é??误</string>
-  <string name="bridge_requires_ip">为äº?é??使ç?¨ç½?æ¡¥ï¼?å¿?é¡»è?³å°?è¾?å?¥ä¸?个ç½?æ¡¥ IP å?°å??ã??</string>
-  <string name="send_email_for_bridges">å¦?é??è?·å??ç½?æ¡¥å?°å??ï¼?请使ç?¨ gmail å??é??ç?µå­?é?®ä»¶è?³ bridges@xxxxxxxxxxxxxx 并å?¨æ­£æ??å??å¡«ä¸?â?? get bridgesâ??ã??</string>
-  <string name="error">é??误</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>
@@ -176,9 +70,7 @@ Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??
   <string name="use_only_these_specified_nodes">ä»?使ç?¨è¿?äº?æ??å®?è??ç?¹</string>
   <string name="bridges">ç½?æ¡¥</string>
   <string name="use_bridges">使��桥</string>
-  <string name="bridges_obfuscated">æ··æ·?ç½?æ¡¥</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">å·²é??ç½®ç??ç½?桥为混æ·?ç½?æ¡¥æ?¶å?¯ç?¨</string>
-  <string name="ip_address_and_port_of_bridges">ç½?æ¡¥ç?? IP å?°å??å??端å?£</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>
@@ -194,53 +86,27 @@ Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??
   <string name="reachable_ports">�访�端�</string>
   <string name="ports_reachable_behind_a_restrictive_firewall">é?²ç?«å¢?é??å®?ç??å?¯è®¿é?®ç«¯å?£</string>
   <string name="enter_ports">��端�</string>
-  <string name="enable_hidden_services">é??è??æ??å?¡ä¸»æ?º</string>
-  <string name="run_servers_accessible_via_the_tor_network">å??许设å¤?ä¸?ç??æ??å?¡å?¨å?¯é??è¿? Tor ç½?ç»?访é?®</string>
-  <string name="enter_localhost_ports_for_hidden_services">è¾?å?¥é??è??æ??å?¡ç??æ?¬å?°ä¸»æ?ºç«¯å?£</string>
-  <string name="hidden_service_ports">é??è??æ??å?¡ç«¯å?£</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">é??è??æ??å?¡ç??å?°å??ï¼?è?ªå?¨ç??æ??ï¼?</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">å?¯ç?¨è°?è¯?æ?¥å¿?è¾?å?ºï¼?å¿?须使ç?¨ adb æ?? aLongCat æ?¥ç??ï¼?</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">å?¯ç?¨è°?è¯?æ?¥å¿?è¾?å?ºï¼?å¿?须使ç?¨ adb æ?? aLongCat æ?¥ç??ï¼?</string>
   <string name="project_home">项�主页(s)�</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor 许��</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">第��软件�</string>
+    <string name="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="hidden_service_on">é??è??æ??å?¡ä½?äº?ï¼?</string>
-  <string name="unable_to_read_hidden_service_name">æ? æ³?读å??é??è??æ??å?¡å??称</string>
+    <string name="unable_to_read_hidden_service_name">æ? æ³?读å??é??è??æ??å?¡å??称</string>
   <string name="unable_to_start_tor">���� Tor�</string>
-  <string name="unable_to_reset_tor">é??æ?°å?¯å?¨æ?¨ç??设å¤?ï¼?æ? æ³?é??ç½® Torï¼?</string>
-  <string name="pref_use_sys_iptables_title">使��认 iptables </string>
-  <string name="pref_use_sys_iptables_summary">使ç?¨å??ç½®ç?? iptables ç¨?åº?æ?¿ä»£ Orbot ç»?å®?ç?? iptables </string>
-  <string name="error_installing_binares">æ? æ³?å®?è£?æ??æ?´æ?° Tor ç¨?åº?ã??</string>
-  <string name="pref_use_persistent_notifications">Orbot è¿?æ?¥å??å§?ç»?å?¨é??ç?¥æ ?æ?¾ç¤ºå?¾æ ?</string>
+    <string name="pref_use_persistent_notifications">Orbot è¿?æ?¥å??å§?ç»?å?¨é??ç?¥æ ?æ?¾ç¤ºå?¾æ ?</string>
   <string name="pref_use_persistent_notifications_title">å§?ç»?æ?¾ç¤ºé??ç?¥</string>
   <string name="pref_use_expanded_notifications">æ?¾ç¤ºæ?©å±?ç??é??ç?¥ï¼?æ??å?³ Tor å?ºå?£ç??å?½å®¶å?? IP</string>
   <string name="pref_use_expanded_notifications_title">æ?©å±?ç??é??ç?¥</string>
-  <string name="notification_using_bridges">已���桥�</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">语�</string>
-  <string name="set_locale_summary">é??æ?© Orbot ç??å?ºå??设置ä¸?语è¨?</string>
-  <string name="wizard_locale_title">é??æ?©è¯­è¨?</string>
-  <string name="wizard_locale_msg">ä¿?æ??é»?认æ??å??æ?¢ä¸ºå½?å??æ??ç?¨è¯­è¨?</string>
-  <string name="powered_by">ç?± Tor æ??ä¾?</string>
-  <string name="btn_save_settings">��设置</string>
-  <string name="no_internet_connection_tor">没æ??äº?è??ç½?è¿?æ?¥ï¼?Tor å¤?äº?å¾?æ?ºç?¶æ??â?¦</string>
-  <string name="bandwidth_">宽带é??度ï¼?</string>
-  <string name="down">��</string>
-  <string name="up">��</string>
-  <string name="pref_disable_network_title">�������</string>
+    <string name="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="menu_verify_browser">���</string>
-  <string name="menu_use_chatsecure">使� ChatSecure</string>
-  <string name="permission_manage_tor_label">管ç?? Tor</string>
-  <string name="permission_manage_tor_description">å?¯ç?¨è¯¥åº?ç?¨å?¯å¯¹ Tor æ??å?¡è¿?è¡?æ?§å?¶</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">没æ??ç½?ç»?è¿?æ?¥ï¼?让 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>
@@ -255,19 +121,7 @@ Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??
   <string name="pref_torrc_title">Torrc è?ªå®?ä¹?é??ç½®</string>
   <string name="pref_torrc_summary">ä»?ä¾?ä¸?家ï¼?ç?´æ?¥è¾?å?¥ torrc é??ç½®è¡?</string>
   <string name="pref_torrc_dialog">��� Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - ç¾?å?½äººæ??æ??件 App</string>
-  <string name="your_tor_public_ips_">æ?¨ç?? Tor å?¬ç½? IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">å¦?æ??æ?¨ä½¿ç?¨ Orbot é??å?°é?®é¢?ï¼?请å?¨ Android-&gt;设置-&gt;åº?ç?¨ 中ç¦?ç?¨æ?¬åº?ç?¨ï¼?</string>
-  <string name="app_conflict">����</string>
-  <string name="pref_transproxy_refresh_title">é??æ??代ç??è?ªå?¨å?·æ?°</string>
-  <string name="pref_transproxy_refresh_summary">å?¨ç½?ç»?ç?¶æ??æ?¹å??æ?¶é??æ?°åº?ç?¨é??æ??代ç??è§?å??</string>
-  <string name="pref_transproxy_flush_title">é??æ??代ç??强å?¶ç§»é?¤</string>
-  <string name="pref_transproxy_flush_summary">ç?¹æ??è¿?é??ç«?å?³å?·æ?°æ??æ??é??æ??代ç??ç??ç½?ç»?è§?å??</string>
-  <string name="transparent_proxy_rules_flushed_">é??æ??代ç??è§?å??å·²å?·æ?°ï¼?</string>
-  <string name="you_do_not_have_root_access_enabled">æ?¨è¿?没æ?? ROOT 访é?®æ??é??</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">æ?¨å?¯è?½é??è¦?å??止并é??æ?°å?¯å?¨ Orbot æ??è?½ä½¿è®¾ç½®æ?´æ?¹ç??æ??ã??</string>
-  <string name="menu_vpn">å?³è??ç??åº?ç?¨</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -283,9 +137,7 @@ Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??
   <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="install_orweb">�� Orfox</string>
-  <string name="standard_browser">æ ?å??ç??æµ?è§?å?¨</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注æ??ï¼?å?ªæ??æ ?å??ç?? Tor ç½?æ¡¥å?¯ä»¥å?¨ Intel X86/ATOM 设å¤?ä¸?å·¥ä½?</string>
-  <string name="save">ä¿?å­?</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/src/main/res/values-zh-rTW/poestrings.xml b/app/src/main/res/values-zh-rTW/poestrings.xml
index 5f6850d8..9c6d07da 100644
--- a/app/src/main/res/values-zh-rTW/poestrings.xml
+++ b/app/src/main/res/values-zh-rTW/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">\"æ©?æ?¥æ?¯ Tor 中繼ï¼?ç?¨æ?¼å??å?©å°?æ??網路審æ?¥ã??å¦?æ??ä½ ç?? ISP å°?é?? Tor ä¸?妨試試é??é??æ©?æ?¥é?£ä¸? Tor ; ä¸?å??種é¡?ç??æ©?æ?¥ä½¿ç?¨ä¸?å??ç??æ?¹æ³?
-        ä¾?躲é?¿å¯©æ?¥ï¼?å¦?æ??æ??å??æ?¹æ³?è¡?ä¸?é??ï¼?å?¯ä»¥è©¦è©¦å?¦ä¸?å??æ?¹æ³?ã??</string>
-
-    <string name="bridges_no">���: ���� Tor 網路</string>
-    <string name="bridges_provided">å·²æ??ä¾?ç??æ©?æ?¥: </string>
-    <string name="bridges_custom">����</string>
-
-    <string name="bridges_config">��設�</string>
-    <string name="action_done">å·²å®?æ??</string>
 
     <string name="bridges_sometimes">æ??æ??é??è¦?é??é??æ©?æ?¥å?¨ä¾?å??å¾? Tor</string>
     <string name="action_more">é?²ä¸?步說æ??</string>
@@ -17,19 +8,6 @@
     <string name="vpn_setup_sub">å®?ç?¡æ³?è®?ç?¨æ?¶å?¿å??ï¼?ä½?æ??å?©æ?¼é??é??é?²ç?«ç??</string>
     <string name="action_vpn_choose">é?¸æ??æ??ç?¨</string>
 
-    <string name="status_connected">已��!</string>
-
-    <string name="loading_claim_1">è±?å¯?å¤?樣ç??社群è®? Tor æ?´æ£?æ?´å¥½</string>
-    <string name="loading_claim_2">人å??æ¯?天å?©ç?¨ Tor ä¾?é?¿å??è¡?é?·å»£å??ç??追蹤</string>
-    <string name="loading_claim_3">ç?¶ Facebook 被å°?é??ï¼?使ç?¨è??å?©ç?¨ Tor ä¾?å??家人æ??å??ä¿?æ??è?¯ç¹«</string>
-    <string name="loading_claim_4">社é??人士使ç?¨ Tor è?ªç?±å?°å?¨ç¶²è·¯ä¸?ç?¼è¡¨æ??è¦?å??ç??念</string>
-    <string name="loading_claim_5">é?¨è?½å®¢ä½¿ç?¨ Tor è??å?¬æ°?ç?¾æ??å??社æ??æ?¹é?©</string>
-    <string name="loading_claim_6">æ?°è??è¨?è??å?©ç?¨ Tor å®?å?¨å?°èª¿æ?¥ä»?å??å ±å°?ç??æ??äº?</string>
-    <string name="loading_claim_7">å??人å?©ç?¨ Tor ä¾?ä¿?è­·å?¬å?¸ç­?ç?¥ç??æ©?å¯?</string>
-    <string name="loading_claim_8">工人使ç?¨ Tor ä¾?ç?­å??正義è??ä¸?å¿?æ?ºå¿?失å?»é£¯ç¢?</string>
-
-    <string name="status_connecting">We\'re connecting you.\" = \"We\'re connecting you.</string>
-
     <string name="hello">å??å??</string>
     <string name="welcome">æ­¡è¿?使ç?¨æ??æ©?ä¸?ç?? Tor</string>
 
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 0a7c4d03..3e0315ea 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2,138 +2,46 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot æ?¯ä¸?款å??è²»ç??網絡代ç??æ??ç?¨ç¨?å¼?ï¼?ç?¨ä¾?ä¿?è­·å?¶ä»?æ??ç?¨ç¨?å¼?ç??ä¸?網å®?å?¨ã??Orbot 使ç?¨ Tor å?¨å?¨ç??ä¸?ç³»å??ç??é?»è?¦é??è·³èº?ï¼?é??å?°å? å¯?並é?±è??網路æµ?é??ã??Tor æ?¯å??è?ªç?±è»?é«?ä¹?æ?¯å??é??æ?¾ç¶²è·¯ï¼?è?½å¹«æ?¨æ?µç¦¦æµ?é??å??æ??é??種網路ç?£æ?§æ¨¡å¼?ï¼?å®?å¨?è??å?°å??人ç??è?ªç?±è??é?±ç§?ã??å??業æ©?å¯?æ´»å??è??å??å??é??ä¿?ã??ç??è?³å¨?è??å??家å®?å?¨ã??</string>
-  <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
-  <string name="default_web_url">https://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">é??å§?å??å??æ­¢ Tor</string>
-  <string name="tor_proxy_service_process">Tor 代ç??æ??å??</string>
-  <string name="status_starting_up">Orbot æ­£å?¨å??å??中...</string>
+    <string name="status_starting_up">Orbot æ­£å?¨å??å??中...</string>
   <string name="status_activated">已��� Tor 網路</string>
   <string name="status_disabled">Orbot å·²å??ç?¨</string>
   <string name="status_shutting_down">Toræ??å?? æ­£å?¨é??é??</string>
   <string name="tor_process_starting">å??å??Tor ç?¨æ?¶ç«¯...</string>
   <string name="tor_process_complete">å®?æ??ã??</string>
-  <string name="tor_process_waiting">ç­?å¾?ã??</string>
-  <string name="not_anonymous_yet">è­¦å??ï¼?æ?¨ç??網路å°?æ?ªå?¿å??ï¼?è«?設å®?æ?¨ç??æ??ç?¨ç¨?å¼?使ç?¨ HTTP 代ç??伺æ??å?¨ 127.0.0.1:8118ï¼?æ??SOCKS4Aã??SOCKS5 代ç??伺æ??å?¨ 127.0.0.1:9050</string>
-  <string name="menu_home">��</string>
-  <string name="menu_browse">ç??覽</string>
-  <string name="menu_settings">設�</string>
+    <string name="menu_settings">設�</string>
   <string name="menu_log">è¨?é??æª?</string>
-  <string name="menu_info">說æ??</string>
-  <string name="menu_apps">æ??ç?¨ç¨?å¼?....</string>
-  <string name="menu_start">é??å§?</string>
+    <string name="menu_start">é??å§?</string>
   <string name="menu_stop">å??æ­¢</string>
   <string name="menu_about">é??æ?¼</string>
-  <string name="menu_promo_apps">å??å¾?æ??ç?¨ç¨?å¼?â?¦</string>
-  <string name="main_layout_download">��</string>
+    <string name="main_layout_download">��</string>
   <string name="main_layout_upload">��</string>
-  <string name="button_help">說æ??</string>
-  <string name="button_close">é??é??</string>
-  <string name="button_about">é??æ?¼</string>
-  <string name="button_clear_log">æ¸?é?¤è¨?é??æª?</string>
-  <string name="menu_verify">檢�</string>
-  <string name="menu_exit">é?¢é??</string>
+    <string name="button_about">é??æ?¼</string>
+    <string name="menu_exit">é?¢é??</string>
   <string name="menu_scan">æ??æ??網æ©? QR 碼</string>
   <string name="menu_share_bridge">å??享網æ©? QR 碼</string>
-  <string name="press_to_start">- è«?é?·æ??以é??å§? - </string>
-  <string name="pref_trans_proxy_group">é??é??å¼?代ç??伺æ??å?¨(é??è¦? Root)</string>
-  <string name="pref_trans_proxy_title">é??é??å¼?代ç??伺æ??å?¨</string>
-  <string name="pref_trans_proxy_summary">è?ªå??å??å?? Toræ?¼æ??ç?¨ç¨?å¼?</string>
-  <string name="pref_transparent_all_title">Tor æ??æ??æµ?é??</string>
-  <string name="pref_transparent_all_summary">æ??æ??æ??ç?¨ç¨?å¼?ç??é??é?? Tor 代ç??伺æ??å?¨</string>
-  <string name="pref_transparent_port_fallback_title">代ç??伺æ??å?¨å??ç?¨é?£æ?¥å? </string>
-  <string name="pref_transparent_port_fallback_summary">è­¦å??ï¼?é?¿å??常ç?¨ç??é?£æ?¥å? (80ã??443ç­?ç­?)ã??*å?ªå?¨*ã??æ??æ??ã??æ??æ?¯ã??Appã??模å¼?é?½å¤±æ??ç??æ??å??æ??使ç?¨ã??</string>
-  <string name="pref_transparent_port_title">�����</string>
-  <string name="pref_transparent_port_summary">代ç??伺æ??å?¨ç??é?£æ?¥å? æ¸?å?®ã?? *å?ªå?¨* ã??æ??æ??ã??æ??æ?¯ã??Appã??模å¼?é?½å¤±æ??ç??æ??å??æ??使ç?¨ã??</string>
-  <string name="pref_transparent_port_dialog">輸å?¥ä»£ç??å? </string>
-  <string name="pref_has_root">è«?æ±? Root å­?å??æ¬?</string>
-  <string name="pref_has_root_summary">ç?²é??é??å¼?代ç??è«?æ±? Root å­?å??æ¬?</string>
-  <string name="status_install_success">Tor äº?é?²å?¶æª?æ¡?å®?è£?æ??å??ï¼?</string>
-  <string name="status_install_fail">Torç??äº?é?²ä½?æª?æ¡?ç?¡æ³?å®?è£?ã??è«?檢å¯?æ?¥èª?並é??ç?¥tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">æ??ç?¨ç¨?å¼?é?¯èª¤</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">é??æ?¼ Orbot</string>
-  <string name="btn_next">å??é?²</string>
-  <string name="btn_back">è¿?å??</string>
-  <string name="btn_finish">çµ?æ??</string>
-  <string name="btn_okay">確�</string>
+    <string name="btn_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>
-  <string name="wizard_permissions_root">å·²å??å¾?æ¬?é??</string>
-  <string name="wizard_permissions_stock">Orbot æ¬?é??</string>
-  <string name="wizard_premissions_msg_root">太æ£?å?¦! æ??å??ç?¼ç?¾æ?¨æ??Rootæ¬?é??è?½çµ¦äº?Orbotã??æ??å??æ??æ??æ?ºç??使ç?¨é??å??æ¬?å??ã??</string>
-  <string name="wizard_permissions_msg_stock">å??管ä¸?æ?¯å¿?é ?ï¼?Orbotè?½è??ç?±Rootæ¬?é??è®?æ??æ?´æ??å??ç??å·¥å?·ã??æ?¯ç?¨ä¸?é?¢ç??æ??é??ä¾?å??許Orbotç??è¶?è?½å??!</string>
-  <string name="wizard_permissions_no_root">è?¥æ?¨æ²?æ??Rootæ¬?é??æ??ä¸?ç?¥æ??å??æ??說ç?ºä½?ï¼?é?£ç¢ºå®?æ??ç?¨ç¨?å¼?è?½å?¨Orbotä¸?é??è¡?å?³å?¯ã??</string>
-  <string name="wizard_permissions_consent">æ??æ??è??ä¸?æ??è¦?å?¨æ??é?¤è¶?ç´?ç?¨æ?¶ä¹?ä¸?ç¹¼çº?ã??</string>
-  <string name="wizard_permission_enable_root">å??許Orbotç??Root</string>
-  <string name="wizard_configure">çµ?æ?? Tor 網路</string>
-  <string name="wizard_configure_msg">Orbotè®?æ?¨æ±ºå®?è¦?å°?æ??æ??æ??å??æ?¯å??å?¥æ??ç?¨ç¨?å¼?ç??æµ?é??ç¶?é??Torè·¯ç?±ã??</string>
-  <string name="wizard_configure_all">æ??æ??æ??ç?¨ç¨?å¼?é?½é??é?? Tor 代ç??</string>
-  <string name="wizard_configure_select_apps">ç?ºToré?¸æ??å??å?¥ç??æ??ç?¨ç¨?å¼?</string>
-  <string name="wizard_tips_tricks">å??ç?¨Orbotç??ç¨?å¼?</string>
-  <string name="wizard_tips_msg">é??äº?æ??ç?¨ç¨?å¼?æ?¯ç?ºäº?Orboté??ç?¼ç??ã??ç?¾å?¨å°±æ??å®?è£?é??ï¼?æ??æ?¯å?¨Google Playã??GuardianProject.info網ç«?æ??é??é??F-Droid.orgæ?¾å®?å??ã??</string>
-  <string name="wizard_tips_otrchat">è??天å®?å?¨ - Androidç??å??æ??å®?å?¨å?³è¨?ç?¨æ?¶ç«¯</string>
-  <string name="wizard_tips_proxy">代ç??設å®? - å­¸ç¿?å¦?ä½?å°?設置æ??ç?¨ç¨?å¼?å?¨Orbotä¸?é??è¡?</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo æ??å°?å¼?æ??æ??ç?¨ç¨?å¼?</string>
-  <string name="wizard_tips_twitter">設å®?æ?¨ç?¹ä»£ç??以å?¥ä¸»ã??localhostã??å??8118å? </string>
-  <string name="wizard_tips_story_maker">StoryMaker - å®?å?¨ç??ç·¨æ??äº?並æ?¾å?°Tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">代ç??伺æ??å?¨è¨­å®?</string>
-  <string name="wizard_proxy_help_msg">è?¥æ?¨ä½¿ç?¨ç?? Android æ??ç?¨ç¨?å¼?æ?¯æ?´ HTTP æ?? SOCKS 代ç??ï¼?æ?¨ä¾¿è?½è¨­å®?å®?é?£æ?¥ Orbot 以使ç?¨ Tor 網路ã??\n\n\n主æ©?設å®?ç?º127.0.0.1æ?? localhostã??HTTP 代ç??ç??é?£æ?¥å? æ?¯ 8118ï¼?SOCKS代ç??ç??é?£æ?¥å? æ?¯ 9050ã??æ?¨æ??ç?¡é??使ç?¨SOCKS4Aæ??SOCKS5ã??\n\n\næ?¨å?¯ä»¥å?¨ FAQ 中深å?¥èª?è­? Android ç??代ç??設å®?: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbotæº?å??好äº?!</string>
-  <string name="wizard_final_msg">å?¨ç??æ?¸ç?¾è?¬äººå? ä¸?å??å??å? ä½¿ç?¨Torã??è¨?è??ã??é?¨è?½å®¢ã??人æ¬?鬥士ã??å?·æ³?人å?¡ã??士å?µã??ä¼?業ã??æ?´æ?¿ä¸?ç??å?¬æ°?ï¼?æ??å??å??æ?¯æ?®é??è??ç?¾å§?.....è??ç?¾å?¨æ?¨æº?å??好äº?ï¼?å¦?å??ä»?å??ä¸?樣!</string>
-  <string name="wizard_exit_at_first_screen_toast">è«?å?¨ä½¿ç?¨Orbotå??å??設å®?ï¼?æ?¹è?½é??å§?使ç?¨!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">æ?¨å·²æ??å??é?£çµ?è?³Tor網路 - ä½?é??ä¸?代表æ?¨ç??è£?ç½®æ?¯å®?å?¨ç??ã??æ?¨å?¯ä»¥ä½¿ç?¨ã??ç??覽å?¨ã??æ??é??ä¾?測試é?£çµ?ã??
-é??é?? https://guardianproject.info/apps/orbot é? è¨ªæ??å??ï¼?æ??å¯?ä¿¡è?³help@xxxxxxxxxxxxxxxxxxxx以學ç¿?æ?´å¤?ã??</string>
-  <string name="tor_check">é??樣æ??é??é??ç??覽å?¨æ??é??https://check.torproject.orgé?£æ?¥ï¼?以便檢æ?¥Orbotæ?¯å?¦é??置正確以å??è?½å?¦é??æ?¥å?°Torã;??</string>
-  <string name="pref_hs_group">é?±è??æ??管ç??æ??å??</string>
-  <string name="pref_general_group">��</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-->
-  <string name="wizard_title_msg">Orbot實ç?¾äº?Androidç??ç??Torï¼?\n\nTorè?½å¤ å¹«å?©ç?¨æ?¶æ?µç¦¦å¨?è??é?±ç§?ç??å??容é??濾ï¼?æµ?é??å??æ??ï¼?網絡é?µæ?§ï¼?æ©?å¯?ä¿¡æ?¯ä»¥å??è??å??人æ??é??ç??ä¿¡æ?¯ã??\n\n該å??å°?å°?幫å?©ä½ å?¨è¨­å??ä¸?é??ç½®Orbotå??Torã??</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">è­¦å??</string>
-  <string name="wizard_warning_msg">ç°¡å?®ç??å®?è£?Orbotä¸?æ??è?ªå??ç??é?±è??ä½ ç??網絡訪å??è¨?é??ã??\n\nä½ å¿?é ?é?©ç?¶ç??é??ç½®Orbotæ??è?½ä¿?è­?設å??å??å?¶ä¸?ç??æ??ç?¨è?½å¤ æ??å??ç??使ç?¨Torã??</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">æ¬?é??</string>
-  <string name="wizard_permissions_root_msg1">ä½ å?¯ä»¥æ??äº? Orbotï½¢è¶?ç´?ç?¨æ?¶ã??管ç??æ¬?é??ï¼?ä¾?ç?²å¾?ä¸?äº?é?²é??ç??å??è?½ï¼?å¦?é??é??å¼?代ç??ã??</string>
-  <string name="wizard_permissions_root_msg2">å¦?æ??ä½ ä¸?æ?³é??樣å??ï¼?è«?確èª?ä½ ç??æ??ç?¨ç¨?å¼?å?¯ä»¥è?? Orbot å??ä½?ã??</string>
-  <string name="wizard_permissions_no_root_msg">ä½ ç??è£?置似ä¹?æ?ªé??å?? root æ¬?é??ï¼?æ??è??å°?é??å??ç¨?å¼?ä¸?æ??ä¾? root æ?? Superuser æ¬?é??ã??
-è«?å??å?°ä¸»ç?«é?¢ï¼?æ?¹ç?¨ Apps 模å¼?ã??</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">æ?¯æ??Orbotç??æ??ç?¨</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: å®?å?¨ç??è??天ç¨?å¼?ï¼?使ç?¨ï½¢ä¸?ç??ç´?é??ï½£å? å¯?æ©?å?¶</string>
-  <string name="wizard_tips_orweb">Orfox: å? å¼·é?±ç§?ç??ç??覽å?¨ï¼?å?¯ä»¥ç¶?ç?± Tor ä¸?網</string>
-  <string name="wizard_tips_play">å?¨ Google Play å°?æ?¾æ??æ??ç?? Guardian Project æ??ç?¨ç¨?å¼?</string>
-  <string name="wizard_tips_fdroid">å?¨F-Droidä¸?æ?¥æ?¾æ??æ??ç??Guardian Projectæ??ç?¨ç¨?å¼?</string>
-  <string name="wizard_tips_fdroid_org">å?° https://f-droid.org å°?æ?¾ Guardian Project ç??æ??æ??æ??ç?¨ç¨?å¼?ã??</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">é??é??å¼?代ç??</string>
-  <string name="wizard_transproxy_msg">é??è®?ä½ ç??æ??æ??æ??ç?¨ç¨?å¼?è?ªå??ç¹?ç¶? Tor 網路ï¼?ä¸?é ?ä»»ä½?設å®?ã??</string>
-  <string name="wizard_transproxy_hint">ï¼?å??å¦?ä½ ä¸?ç?¥é??æ??å??å?¨èªªä»?麽ï¼?è«?é?¸ä¸­è©²é?¸æ??æ¡?ï¼?</string>
-  <string name="wizard_transproxy_none">ç?¡</string>
-  <string name="pref_transparent_tethering_title">Tor 網路å??享</string>
-  <string name="pref_transparent_tethering_summary">è®? Tor ç??é??æ??代ç??ä¹?é?©ç?¨å?°å¾? Wifi å?? USB å??享æ?¬æ©?網路ç??è£?ç½®(é??è¦?é??æ?°å??å??)</string>
-  <string name="button_grant_superuser">è¦?æ±? Superuser æ¬?é??</string>
-  <string name="pref_select_apps">é?¸æ??æ??ç?¨ç¨?å¼?</string>
-  <string name="pref_select_apps_summary">é?¸æ??è¦?ç¹?ç¶? Tor ç??æ??ç?¨ç¨?å¼?</string>
-  <string name="pref_node_configuration">��設�</string>
+    <!--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="button_proxy_all">å?¨å??代ç??</string>
-  <string name="button_proxy_none">ä¸?é?²è¡?代ç??</string>
-  <string name="button_invert_selection">å??å??é?¸æ??</string>
-  <string name="pref_proxy_title">å°?å¤?網路ç??代ç??伺æ??å?¨ (å?¯ä¸?設)</string>
+    <string name="pref_proxy_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>
@@ -149,20 +57,8 @@
   <string name="pref_proxy_password_title">å°?å¤?網路ç??代ç??伺æ??å?¨å¯?碼</string>
   <string name="pref_proxy_password_summary">代ç??伺æ??å?¨ç??å¯?碼ï¼?å¦?æ??æ??ï¼?</string>
   <string name="pref_proxy_password_dialog">å¾?å?§æµ?é??ç??代ç??伺æ??å?¨å¯?碼</string>
-  <string name="status">ç??æ??</string>
-  <string name="setting_up_full_transparent_proxying_">å?¨é?¢æ?§é??é??å¼?代ç??設置中...</string>
-  <string name="setting_up_app_based_transparent_proxying_">以å??å?¥æ??ç?¨ç¨?å¼?ç?ºå?ºç¤?ç??é??é??å¼?代ç??設å®?中...</string>
-  <string name="transparent_proxying_enabled">é??é??å¼?代ç??å·²å??ç?¨</string>
-  <string name="transproxy_enabled_for_tethering_">網路å??享ç??é??é??å¼?代ç??å·²å??ç?¨</string>
-  <string name="warning_error_starting_transparent_proxying_">è­¦å??ï¼?é??é??å¼?代ç??å??å??é?¯èª¤</string>
-  <string name="transproxy_rules_cleared">é??é??å¼?代ç??è¦?å??å·²æ¸?é?¤</string>
-  <string name="couldn_t_start_tor_process_">ç?¡æ³?å??å?? Tor ç¨?åº?</string>
-  <string name="privoxy_is_running_on_port_">Polipo é??è¡?å?¨é??è¨?å? ï¼?</string>
-  <string name="setting_up_port_based_transparent_proxying_">以é?£æ?¥å? ç?ºå?ºæº?ç??é??é??å¼?代ç??設å®?中...</string>
-  <string name="bridge_error">網��誤</string>
-  <string name="bridge_requires_ip">è?¥è¦?使ç?¨ç¶²æ©?å??è?½ï¼?æ?¨å¿?é ?輸å?¥è?³å°?ä¸?å??網æ©?ç?? IP ä½?å??ã??</string>
-  <string name="send_email_for_bridges">ç?¨ Gmail 帳æ?¶å¯?å°? email 給 bridges@xxxxxxxxxxxxxxï¼?å?§æ??å?ªè¦?寫ä¸?è¡?å­?ï¼?get bridges</string>
-  <string name="error">�誤</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>
@@ -175,10 +71,8 @@
   <string name="use_only_these_specified_nodes">ï½¢å?ªï½£ä½¿ç?¨é??äº?ç¯?é»?</string>
   <string name="bridges">網��Bridges�</string>
   <string name="use_bridges">使�網�</string>
-  <string name="bridges_obfuscated">模��網�</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">å??å??æ?¿ä»£ç??å?¥å?£ä¾?é?²å?¥ Tor 網路</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">å??ç?¨å®?ï¼?å¦?æ??æ?¨å°?使ç?¨ç??網æ©?æ?¯æ¨¡ç³?å¼?網æ©?ï¼?obfuscated bridgesï¼?</string>
-  <string name="ip_address_and_port_of_bridges">網æ©?ç?? IP ä½?å??è??é?£æ?¥å? </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>
@@ -194,17 +88,10 @@
   <string name="reachable_ports">å?¯å­?å??ç??é?£æ?¥å? </string>
   <string name="ports_reachable_behind_a_restrictive_firewall">é?²ç?«ç??容許å­?å??ç??é?£æ?¥å? </string>
   <string name="enter_ports">輸��</string>
-  <string name="enable_hidden_services">é?±è??æ??管ç??æ??å??</string>
-  <string name="run_servers_accessible_via_the_tor_network">è®?ä»?人è?½å¤ é??é?? Tor 網路ä¾?å­?å??æ?¨è£?ç½®ä¸?ç??伺æ??å?¨ </string>
-  <string name="enter_localhost_ports_for_hidden_services">輸å?¥çµ¦é?±è??æ??å??ç?¨ç??æ?¬å?°é?£æ?¥å? </string>
-  <string name="hidden_service_ports">é?±è??æ??å??ç??é?£æ?¥å? </string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">æ?¨ç??é?±è??æ??å??ç??ä½?å?? (è?ªå??ç?¢ç??)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">å??ç?¨é?¤é?¯æ?¥ä¸¦è¼¸å?º (å¿?é ?使ç?¨ adb æ?? aLogCat ä¾?檢è¦?)</string>
+    <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">å??ç?¨é?¤é?¯æ?¥ä¸¦è¼¸å?º (å¿?é ?使ç?¨ adb æ?? aLogCat ä¾?檢è¦?)</string>
   <string name="project_home">�����</string>
   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor ç??使ç?¨æ??æ¬?</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">第�����</string>
+    <string name="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>
@@ -213,37 +100,18 @@
   <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="hidden_service_on">é?±è??æ??å??å?¨ï¼?</string>
-  <string name="unable_to_read_hidden_service_name">ç?¡æ³?è®?å??é?±è??æ??å??ç??å??稱</string>
+    <string name="unable_to_read_hidden_service_name">ç?¡æ³?è®?å??é?±è??æ??å??ç??å??稱</string>
   <string name="unable_to_start_tor">ç?¡æ³?å??å?? Torï¼?</string>
-  <string name="unable_to_reset_tor">Tor ç?¡æ³?é??æ?°è¨­å®?ï¼?è«?å°?æ?¨ç??è£?ç½®é??é??æ©?ï¼?</string>
-  <string name="pref_use_sys_iptables_title">使ç?¨é ?設ç?? Iptables</string>
-  <string name="pref_use_sys_iptables_summary">使ç?¨ç³»çµ±å?§å»ºç?? iptables äº?é?²ä½?æª?ä¾?å??代 Orbot æ??é??ç??æ­¤æª?æ¡?</string>
-  <string name="error_installing_binares">Tor ç??äº?é?²ä½?æª?ç?¡æ³?å®?è£?æ??æ?´æ?°ã??</string>
-  <string name="pref_use_persistent_notifications">ç?¶ Orbot é?£ç·?æ??å??æ??ï¼?總æ?¯å?¨å·¥å?·å??顯示å®?ç??å??示</string>
+    <string name="pref_use_persistent_notifications">ç?¶ Orbot é?£ç·?æ??å??æ??ï¼?總æ?¯å?¨å·¥å?·å??顯示å®?ç??å??示</string>
   <string name="pref_use_persistent_notifications_title">總æ?¯é¡¯ç¤ºé?£ç·?é??ç?¥</string>
   <string name="pref_use_expanded_notifications">å?¨é??ç?¥ä¸­é¡¯ç¤º Tor å?ºå?£é»?ç??å??家å?? IP</string>
   <string name="pref_use_expanded_notifications_title">詳細ç??é??ç?¥</string>
-  <string name="notification_using_bridges">網æ©?å??ç?¨ï¼?</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">��</string>
-  <string name="set_locale_summary">é?¸æ?? Orbot ä»?é?¢ç??èª?è¨?</string>
-  <string name="wizard_locale_title">é?¸æ??èª?è¨?</string>
-  <string name="wizard_locale_msg">維æ??é ?設ï¼?æ??è??é?¸æ??å?¥ç??èª?è¨?</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">��設�</string>
-  <string name="no_internet_connection_tor">æ²?æ??網路é?£ç·?ï¼?Tor å¾?æ©?中 ...</string>
-  <string name="bandwidth_">頻寬</string>
-  <string name="down">��</string>
-  <string name="up">��</string>
-  <string name="pref_disable_network_title">ç?¡ç¶²è·¯æ??è?ªå??ä¼?ç? </string>
+    <string name="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="menu_verify_browser">ç??覽å?¨</string>
-  <string name="menu_use_chatsecure">使� ChatSecure</string>
-  <string name="permission_manage_tor_label">管ç?? Tor</string>
-  <string name="permission_manage_tor_description">å??ç?¨é??å??ç¨?å¼?以æ?§å?¶ Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot è?? Orfox Browserä¸?起使ç?¨å?¯ç?¼æ?®æ??大å??æ??ï¼?ç?¾å?¨è¦?å®?è£?å??ï¼?</string>
+    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot è?? Orfox Browserä¸?起使ç?¨å?¯ç?¼æ?®æ??大å??æ??ï¼?ç?¾å?¨è¦?å®?è£?å??ï¼?</string>
   <string name="install_apps_">å®?è£?ç??覽å?¨?</string>
   <string name="no_network_connectivity_putting_tor_to_sleep_">æ²?æ??網路é?£ç·?ã??æ­£å?¨å?« Tor ä¼?ç?  ...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">網路é?£ç·?è?¯å¥½ï¼?æ­£å?¨å??é?? Tor ...</string>
@@ -260,19 +128,7 @@
   <string name="pref_torrc_title">Torrc ��設置</string>
   <string name="pref_torrc_summary">å??é??å°?家ï¼?輸å?¥ torrc 設å®?æ??令</string>
   <string name="pref_torrc_dialog">�� Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">æ?¨ç?? Tor å°?å¤? IPsï¼?</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">è«?å?° Android 設å®?中強å?¶å??æ­¢æ?¬ç¨?å¼?ï¼?å¦?æ??æ?¨å?¨ä½¿ç?¨ Orbot æ??é??å?°é??äº?å??é¡?ï¼?</string>
-  <string name="app_conflict">æ??ç?¨ç¨?å¼?è¡?çª?</string>
-  <string name="pref_transproxy_refresh_title">é??é??å¼?代ç??è?ªå??æ?´æ?°</string>
-  <string name="pref_transproxy_refresh_summary">ç?¶ç¶²è·¯ç??æ??è®?å??æ??ï¼?è?ªå??é??æ?°è¼?å?¥é??é??å¼?代ç??è¦?å??</string>
-  <string name="pref_transproxy_flush_title">「強å?¶ç§»é?¤ã??é??é??å¼?代ç??</string>
-  <string name="pref_transproxy_flush_summary">æ??é??裡ä¾?ï½¢ç«?å?»ï½£æ¸?é?¤é??é??å¼?代ç??ç??è¦?å??</string>
-  <string name="transparent_proxy_rules_flushed_">é??é??å¼?代ç??è¦?å??æ¸?é?¤ï¼?</string>
-  <string name="you_do_not_have_root_access_enabled">æ?¨å°?æ?ªå??ç?¨ ROOT æ¬?é??</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">æ?¨å?¯è?½é??è¦?å??æ­¢ç?¶å¾?å??å??å?? Orbotï¼?æ??è?½è®?æ?¹è®?ç??設å®?ç??æ??ã??</string>
-  <string name="menu_vpn">æ??ç?¨ç¨?å¼?</string>
-  <string name="kbps">kbps</string>
+    <string name="kbps">kbps</string>
   <string name="mbps">mbps</string>
   <string name="kb">KB</string>
   <string name="mb">MB</string>
@@ -285,19 +141,15 @@
   <string name="get_bridges_web">Web</string>
   <string name="activate">å??ç?¨</string>
   <string name="apps_mode">VPN 模�</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">å?¯ä»¥ç?¨å?§å»ºç??  Orbot VPN è®? app ä¾?èµ° Tor  網路 \n\n å®?é??ç?¡æ³?è®?ç?¨æ?¶å?¿å??,ä½?æ??å?©æ?¼é??é??é?²ç?«ç??</string>
-  <string name="send_email">å¯?é??é?»å­?信件</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="install_orweb">�� Orfox</string>
-  <string name="standard_browser">æ¨?æº?ç??ç??覽å?¨</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">註ï¼?å?ªæ??é??ä½?å?¨ Intel X86/ATOM æ©?å?¨ä¸?ç?? Tor 網æ©?æ??è?½ä½¿ç?¨ã??</string>
-  <string name="vpn_default_world">å?¨å??(è?ªå??)</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="ports">å? </string>
-  <string name="local_port">��端�</string>
+    <string name="local_port">��端�</string>
   <string name="onion_port">��端�</string>
   <string name="name">å??稱</string>
   <string name="done">å·²å®?æ??!</string>
@@ -310,9 +162,7 @@
   <string name="backup_restored">å??份已é??å??</string>
   <string name="filemanager_not_available">æª?æ¡?管ç??å?¡ä¸?å?¯ç?¨</string>
   <string name="please_grant_permissions_for_external_storage">è«?æ??æ¬?å¤?æ?¥å?²å­?å?¨ä½¿ç?¨</string>
-  <string name="permission_granted">å·²å??å¾?æ¬?é??</string>
-  <string name="permission_denied">æ¬?é??é?­æ??</string>
-  <string name="restore_backup">é??å??å??份</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>
@@ -346,10 +196,8 @@
 ��: auto</string>
   <string name="pref_reduced_connection_padding">�����護</string>
   <string name="pref_reduced_connection_padding_summary">é??é??中繼é?£æ?¥ä¸¦å?³é??å°?æ?¸ä¿?è­·å°?å??ä¾?æ¸?å°?è³?æ??å??é?»æ± ç??ç?¨é??</string>
-  <string name="please_enable_vpn">è«?æ¿?æ´» VPN 模å¼?好è®?æ??ç?¨å?¯å??å?? Tor</string>
-  <string name="app_shortcuts">Tor æ?¯æ??ç??æ??ç?¨</string>
-  <string name="title_activity_bridge_wizard">BridgeWizardActivity</string>
-  <string name="testing_bridges">測試����� Tor</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>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 76e060dc..d5c86e36 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -2,13 +2,7 @@
 
 <resources>
 
-	<string-array name="bridge_options">
-	    <item>@string/default_bridges</item>
-	    <item>@string/cloud_tunnel</item>
-	    <item>@string/get_new_bridges</item>
-	    <item></item>
-	</string-array>
-	<string-array name="array_hs_types">
+    <string-array name="array_hs_types">
 		<item>@string/user_services</item>
 		<item>@string/app_services</item>
 	</string-array>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index af92426f..e0e3dc24 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,5 @@
 
     <resources>
-        <color name="panel_background">#ffffff</color>
-        <color name="panel_background_dark">#efefef</color>
         <color name="panel_background_main">#efefef</color>
         <color name="bright_green">#ccff2a</color>
         <color name="dark_green">#669901</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index c719a5be..c1ac42e8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -18,137 +18,82 @@
 -->
 <resources>
     <!-- The width that is used when creating thumbnails of applications. -->
-    <dimen name="thumbnail_width">164dp</dimen>
     <!-- The height that is used when creating thumbnails of applications. -->
-    <dimen name="thumbnail_height">145dp</dimen>
     <!-- The standard size (both width and height) of an application icon that
          will be displayed in the app launcher and elsewhere. -->
-    <dimen name="app_icon_size">48dip</dimen>
     <!-- The maximum number of action buttons that should be permitted within
          an action bar/action mode. This will be used to determine how many
          showAsAction="ifRoom" items can fit. "always" items can override this. -->
-    <integer name="max_action_buttons">2</integer>
-    <dimen name="toast_y_offset">64dip</dimen>
     <!-- Height of the status bar -->
-    <dimen name="status_bar_height">25dip</dimen>
     <!-- Height of the bottom navigation / system bar. -->
-    <dimen name="navigation_bar_height">48dp</dimen>
     <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
-    <dimen name="navigation_bar_height_landscape">48dp</dimen>
     <!-- Width of the navigation bar when it is placed vertically on the screen -->
-    <dimen name="navigation_bar_width">42dp</dimen>
     <!-- Height of notification icons in the status bar -->
-    <dimen name="status_bar_icon_size">24dip</dimen>
     <!-- Size of the giant number (unread count) in the notifications -->
-    <dimen name="status_bar_content_number_size">48sp</dimen>
     <!-- Height of the system bar (combined status & navigation); used by
          SystemUI internally, not respected by the window manager. -->
-    <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen>
     <!-- Height of notification icons in the system bar -->
-    <dimen name="system_bar_icon_size">32dip</dimen>
     <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
-    <dimen name="status_bar_edge_ignore">5dp</dimen>
 
     <!-- Minimum size of the fastscroll overlay -->
-    <dimen name="fastscroll_overlay_size">104dp</dimen>
     <!-- Text size of the fastscroll overlay -->
-    <dimen name="fastscroll_overlay_text_size">52sp</dimen>
     <!-- Padding of the fastscroll overlay -->
-    <dimen name="fastscroll_overlay_padding">16dp</dimen>
     <!-- Width of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_width">64dp</dimen>
     <!-- Height of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_height">52dp</dimen>
     <!-- Min width for a tablet device -->
-    <dimen name="min_xlarge_screen_width">800dp</dimen>
 
     <!-- Default height of a key in the password keyboard for alpha (used by keyguard) -->
-    <dimen name="password_keyboard_key_height_alpha">56dip</dimen>
     <!-- Default height of a key in the password keyboard for numeric (used by keyguard) -->
-    <dimen name="password_keyboard_key_height_numeric">56dip</dimen>
     <!-- Default correction for the space key in the password keyboard  (used by keyguard) -->
-    <dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen>
     <!-- Default horizontal gap between keys in the password keyboard (used by keyguard) -->
-    <dimen name="password_keyboard_horizontalGap">3dip</dimen>
     <!-- Default vertical gap between keys in the password keyboard (used by keyguard) -->
-    <dimen name="password_keyboard_verticalGap">9dip</dimen>
 
     <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>
 
     <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
-    <dimen name="glowpadview_target_placement_radius">135dip</dimen>
 
     <!-- Default glow radius for GlowPadView -->
-    <dimen name="glowpadview_glow_radius">75dip</dimen>
 
     <!-- Default distance beyond which GlowPadView snaps to the matching target -->
-    <dimen name="glowpadview_snap_margin">40dip</dimen>
 
     <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
-    <dimen name="glowpadview_inner_radius">15dip</dimen>
 
     <!-- Preference activity side margins -->
-    <dimen name="preference_screen_side_margin">0dp</dimen>
     <!-- Preference activity side margins negative-->
-    <dimen name="preference_screen_side_margin_negative">0dp</dimen>
     <!-- Preference activity top margin -->
-    <dimen name="preference_screen_top_margin">0dp</dimen>
     <!-- Preference activity bottom margin -->
-    <dimen name="preference_screen_bottom_margin">0dp</dimen>
     <!-- Preference widget area width (to the left of the text) -->
-    <dimen name="preference_widget_width">48dp</dimen>
     <!-- Preference fragment padding, bottom -->
-    <dimen name="preference_fragment_padding_bottom">0dp</dimen>
     <!-- Preference fragment padding, sides -->
-    <dimen name="preference_fragment_padding_side">16dp</dimen>
     <!-- Weight of the left pane in a multi-pane preference layout. -->
-    <integer name="preferences_left_pane_weight">4</integer>
     <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
-    <integer name="preferences_right_pane_weight">6</integer>
     <!-- Padding to the left of the preference panel breadcrumb -->
-    <dimen name="preference_breadcrumb_paddingLeft">0dp</dimen>
     <!-- Padding to the right of the preference panel breadcrumb -->
-    <dimen name="preference_breadcrumb_paddingRight">0dp</dimen>
     <!-- Minimum space to allocate to the left of a preference item for an icon.
         This helps in aligning titles when some items have icons and some don't. When space is
         at a premium, we don't pre-allocate any space. -->
-    <dimen name="preference_icon_minWidth">0dp</dimen>
     <!-- The platform's desired minimum size for a dialog's width when it
          is along the major axis (that is the screen is landscape).  This may
          be either a fraction or a dimension. -->
-    <item name="dialog_min_width_major" type="dimen">65%</item>
 
     <!-- The platform's desired fixed width for a dialog along the major axis
          (the screen is in landscape). This may be either a fraction or a dimension.-->
-    <item name="dialog_fixed_width_major" type="dimen">320dp</item>
     <!-- The platform's desired fixed width for a dialog along the minor axis
          (the screen is in portrait). This may be either a fraction or a dimension.-->
-    <item name="dialog_fixed_width_minor" type="dimen">320dp</item>
     <!-- The platform's desired fixed height for a dialog along the major axis
          (the screen is in portrait). This may be either a fraction or a dimension.-->
-    <item name="dialog_fixed_height_major" type="dimen">80%</item>
     <!-- The platform's desired fixed height for a dialog along the minor axis
          (the screen is in landscape). This may be either a fraction or a dimension.-->
-    <item name="dialog_fixed_height_minor" type="dimen">100%</item>
 
     <!-- Preference activity, vertical padding for the header list -->
-    <dimen name="preference_screen_header_vertical_padding">0dp</dimen>
 
-    <dimen name="preference_screen_header_padding_side">16dip</dimen>
-    <integer name="preference_screen_header_scrollbarStyle">0x02000000
-    </integer> <!-- outsideOverlay -->
+    <!-- outsideOverlay -->
 
-    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
-
-    <dimen name="preference_item_padding_side">8dip</dimen>
-    <dimen name="preference_item_padding_inner">8dip</dimen>
-    <dimen name="preference_child_padding_side">16dip</dimen>
+    <!-- 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. -->
-    <item name="dialog_min_width_minor" type="dimen">95%</item>
 
     <!-- The width of the big icons in notifications. -->
     <dimen name="notification_large_icon_width">64dp</dimen>
@@ -156,208 +101,139 @@
     <dimen name="notification_large_icon_height">64dp</dimen>
 
     <!-- Minimum width of the search view text entry area. -->
-    <dimen name="search_view_text_min_width">160dip</dimen>
 
     <!-- Preferred width of the search view. -->
-    <dimen name="search_view_preferred_width">320dip</dimen>
 
     <!-- Dialog title height -->
-    <dimen name="alert_dialog_title_height">64dip</dimen>
     <!-- Dialog button bar height -->
-    <dimen name="alert_dialog_button_bar_height">48dip</dimen>
 
     <!-- Default height of an action bar. -->
-    <dimen name="action_bar_default_height">48dip</dimen>
     <!-- Vertical padding around action bar icons. -->
-    <dimen name="action_bar_icon_vertical_padding">8dip</dimen>
     <!-- Text size for action bar titles -->
-    <dimen name="action_bar_title_text_size">18dp</dimen>
     <!-- Text size for action bar subtitles -->
-    <dimen name="action_bar_subtitle_text_size">14dp</dimen>
     <!-- Top margin for action bar subtitles -->
-    <dimen name="action_bar_subtitle_top_margin">-3dp</dimen>
     <!-- Bottom margin for action bar subtitles -->
-    <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen>
 
     <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
-    <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen>
 
     <!-- Size of status line font on Unsecure unlock LockScreen. -->
-    <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen>
 
     <!-- Size of right margin on Unsecure unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen>
 
     <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen>
 
     <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen>
 
     <!-- Padding on left margin of PIN text entry field to center it when del button is showing -->
-    <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen>
 
     <!-- Height of FaceUnlock view in keyguard -->
-    <dimen name="face_unlock_height">330dip</dimen>
 
     <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->
-    <dimen name="activity_chooser_popup_min_width">200dip</dimen>
 
     <!-- The default gap between components in a layout. -->
-    <dimen name="default_gap">8dip</dimen>
 
     <!-- Text padding for dropdown items -->
-    <dimen name="dropdownitem_text_padding_left">8dip</dimen>
 
     <!-- Text padding for dropdown items -->
-    <dimen name="dropdownitem_text_padding_right">8dip</dimen>
 
     <!-- Width of the icon in a dropdown list -->
-    <dimen name="dropdownitem_icon_width">32dip</dimen>
 
     <!-- Default width for a textview error popup -->
-    <dimen name="textview_error_popup_default_width">240dip</dimen>
 
     <!-- Volume panel y offset -->
-    <dimen name="volume_panel_top">80dp</dimen>
 
     <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
-    <dimen name="default_app_widget_padding_left">8dp</dimen>
-    <dimen name="default_app_widget_padding_top">8dp</dimen>
-    <dimen name="default_app_widget_padding_right">8dp</dimen>
-    <dimen name="default_app_widget_padding_bottom">8dp</dimen>
 
     <!-- Minimum width for an action button in the menu area of an action bar -->
-    <dimen name="action_button_min_width">56dip</dimen>
 
     <!-- Maximum height for a stacked tab bar as part of an action bar -->
-    <dimen name="action_bar_stacked_max_height">48dp</dimen>
 
     <!-- Maximum width for a stacked action bar tab. This prevents
          action bar tabs from becoming too wide on a wide screen when only
          a few are present. -->
-    <dimen name="action_bar_stacked_tab_max_width">180dp</dimen>
 
     <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->
-    <dimen name="notification_text_size">14dp</dimen>
     <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
-    <dimen name="notification_title_text_size">18dp</dimen>
     <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
     <dimen name="notification_subtext_size">12dp</dimen>
 
     <!-- Keyguard dimensions -->
     <!-- TEMP -->
-    <dimen name="kg_security_panel_height">600dp</dimen>
 
     <!-- Height of security view in keyguard. -->
-    <dimen name="kg_security_view_height">480dp</dimen>
 
     <!-- Width of widget view in keyguard. -->
-    <dimen name="kg_widget_view_width">0dp</dimen>
 
     <!-- Height of widget view in keyguard. -->
-    <dimen name="kg_widget_view_height">0dp</dimen>
 
     <!-- Size of the clock font in keyguard's status view -->
-    <dimen name="kg_status_clock_font_size">75dp</dimen>
 
     <!-- Size of the date font in keyguard's status view  -->
-    <dimen name="kg_status_date_font_size">15dp</dimen>
 
     <!-- Size of the generic status lines keyguard's status view  -->
-    <dimen name="kg_status_line_font_size">13dp</dimen>
 
     <!-- Size of margin on the right of keyguard's status view -->
-    <dimen name="kg_status_line_font_right_margin">16dp</dimen>
 
     <!-- Top margin for the clock view -->
-    <dimen name="kg_clock_top_margin">-16dp</dimen>
 
     <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
-    <dimen name="kg_key_horizontal_gap">0dp</dimen>
 
     <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
-    <dimen name="kg_key_vertical_gap">0dp</dimen>
 
     <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
-    <dimen name="kg_pin_key_height">60dp</dimen>
 
     <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->
-    <dimen name="kg_secure_padding_height">46dp</dimen>
 
     <!-- The height of the runway lights strip -->
-    <dimen name="kg_runway_lights_height">7dp</dimen>
 
     <!-- The height of the runway lights strip -->
-    <dimen name="kg_runway_lights_vertical_padding">2dp</dimen>
 
     <!-- Horizontal padding for the widget pager -->
-    <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen>
 
     <!-- Top padding for the widget pager -->
-    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
 
     <!-- Bottom padding for the widget pager -->
-    <dimen name="kg_widget_pager_bottom_padding">64dp</dimen>
 
     <!-- Top margin for the runway lights. We add a negative margin in large
         devices to account for the widget pager padding -->
-    <dimen name="kg_runway_lights_top_margin">0dp</dimen>
 
     <!-- Touch slop for the global toggle accessibility gesture -->
-    <dimen name="accessibility_touch_slop">80dip</dimen>
 
     <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
-    <dimen name="keyguard_security_width">320dp</dimen>
 
     <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
-    <dimen name="keyguard_security_height">400dp</dimen>
 
     <!-- Margin around the various security views -->
-    <dimen name="keyguard_security_view_margin">8dp</dimen>
 
     <!-- Margin around the various security views -->
-    <dimen name="keyguard_muliuser_selector_margin">8dp</dimen>
 
     <!-- Stroke width of the frame for the circular avatars. -->
-    <dimen name="keyguard_avatar_frame_stroke_width">2dp</dimen>
 
     <!-- Shadow radius under the frame for the circular avatars. -->
-    <dimen name="keyguard_avatar_frame_shadow_radius">1dp</dimen>
 
     <!-- Size of the avator on hte multiuser lockscreen. -->
-    <dimen name="keyguard_avatar_size">66dp</dimen>
 
     <!-- Size of the text under the avator on the multiuser lockscreen. -->
-    <dimen name="keyguard_avatar_name_size">10sp</dimen>
 
     <!-- Size of the region along the edge of the screen that will accept
          swipes to scroll the widget area. -->
-    <dimen name="kg_edge_swipe_region_size">24dp</dimen>
 
     <!-- If the height if keyguard drops below this threshold (most likely
     due to the appearance of the IME), then drop the multiuser selector. -->
-    <dimen name="kg_squashed_layout_threshold">600dp</dimen>
 
     <!-- The height of widgets which do not support vertical resizing. This is only
     used on tablets; on phones, this size is determined by the space left by the
     security mode. -->
-    <dimen name="kg_small_widget_height">160dp</dimen>
 
     <!-- Rounded corner radius for video subtitles. -->
-    <dimen name="subtitle_corner_radius">2dp</dimen>
 
     <!-- Shadow radius for video subtitles. -->
-    <dimen name="subtitle_shadow_radius">2dp</dimen>
 
     <!-- Shadow offset for video subtitles. -->
-    <dimen name="subtitle_shadow_offset">2dp</dimen>
 
     <!-- Outline width for video subtitles. -->
-    <dimen name="subtitle_outline_width">2dp</dimen>
 
     <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
-    <dimen name="immersive_mode_cling_width">-1px</dimen>
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
index 247d8776..a6b3daec 100644
--- a/app/src/main/res/values/ic_launcher_background.xml
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_launcher_background">#E7275A</color>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/poestrings.xml b/app/src/main/res/values/poestrings.xml
index a899df70..af8d5580 100644
--- a/app/src/main/res/values/poestrings.xml
+++ b/app/src/main/res/values/poestrings.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="bridges_desc">"Bridges are Tor relays that help circumvent censorship. You can try bridges if Tor is blocked by your ISP; each type of bridge uses a different method
-        to avoid censorship: if one type does not work, try using a different one.</string>
-
-    <string name="bridges_no">"No Bridges: Directly Connect to Tor"</string>
-    <string name="bridges_provided">"Provided Bridges: "</string>
-    <string name="bridges_custom">"Custom Bridges"</string>
-
-    <string name="bridges_config">"Bridge Configuration"</string>
-    <string name="action_done">"Done"</string>
 
     <string name="bridges_sometimes">"Sometimes you need a bridge to get to Tor."</string>
     <string name="action_more">"TELL ME MORE"</string>
@@ -17,19 +8,6 @@
     <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="status_connected">"Connected!"</string>
-
-    <string name="loading_claim_1">"Our diverse community is what makes Tor great!"</string>
-    <string name="loading_claim_2">"Everyday people use Tor to avoid being followed by marketing ads."</string>
-    <string name="loading_claim_3">"When Facebook is blocked, people use Tor to connect to their friends and family."</string>
-    <string name="loading_claim_4">"Activists use Tor to freely tweet their opinions and beliefs."</string>
-    <string name="loading_claim_5">"Bloggers use Tor to rally people toward social reform."</string>
-    <string name="loading_claim_6">"Journalists use Tor to securely investigate stories they are reporting on."</string>
-    <string name="loading_claim_7">"Business people use Tor to keep their company strategies private."</string>
-    <string name="loading_claim_8">"Workers use Tor to fight for justice without fear of losing their job."</string>
-
-    <string name="status_connecting">"We're connecting you." = "We're connecting you."</string>
-
     <string name="hello">"Hello"</string>
     <string name="welcome">"Welcome to Tor on mobile."</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5a3730ed..9ae73c04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,125 +2,38 @@
 <resources>
     <string name="app_name">Orbot</string>
     <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string>
-    <string name="internal_web_url">http://orbot/</string>
-    <string name="default_web_url">http://check.torproject.org</string>
-    <string name="secure_default_web_url">https://check.torproject.org</string>
-    <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-    <string name="control_permission_label">start and stop Tor</string>
-    <string name="tor_proxy_service_process">torproxyservice</string>
     <string name="status_starting_up">Orbot is starting&#8230;</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&#8230;</string>
     <string name="tor_process_complete">complete.</string>
-    <string name="tor_process_waiting">waiting.</string>
-    <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-    <string name="menu_home">Home</string>
-    <string name="menu_browse">Browse</string>
     <string name="menu_settings">Settings</string>
     <string name="menu_log">Log</string>
-    <string name="menu_info">Help</string>
-    <string name="menu_apps">Apps...</string>
     <string name="menu_start">Start</string>
     <string name="menu_stop">Stop</string>
     <string name="menu_about">About</string>
-    <string name="menu_promo_apps">Get appsâ?¦</string>
     <string name="main_layout_download">Download</string>
     <string name="main_layout_upload">Upload</string>
-    <string name="button_help">Help</string>
-    <string name="button_close">Close</string>
     <string name="button_about">About</string>
-    <string name="button_clear_log">Clear Log</string>
-    <string name="menu_verify">Check</string>
     <string name="menu_exit">Exit</string>
     <string name="menu_scan">Scan BridgeQR</string>
     <string name="menu_share_bridge">Share BridgeQR</string>
-    <string name="press_to_start">- long press to start -</string>
-    <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-    <string name="pref_trans_proxy_title">Transparent Proxying</string>
-    <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-    <string name="pref_transparent_all_title">Tor Everything</string>
-    <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-    <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-    <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-    <string name="pref_transparent_port_title">Port List</string>
-    <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-    <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-    <string name="pref_has_root">Request Root Access</string>
-    <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-    <string name="status_install_success">Tor binaries successfully installed!</string>
-    <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants@xxxxxxxxxxxxxx</string>
-    <string name="title_error">Application Error</string>
-    <string name="wizard_title">Orbot</string>
-    <string name="wizard_btn_tell_me_more">About Orbot</string>
-    <string name="btn_next">Next</string>
-    <string name="btn_back">Back</string>
-    <string name="btn_finish">Finish</string>
     <string name="btn_okay">Okay</string>
     <string name="btn_cancel">Cancel</string>
     <!--Welcome Wizard strings (DJH)-->
     <string name="wizard_details">Some Orbot Details</string>
     <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, 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>
-    <string name="wizard_permissions_root">Permission Granted</string>
-    <string name="wizard_permissions_stock">Orbot Permissions</string>
-    <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
-    <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
-    <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-    <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
-    <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
-    <string name="wizard_configure">Configure Torification</string>
-    <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
-    <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
-    <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
-    <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-    <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
-    <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string>
-    <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-    <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
-    <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string>
-    <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string>
-    <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-    <string name="wizard_proxy_help_info">Proxy Settings</string>
-    <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
-    <string name="wizard_final">Orbot is ready!</string>
-    <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens&#8230; and now you are ready to, as well!</string>
-    <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
     <!--END Welcome Wizard strings (DJH)-->
-    <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Browser\' button to test your connection. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-    <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-    <string name="pref_hs_group">Hidden Service Hosting</string>
     <string name="pref_general_group">General</string>
     <string name="pref_start_boot_title">Start Orbot on Boot</string>
     <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
     <!--New Wizard Strings-->
     <!--Title Screen-->
-    <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
     <!--Warning screen-->
-    <string name="wizard_warning_title">Warning</string>
-    <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
     <!--Permissions screen-->
-    <string name="wizard_permissions_title">Permissions</string>
-    <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-    <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-    <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string>
     <!--TipsAndTricks screen-->
-    <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-    <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string>
-    <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string>
-    <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
-    <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string>
-    <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string>
     <!--Transparent Proxy screen-->
-    <string name="wizard_transproxy_title">Transparent Proxying</string>
-    <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-    <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-    <string name="wizard_transproxy_none">None</string>
-    <string name="pref_transparent_tethering_title">Tor Tethering</string>
-    <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wi-Fi and USB Tethered Devices (requires restart)</string>
-    <string name="button_grant_superuser">Request Superuser Access</string>
-    <string name="pref_select_apps">Select Apps</string>
-    <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
     <string name="pref_node_configuration">Node Configuration</string>
     <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
     <string name="pref_entrance_node">Entrance Nodes</string>
@@ -129,10 +42,6 @@
     <string name="pref_allow_background_starts_title">Allow Background Starts</string>
     <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string>
 
-    <string name="button_proxy_all">Proxy All</string>
-    <string name="button_proxy_none">Proxy None</string>
-    <string name="button_invert_selection">Invert Selection</string>
-
     <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
 
     <string name="pref_proxy_type_title">Outbound Proxy Type</string>
@@ -156,19 +65,7 @@
     <string name="pref_proxy_password_dialog">Enter Proxy Password</string>
 
 
-    <string name="status">Status</string>
-    <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying&#8230;</string>
-    <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying&#8230;</string>
-    <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-    <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-    <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-    <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
     <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-    <string name="privoxy_is_running_on_port_">Polipo is running on port: </string>
-    <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying&#8230;</string>
-    <string name="bridge_error">Bridge Error</string>
-    <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-    <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
     <string name="error">Error</string>
     <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
     <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
@@ -182,9 +79,7 @@
     <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
     <string name="bridges">Bridges</string>
     <string name="use_bridges">Use Bridges</string>
-    <string name="bridges_obfuscated">Obfuscated Bridges</string>
     <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrances into the Tor Network</string>
-    <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
     <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
     <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
     <string name="relays">Relays</string>
@@ -201,16 +96,9 @@
     <string name="reachable_ports">Reachable ports</string>
     <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
     <string name="enter_ports">Enter ports</string>
-    <string name="enable_hidden_services">Hidden Service Hosting</string>
-    <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
-    <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-    <string name="hidden_service_ports">Hidden Service Ports</string>
-    <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
     <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Enable debug log to output (must use adb or aLogcat to view)</string>
     <string name="project_home">Project Home(s): </string>
     <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-    <string name="the_tor_license">The Tor License</string>
-    <string name="https_torproject_org">https://torproject.org</string>
     <string name="third_party_software">3rd-Party-Software: </string>
     <string name="tor_version">Tor: https://www.torproject.org</string>
     <string name="libevent_version">LibEvent: http://www.monkey.org/~provos/libevent/</string>
@@ -220,14 +108,8 @@
     <string name="hidden_service_request">An app wants to open hidden 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&#8230;</string>
     <string name="something_bad_happened">Something bad happened. Check the log</string>
-    <string name="hidden_service_on">hidden service on:</string>
     <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
     <string name="unable_to_start_tor">Unable to start Tor:</string>
-    <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string>
-    <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-    <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-
-    <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
 
     <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
     <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
@@ -235,27 +117,15 @@
     <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string>
     <string name="pref_use_expanded_notifications_title">Expanded Notifications</string>
 
-    <string name="notification_using_bridges">Bridges enabled!</string>
     <string name="set_locale_title">Language</string>
-    <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-    <string name="wizard_locale_title">Choose Language</string>
-    <string name="wizard_locale_msg">Leave default or switch the current language</string>
-    <string name="powered_by">powered by Tor</string>
-    <string name="btn_save_settings">Save Settings</string>
     <string name="no_internet_connection_tor">No internet connection; Tor is on standbyâ?¦</string>
-    <string name="bandwidth_">Bandwidth:</string>
-    <string name="down">down</string>
-    <string name="up">up</string>
     <string name="pref_disable_network_title">No Network Auto-Sleep</string>
     <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string>
     <string name="newnym">You\'ve switched to a new Tor identity!</string>
 
-    <string name="menu_verify_browser">Browser</string>
-  <string name="pref_open_proxy_on_all_interfaces_title">Open Proxy on All Interfaces</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="permission_manage_tor_label">Manage Tor</string>
-    <string name="permission_manage_tor_description">Enable this app to control the Tor service</string>
     <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orbot works best with Orfox Browser. Install now?</string>
     <string name="install_apps_">Install browser?</string>
     <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleepâ?¦</string>
@@ -280,22 +150,6 @@
     <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string>
     <string name="pref_torrc_dialog">Custom Torrc</string>
 
-    <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-    <string name="your_tor_public_ips_">Your Tor Public IPs:</string>
-    <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string>
-    <string name="app_conflict">App Conflict</string>
-
-
-    <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string>
-    <string name="pref_transproxy_refresh_summary">Re-apply Transproxy rules when the network state changes</string>
-
-    <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string>
-    <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string>
-    <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string>
-    <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string>
-    <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string>
-
-    <string name="menu_vpn">Apps</string>
 
     <string name="kbps">kbps</string>
 
@@ -322,24 +176,17 @@
 
     <string name="apps_mode">VPN Mode</string>
 
-    <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable apps to go through Tor using the built-in Orbot VPN.\n\nThis won\'t make you anonymous, but it will help get through firewalls.</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 &amp; paste it into the \"Bridges\" preference in Orbot\'s settings and restart.</string>
 
     <string name="install_orweb">Install Orfox</string>
 
-    <string name="standard_browser">Standard Browser</string>
-
-    <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string>
-
     <string name="vpn_default_world">Global (Auto)</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">Save</string>
-    <string name="ports">Ports</string>
     <string name="local_port">Local Port</string>
     <string name="onion_port">Onion Port</string>
     <string name="name">Name</string>
@@ -353,8 +200,6 @@
     <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="permission_granted">Permission granted</string>
-    <string name="permission_denied">Permission denied</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>
@@ -392,9 +237,7 @@
     <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="please_enable_vpn">Please activate the VPN mode to enable apps to use Tor</string>
     <string name="app_shortcuts">Tor-Enabled Apps</string>
-    <string name="title_activity_bridge_wizard">BridgeWizardActivity</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>
@@ -408,12 +251,6 @@
 
     <string name="menu_new_identity">New Identity</string>
 
-    <string name="use_system_default">Use System Default</string>
-
-    <string name="default_bridges">Default Bridges (Obfs4)</string>
-    <string name="cloud_tunnel">Cloud Tunneling</string>
-    <string name="get_new_bridges">Get New Bridges...</string>
-
     <string name="user_services">User services</string>
     <string name="app_services">App services</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6089ad7e..b2e69a53 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
-
-    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
-
     <style name="DefaultTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="DefaultTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
diff --git a/orbotservice/src/main/res/drawable-hdpi-v11/inverse.png b/orbotservice/src/main/res/drawable-hdpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi-v11/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-hdpi-v9/inverse.png b/orbotservice/src/main/res/drawable-hdpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi-v9/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-hdpi/ic_action_settings.png
deleted file mode 100644
index d57b2905..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png b/orbotservice/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png
deleted file mode 100644
index 6ae7ac8a..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi/ic_autorenew_black_36dp.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index e9954eb7..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-hdpi/inverse.png b/orbotservice/src/main/res/drawable-hdpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-hdpi/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v11/inverse.png b/orbotservice/src/main/res/drawable-ldpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi-v11/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-ldpi-v9/inverse.png b/orbotservice/src/main/res/drawable-ldpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi-v9/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-ldpi/ic_action_settings.png
deleted file mode 100644
index c3927fd7..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi/ic_action_settings.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/ic_launcher.png b/orbotservice/src/main/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index dd665db2..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-ldpi/inverse.png b/orbotservice/src/main/res/drawable-ldpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-ldpi/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v11/inverse.png b/orbotservice/src/main/res/drawable-mdpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi-v11/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-mdpi-v9/inverse.png b/orbotservice/src/main/res/drawable-mdpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi-v9/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-mdpi/ic_action_settings.png
deleted file mode 100644
index d90f1255..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index e45ce29a..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-mdpi/inverse.png b/orbotservice/src/main/res/drawable-mdpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-mdpi/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v11/inverse.png b/orbotservice/src/main/res/drawable-xhdpi-v11/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi-v11/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi-v9/inverse.png b/orbotservice/src/main/res/drawable-xhdpi-v9/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi-v9/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_action_settings.png b/orbotservice/src/main/res/drawable-xhdpi/ic_action_settings.png
deleted file mode 100644
index f2572c84..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-xhdpi/ic_launcher.png
deleted file mode 100644
index 13ee02bc..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xhdpi/inverse.png b/orbotservice/src/main/res/drawable-xhdpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-xhdpi/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-xxhdpi/ic_launcher.png
deleted file mode 100644
index c2f2f45d..00000000
Binary files a/orbotservice/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xxhdpi/inverse.png b/orbotservice/src/main/res/drawable-xxhdpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-xxhdpi/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi/ic_launcher.png b/orbotservice/src/main/res/drawable-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 74a31304..00000000
Binary files a/orbotservice/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable-xxxhdpi/inverse.png b/orbotservice/src/main/res/drawable-xxxhdpi/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable-xxxhdpi/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/layout/layout_notification_expanded.xml b/orbotservice/src/main/res/layout/layout_notification_expanded.xml
deleted file mode 100644
index 0afa156b..00000000
--- a/orbotservice/src/main/res/layout/layout_notification_expanded.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android";
-    xmlns:internal="http://schemas.android.com/apk/prv/res/android";
-    android:id="@+id/status_bar_latest_event_content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/dark_purple"
-    >
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="fill_vertical"
-        android:minHeight="@dimen/notification_large_icon_height"
-        android:orientation="vertical"
-        android:padding="12dp"
-        android:gravity="top"
-        >
-        <LinearLayout
-            android:id="@+id/line1"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingTop="6dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:orientation="horizontal"
-            >
-            <ImageView
-                android:layout_width="20dp"
-                android:layout_height="20dp"
-                android:src="@drawable/ic_stat_tor"
-                />
-            <TextView android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:layout_weight="1"
-                android:textStyle="bold"
-                android:textColor="@android:color/white"
-                android:layout_marginStart="6dp"
-                android:layout_marginLeft="6dp"
-                android:layout_gravity="center_vertical"
-                android:text="@string/app_name"
-                />
-            
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/line3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"       
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            >
-            <TextView android:id="@+id/text"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_gravity="center"
-                android:singleLine="true"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:textColor="@android:color/white"
-                />
-            <TextView android:id="@+id/info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="0"
-                android:singleLine="true"
-                android:gravity="center"
-                android:paddingStart="8dp"
-                android:paddingLeft="8dp"
-                />
-            <ImageView
-                android:id="@+id/action_refresh"
-                android:layout_width="32dp"
-                android:layout_height="32dp"
-                android:src="@drawable/ic_refresh_white_24dp" />
-        </LinearLayout>
-        <TextView android:id="@+id/text2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-2dp"
-            android:layout_marginBottom="-2dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginLeft="8dp"
-            android:fadingEdge="horizontal"
-            android:textColor="@android:color/white"
-            />
-    </LinearLayout>
-</FrameLayout>
diff --git a/orbotservice/src/main/res/raw/pluto.properties b/orbotservice/src/main/res/raw/pluto.properties
deleted file mode 100644
index 74c03077..00000000
--- a/orbotservice/src/main/res/raw/pluto.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-obfs2=obfsclient
-obfs3=obfsclient
-scramblesuit=obfsclient
diff --git a/orbotservice/src/main/res/values-ach/strings.xml b/orbotservice/src/main/res/values-ach/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-ach/strings.xml
+++ b/orbotservice/src/main/res/values-ach/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ar/strings.xml b/orbotservice/src/main/res/values-ar/strings.xml
index 0b2a1f63..a9762839 100644
--- a/orbotservice/src/main/res/values-ar/strings.xml
+++ b/orbotservice/src/main/res/values-ar/strings.xml
@@ -2,261 +2,30 @@
 <resources>
   <string name="app_name">اÙ?ربÙ?ت</string>
   <string name="app_description">اÙ?ربÙ?ت Ù?Ù? تطبÙ?Ù? اÙ?Ù?Ù?Ù?Ù?-اÙ?برÙ?Ù?سÙ? اÙ?حر اÙ?Ø°Ù? Ù?Ù?Ù?Ù?Ù? تطبÙ?Ù?ات أخرÙ? Ù?استخداÙ? اÙ?Ø¥Ù?ترÙ?ت بأÙ?اÙ? Ø£Ù?ثر . Ù?Ù?ستخدÙ? اÙ?ربÙ?ت تÙ?ر Ù?تشÙ?Ù?ر تحرÙ?ات Ù?رÙ?رÙ? عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت Ø? Ø«Ù? Ù?Ø®Ù?Ù?Ù? Ù?Ù?جعÙ?Ù? Ù?Ù?Ù?Ù? Ù?Ù? Ø®Ù?اÙ? سÙ?سÙ?Ø© Ù?Ù? أجÙ?زة اÙ?Ù?Ù?بÙ?Ù?تر Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? . تÙ?ر Ù?Ù? تطبÙ?Ù? حر Ù?شبÙ?Ø© Ù?Ù?تÙ?حة Ù?اÙ?تÙ? تساعدÙ? عÙ?Ù? Ø­Ù?اÙ?Ø© Ù?Ù?سÙ? Ù?Ù? Ù?راÙ?بة اÙ?شبÙ?ات اÙ?تÙ? تÙ?دد اÙ?حرÙ?Ø© اÙ?شخصÙ?Ø© Ù?اÙ?خصÙ?صÙ?Ø© Ø? Ù?اÙ?Ø£Ù?شطة اÙ?تجارÙ?Ø© اÙ?سرÙ?Ø© Ù?اÙ?عÙ?اÙ?ات Ø? Ù?Ø£Ù?Ù? اÙ?دÙ?Ù?Ø© Ù?اÙ?Ø­Ù?Ù?Ù?ات اÙ?Ù?Ù?عÙ?Ù?Ø© Ù?اÙ?تÙ? تستخدÙ? Ù?اÙ?عرÙ? باسÙ? تحÙ?Ù?Ù? حرÙ?Ø© Ù?رÙ?ر اÙ?بÙ?اÙ?ات .</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ù?عÙ? Ù? اÙ?Ù?Ù? تÙ?ر</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">جارÙ? تشغÙ?Ù? اÙ?ربÙ?ت...</string>
+    <string name="status_starting_up">جارÙ? تشغÙ?Ù? اÙ?ربÙ?ت...</string>
   <string name="status_activated">Ù?تصÙ? بشبÙ?Ø© تÙ?ر</string>
   <string name="status_disabled">تÙ? Ø¥Ù?Ù?اÙ? اÙ?ربÙ?ت</string>
   <string name="status_shutting_down">جارÙ? اÙ?Ù?اÙ? خدÙ?Ø© تÙ?ر</string>
   <string name="tor_process_starting">جارÙ? تشغÙ?Ù? تÙ?ر...</string>
   <string name="tor_process_complete">Ù?اÙ?Ù?.</string>
-  <string name="tor_process_waiting">اÙ?تظار.</string>
-  <string name="not_anonymous_yet">تحذÙ?ر: حرÙ?Ø© Ù?رÙ?رÙ? Ù?Ù?ست Ø®Ù?Ù?Ø© حتÙ? اÙ?Ø¢Ù?! Ù?Ù? Ù?ضÙ?Ù? Ù?Ù? بتÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات اÙ?خاصة بÙ? Ù?إستخداÙ? برÙ?Ù?سÙ? HTTP 127.0.0.1:8118 Ø£Ù? SOCK4A Ø£Ù? SOKS5 127.0.0.1:9050</string>
-  <string name="menu_home">اÙ?Ù?ائÙ?Ø© اÙ?رئÙ?سÙ?Ø©</string>
-  <string name="menu_browse">تصÙ?Ù?Ø­</string>
-  <string name="menu_settings">إعدادات</string>
-  <string name="menu_log">اÙ?سجÙ?</string>
-  <string name="menu_info">Ù?ساعدة</string>
-  <string name="menu_apps">Ù?Ù? بÙ? اÙ? شبÙ?Ø© Ù?Ù?Ù?Ù?Ø© خاصة</string>
-  <string name="menu_start">بدء</string>
-  <string name="menu_stop">تÙ?Ù?Ù?</string>
-  <string name="menu_about">Ø­Ù?Ù?</string>
-  <string name="menu_promo_apps">Ø­Ù?Ù? اÙ?تطبÙ?Ù? ...</string>
-  <string name="main_layout_download">تحÙ?Ù?Ù?</string>
-  <string name="main_layout_upload">رÙ?ع</string>
-  <string name="button_help">Ù?ساعدة</string>
-  <string name="button_close">إغÙ?اÙ?</string>
-  <string name="button_about">Ø­Ù?Ù?</string>
-  <string name="button_clear_log">Ù?سح اÙ?سجÙ?</string>
-  <string name="menu_verify">تحÙ?Ù?</string>
-  <string name="menu_exit">خرÙ?ج</string>
-  <string name="menu_scan">Ù?حص QR اÙ?جسر</string>
-  <string name="menu_share_bridge">Ù?شارÙ?Ø© QR اÙ?جسر</string>
-  <string name="press_to_start">- اضغط Ù?Ù?ترة Ø·Ù?Ù?Ù?Ø© Ù?Ù?بدء -</string>
-  <string name="pref_trans_proxy_group">برÙ?Ù?سÙ? ضÙ?Ù?Ù? (Ù?تطÙ?ب اذÙ? حساب رÙ?Ù?ت)</string>
-  <string name="pref_trans_proxy_title">برÙ?Ù?سÙ? ضÙ?Ù?Ù?</string>
-  <string name="pref_trans_proxy_summary">عÙ?Ù?Ù?Ø© تÙ?رÙ?Ù?اÙ? Ø£Ù?تÙ?Ù?اتÙ?Ù?Ù?Ø© Ù?Ù?تطبÙ?Ù?ات</string>
-  <string name="pref_transparent_all_title">استخدÙ? تÙ?ر Ù?ع جÙ?Ù?ع اÙ?تطبÙ?Ù?ات</string>
-  <string name="pref_transparent_all_summary">Ù?رر Ù?Ù? بÙ?اÙ?ات اÙ?Ù?رÙ?ر اÙ?خاصة باÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
-  <string name="pref_transparent_port_fallback_title">تراجع Ù?Ù?Ù?Ø° اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_transparent_port_fallback_summary">تحذÙ?ر: تتحاÙ?Ù? عÙ?Ù? اÙ?Ù?Ù?اÙ?Ø° اÙ?شائعة  (80, 443, Ø¥Ù?Ù? آخرÙ?) *استخدÙ? Ù?Ù?Ø·* إذا Ù?اÙ? Ù?ضع \'Ù?Ù?\' Ø£Ù? \'اÙ?تطبÙ?Ù?\' Ù?ا Ù?عÙ?Ù?.</string>
-  <string name="pref_transparent_port_title">Ù?ائÙ?Ø© اÙ?Ù?Ù?اÙ?Ø°</string>
-  <string name="pref_transparent_port_summary">Ù?ائÙ?Ø© بجÙ?Ù?ع اÙ?Ù?Ù?اÙ?Ø° Ø¥Ù?Ù? اÙ?برÙ?Ù?سÙ?. *استخدÙ? Ù?Ù?Ø·* إذا Ù?اÙ? Ù?ضع \'Ù?Ù?\' Ø£Ù? \'اÙ?تطبÙ?Ù?\' Ù?ا Ù?عÙ?Ù?.</string>
-  <string name="pref_transparent_port_dialog">ادخÙ? اÙ?Ù?Ù?اÙ?Ø° Ù?Ù?برÙ?Ù?سÙ?</string>
-  <string name="pref_has_root">اطÙ?ب إذÙ? رÙ?Ù?ت</string>
-  <string name="pref_has_root_summary">اطÙ?ب إذÙ? رÙ?Ù?ت Ù?تÙ?عÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?</string>
-  <string name="status_install_success">تÙ? تثبÙ?ت تÙ?ر بÙ?جاح!</string>
-  <string name="status_install_fail">غÙ?ر Ù?ادر عÙ?Ù? تثبÙ?ت Ù?Ù?Ù?ات تÙ?ر. Ù?رجÙ? Ù?راجعة اÙ?سجÙ? Ù?إعÙ?اÙ?Ù?ا عÙ?Ù? اÙ?برÙ?د اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù? tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">خطأ Ù?Ù? اÙ?تطبÙ?Ù?</string>
-  <string name="wizard_title">اÙ?ربÙ?ت</string>
-  <string name="wizard_btn_tell_me_more">عÙ? اÙ?ربÙ?ت</string>
-  <string name="btn_next">اÙ?تاÙ?Ù?</string>
-  <string name="btn_back">رجÙ?ع</string>
-  <string name="btn_finish">Ø¥Ù?Ù?اء</string>
-  <string name="btn_okay">Ù?Ù?اÙ?Ù?</string>
-  <string name="btn_cancel">Ø¥Ù?غاء</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">بعض اÙ?تÙ?اصÙ?Ù? عÙ? اÙ?ربÙ?ت</string>
-  <string name="wizard_details_msg">اÙ?ربÙ?ت تطبÙ?Ù? Ù?Ù?تÙ?Ø­ اÙ?Ù?صدر Ù?حتÙ?Ù?Ù? تÙ?رØ? \"Ù?Ù?ب اÙ?Ù?ت\" Ù? \"بÙ?Ù?Ù?بÙ?\". 
-Ù?Ù?Ù? Ù?Ù?Ù?ر اÙ?Ù?Ù?Ù?Ù?-اÙ?برÙ?Ù?سÙ? اÙ?Ù?Ø­Ù?Ù? HTTP (8118) Ù?Ù?Ù?Ù?Ù? SOCKS (9050) Ù?Ù? شبÙ?Ø© تÙ?ر. 
- اÙ?ربÙ?ت Ø£Ù?ضا Ù?ادر عÙ?Ù? اÙ?Ù?صÙ?Ù? Ù?جذÙ?ر اÙ?جÙ?از Ø? Ù?إرساÙ? Ù?Ù? تحرÙ?ات اÙ?Ø¥Ù?ترÙ?ت Ù?Ù? Ø®Ù?اÙ?Ù?.</string>
-  <string name="wizard_permissions_root">تÙ? Ù?Ù?Ø­ اÙ?إذÙ?</string>
-  <string name="wizard_permissions_stock">أذÙ?Ù?ات اÙ?ربÙ?ت</string>
-  <string name="wizard_premissions_msg_root">Ù?Ù?تاز! Ù?Ù?د Ù?جدÙ?ا بأÙ?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ù?تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت. سÙ?Ù? Ù?ستخدÙ? Ù?Ø°Ù? اÙ?سÙ?طة بحÙ?Ù?Ø©.</string>
-  <string name="wizard_permissions_msg_stock">رغÙ? Ø£Ù?Ù? Ù?Ù?س ضرÙ?رÙ?اØ? Ù?Ù?Ù?Ù? اÙ? Ù?صبح Ø£Ù?ربÙ?ت أداة Ù?Ù?Ù?Ø© إذا Ù?اÙ? Ù?دÙ? جÙ?ازÙ? صÙ?احÙ?Ø© حساب رÙ?Ù?ت. استخدÙ? اÙ?زر باÙ?أسÙ?Ù? Ù?Ù?Ù?Ø­ اÙ?ربÙ?ت Ù?Ù?Ø© Ø£Ù?بر!</string>
-  <string name="wizard_permissions_no_root">إذا Ù?Ù? Ù?Ù?Ù? Ù?دÙ?Ù? صÙ?احÙ?Ø© حساب رÙ?Ù?ت Ø£Ù? Ù?Ù?ست Ù?دÙ?Ù? أدÙ?Ù? Ù?Ù?رة عÙ?ا Ù?تحدث عÙ?Ù?Ø? تأÙ?د Ù?Ù?Ø· Ù?Ù? استخداÙ? تطبÙ?Ù?ات تعÙ?Ù? Ù?ع اÙ?ربÙ?ت.</string>
-  <string name="wizard_permissions_consent">Ø£Ù?Ù?Ù? Ø°Ù?Ù? Ù?Ø£Ù?د Ø£Ù? أستÙ?ر بدÙ?Ù? صÙ?احÙ?ات حساب رÙ?Ù?ت</string>
-  <string name="wizard_permission_enable_root">اÙ?Ù?Ø­ اÙ?ربÙ?ت صÙ?احÙ?Ø© حساب رÙ?Ù?ت</string>
-  <string name="wizard_configure">تÙ?Ù?Ù?Ù? تÙ?رÙ?Ù?اÙ?</string>
-  <string name="wizard_configure_msg">اÙ?ربÙ?ت Ù?عطÙ?Ù? اÙ?Ø®Ù?ار Ù?تÙ?جÙ?Ù? جÙ?Ù?ع حرÙ?ات Ù?رÙ?ر اÙ?تطبÙ?Ù?ات عبر تÙ?ر اÙ? Ù?إختÙ?ار اÙ?تطبÙ?Ù?ات بشÙ?Ù? Ù?ردÙ?.</string>
-  <string name="wizard_configure_all">Ù?رر جÙ?Ù?ع اÙ?تطبÙ?Ù?ات عبر تÙ?ر</string>
-  <string name="wizard_configure_select_apps">اختر اÙ?تطبÙ?Ù?ات اÙ?Ù?ردÙ?Ø© Ù?تÙ?ر</string>
-  <string name="wizard_tips_tricks">تطبÙ?Ù?ات Ù?Ù?Ù?ئة Ù?اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_msg">اÙ?تطبÙ?Ù?ات اÙ?تاÙ?Ù?Ø© تÙ? تطÙ?Ù?رÙ?ا حتÙ? تعÙ?Ù? Ù?ع اÙ?ربÙ?ت. اضغط عÙ?Ù? Ù?ا ترÙ?د تثبÙ?تة عÙ?Ù? جÙ?ازÙ? اÙ?Ø£Ù?, Ø£Ù? Ù?Ù?Ù?Ù?Ù? اÙ? تجدÙ?Ù? Ù?احÙ?اÙ? عÙ?Ù? جÙ?جÙ? بÙ?اÙ?, Ø£Ù? عÙ?Ù? Ù?Ù?Ù?عÙ?ا GuardianProject.info Ø£Ù? Ù?Ù? Ø®Ù?اÙ? F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">اÙ?دردشة اÙ?Ø¢Ù?Ù?Ø© - تأÙ?Ù?Ù? اÙ?رسائÙ? اÙ?Ù?Ù?رÙ?Ø© Ù?Ù?ستخدÙ?Ù? اÙ?اÙ?درÙ?Ù?د</string>
-  <string name="wizard_tips_proxy">إعدادات اÙ?برÙ?Ù?سÙ? - تعÙ?Ù? Ù?Ù?Ù?Ù?Ø© تÙ?Ù?Ù?Ù? اÙ?تطبÙ?Ù?ات Ù?تعÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_duckgo">تطبÙ?Ù? Ù?حرÙ? اÙ?بحث DuckDuckGo</string>
-  <string name="wizard_tips_twitter">اضبط اÙ?برÙ?Ù?سÙ? اÙ?خاص بتÙ?Ù?تر Ø¥Ù?Ù? Ù?ستضÙ?Ù? \"localhost\" Ù? اÙ?Ù?Ù?Ù?Ø° Ø¥Ù?Ù? 8118</string>
-  <string name="wizard_tips_story_maker">صاÙ?ع اÙ?Ù?صة - اصÙ?ع Ù?صة Ù?اترÙ?Ù?ا Ù?Ø£Ù?اÙ? تÙ?ر !</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">إعدادات اÙ?برÙ?Ù?سÙ?</string>
-  <string name="wizard_proxy_help_msg">إذا Ù?اÙ? تطبÙ?Ù? اÙ?اÙ?درÙ?Ù?د اÙ?Ø°Ù? تستخدÙ?Ù? Ù?دعÙ? استخداÙ? Ù?Ù?Ù?Ù? - برÙ?Ù?سÙ?HTTP Ø£Ù? SOCKS  إذاÙ? Ù?Ù?Ù?Ù?Ù? تÙ?Ù?Ù?Ù?Ù? Ù?Ù?اتصاÙ? باÙ?ربÙ?ت Ù?استخداÙ? تÙ?ر.  إعدادات اÙ?Ù?ضÙ?Ù? 127.0.0.1 Ø£Ù? \"Ù?ضÙ?Ù?\". Ù? HTTPØ? إعداد اÙ?Ù?Ù?Ù?Ø° Ù?Ù? 8118. Ù?SOCKSØ? اÙ?Ù?Ù?Ù?Ù? Ù?Ù? 9050. Ù?جب عÙ?Ù?Ù? استخداÙ? SOCKS4A Ø£Ù? SOCKS5 إذا Ø£Ù?Ù?Ù? \ N \ N \ N \ N Ù?Ù?Ù?Ù?Ù? Ù?عرÙ?Ø© اÙ?Ù?زÙ?د Ø­Ù?Ù? Ø¥Ù?شاء اÙ?Ù?Ù?Ù?اء عÙ?Ù? اÙ?رÙ?بÙ?ت Ù?Ù? Ø®Ù?اÙ? اÙ?تعÙ?Ù?Ù?ات عÙ?Ù?: 
-HTTP: / /tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">اÙ?ربÙ?ت جاÙ?ز Ù?Ù?استخداÙ?!</string>
-  <string name="wizard_final_msg">اÙ?Ù?Ù?اÙ?Ù?Ù? Ù?Ù? اÙ?Ù?اس Ù?Ù? جÙ?Ù?ع Ø£Ù?حاء اÙ?عاÙ?Ù? تستخدÙ? تÙ?ر Ù?Ù?جÙ?Ù?عة Ù?اسعة Ù?Ù? اÙ?أسباب . اÙ?صحÙ?Ù?Ù?Ù? Ù?اÙ?Ù?دÙ?Ù?Ù?Ù? , اÙ?Ù?داÙ?عÙ?Ù? عÙ? Ø­Ù?Ù?Ù? اÙ?Ø¥Ù?ساÙ? Ø? Ù?ضباط تÙ?Ù?Ù?Ø° اÙ?Ù?اÙ?Ù?Ù? Ø? Ù?اÙ?جÙ?Ù?د Ø? Ù?اÙ?شرÙ?ات Ù?اÙ?Ù?Ù?اطÙ?Ù?Ù? Ù?Ù? اÙ?Ø£Ù?ظÙ?Ø© اÙ?Ù?Ù?عÙ?Ø© Ø? Ù?اÙ?ضاÙ? اÙ?Ù?Ù?اطÙ?Ù?Ù? اÙ?عادÙ?Ù?Ù? ... Ù?اÙ?Ø¢Ù? Ù?Ù? Ø£Ù?ت جاÙ?ز Ø? Ù?Ù?ا بÙ?ا !</string>
-  <string name="wizard_exit_at_first_screen_toast">Ù?رجÙ? تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?اعدادÙ? Ù?تستطÙ?ع اÙ?بدء بإستخداÙ?Ù? !</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ù?دÙ?Ù? اتصاÙ? Ù?اجح بشبÙ?Ø© تÙ?ر - Ù?Ù?Ù?Ù? Ù?ذا Ù?ا Ù?عÙ?Ù? Ø£Ù? جÙ?ازÙ? Ø¢Ù?Ù? . Ù?Ù?Ù?Ù?Ù? استخداÙ? زر \"Ù?تصÙ?Ø­\" Ù?اختبار اتصاÙ?Ù? .
-  زرÙ?ا عÙ?Ù? https://guardianproject.info/apps/orbot Ø£Ù? ارسÙ? برÙ?د اÙ?Ù?ترÙ?Ù?Ù? اÙ?Ù? help@xxxxxxxxxxxxxxxxxxxx  Ù?Ù?عرÙ?Ø© اÙ?Ù?زÙ?د.</string>
-  <string name="tor_check">سÙ?ؤدÙ? Ù?ذا Ø¥Ù?Ù? Ù?تح اÙ?Ù?تصÙ?Ø­ اÙ?خاص بÙ? Ù?زÙ?ارة عÙ?Ù?اÙ? https://check.torproject.org Ù?Ù? اجÙ? اÙ?تحÙ?Ù? إذا Ù?اÙ? تÙ?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?عÙ?Ù? بشÙ?Ù? صحÙ?Ø­ اÙ? Ù?ا Ù?بأÙ?Ù? Ù?تصÙ? بتÙ?ر.</string>
-  <string name="pref_hs_group">استضاÙ?Ø© اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="pref_general_group">عاÙ?</string>
-  <string name="pref_start_boot_title">شغÙ? اÙ?ربÙ?ت عÙ?د Ù?تح اÙ?جÙ?از</string>
-  <string name="pref_start_boot_summary">Ù?عÙ? اÙ?ربÙ?ت Ù? اتصÙ? بتÙ?ر تÙ?Ù?ائÙ?اÙ? عÙ?دÙ?ا Ù?بدء جÙ?از اÙ?Ø£Ù?درÙ?Ù?د اÙ?خاص بÙ? باÙ?عÙ?Ù?</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">اÙ?ربت Ù?جعÙ? تÙ?ر Ù?Ù?Ù?Ù?اÙ? عÙ?Ù? Ù?ظاÙ? اÙ?Ø£Ù?درÙ?Ù?د. Ù?ساعدÙ? تÙ?ر Ù?Ù? اÙ?دÙ?اع ضد عÙ?Ù?Ù?Ø© ترشÙ?Ø­ اÙ?Ù?حتÙ?Ù?ات, تحÙ?Ù?Ù? Ù?سارات اÙ?Ù?رÙ?ر, Ù?Ù?راÙ?بة اÙ?شبÙ?Ø© Ù?اÙ?تÙ? تÙ?دد خصÙ?صÙ?تÙ?, اÙ?Ù?عÙ?Ù?Ù?ات اÙ?سرÙ?Ø© Ù?اÙ?عÙ?اÙ?ات اÙ?شخصÙ?Ø©. Ù?Ø°Ù? اÙ?أداة ستساعدÙ? Ù?Ù? تÙ?Ù?ئة اÙ?ربت Ù?ع تÙ?ر عÙ?Ù? جÙ?ازÙ?</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">تحذÙ?ر</string>
-  <string name="wizard_warning_msg">Ù?Ù? Ù?Ù?Ù?Ù? اÙ?ربت بأخÙ?اء Ù?Ù?Ù?Ø© Ù?سارÙ? بشÙ?Ù? اÙ?تÙ?Ù?اتÙ?Ù?Ù? اÙ? Ø¢Ù?Ù? بÙ?جرد تÙ?صÙ?بÙ?. بÙ? Ù?جب عÙ?Ù?Ù? اÙ? تÙ?Ù?Ù? بتÙ?Ù?ئتÙ? Ù?ع جÙ?ازÙ? باÙ?أضاÙ?Ø© اÙ?Ù? تÙ?Ù?ئة تطبÙ?Ù?ات اخرÙ? Ù?تستطÙ?ع استخداÙ? تÙ?ر بÙ?جاح.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">اÙ?صÙ?احÙ?ات</string>
-  <string name="wizard_permissions_root_msg1">Ù?Ù?Ù?Ù?Ù? اعطاء اÙ?ربÙ?ت صÙ?احÙ?ات حساب رÙ?Ù?ت Ù?تشغÙ?Ù? اÙ?Ù?Ù?Ù?زات اÙ?Ù?تÙ?دÙ?Ø© Ù?Ø«Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?.</string>
-  <string name="wizard_permissions_root_msg2">إذا Ù?Ù?ت Ù?ا ترÙ?د Ø£Ù? تÙ?عÙ? Ù?ذا, اÙ?رجاء إستخداÙ? براÙ?ج Ù?عدة Ù?Ù?عÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title"> براÙ?ج Ù?عدة Ù?Ù?عÙ?Ù? Ù?ع اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_gibberbot">جات سÙ?Ù?Ù?ر: Ù?Ù? تطبÙ?Ù? Ù?Ù?دردشة بشÙ?Ù? Ø¢Ù?Ù? Ù?ع تشÙ?Ù?ر عاÙ?Ù? جداÙ?</string>
-  <string name="wizard_tips_orweb">اÙ?رÙ?Ù?Ù?س: Ù?تصÙ?Ø­ Ø°Ù? خصÙ?صÙ?Ø© Ù?تÙ?دÙ?Ø© Ù?عÙ?Ù? ظÙ?Ù? اÙ? Ù?Ù? Ø®Ù?اÙ? تÙ?ر</string>
-  <string name="wizard_tips_play">Ù?Ù?Ù?Ù?Ù? اÙ?حصÙ?Ù? عÙ?Ù? جÙ?Ù?ع تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?Ù? عÙ?Ù? جÙ?جÙ? بÙ?اÙ?</string>
-  <string name="wizard_tips_fdroid">اÙ?تشÙ? Ù?Ù? تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?اÙ? عÙ?Ù? اÙ?-درÙ?Ù?د</string>
-  <string name="wizard_tips_fdroid_org">اÙ?تشÙ? Ù?Ù? تطبÙ?Ù?ات Ù?شرÙ?ع اÙ?جاردÙ?اÙ? عÙ?Ù? https://f-droid.org </string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">برÙ?Ù?سÙ? ضÙ?Ù?Ù?</string>
-  <string name="wizard_transproxy_msg">Ù?Ø°Ù? ستسÙ?Ø­ Ù?Ù?براÙ?ج باÙ?اتصاÙ? بشبÙ?Ø© تÙ?ر تÙ?Ù?ائÙ?اÙ? دÙ?Ù? اعداد Ù?سبÙ?.</string>
-  <string name="wizard_transproxy_hint">(اختر Ù?ذا اÙ?Ù?ربع إذا Ù?Ù?ت Ù?ا تعÙ?Ù? عÙ?ا Ù?تحدث)</string>
-  <string name="wizard_transproxy_none">Ù?ا Ø´Ù?Ø¡</string>
-  <string name="pref_transparent_tethering_title">اÙ?ربط بتÙ?ر</string>
-  <string name="pref_transparent_tethering_summary">اسÙ?Ø­ باÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? Ù?Ù?Ù?اÙ? Ù?اÙ? Ù? اجÙ?زة اÙ?Ù?Ù? اس بÙ?  (تحتاج Ù?إعادة تشغÙ?Ù? اÙ?جÙ?از)</string>
-  <string name="button_grant_superuser">اطÙ?ب صÙ?احÙ?ات حساب رÙ?Ù?ت</string>
-  <string name="pref_select_apps">حدد اÙ?براÙ?ج</string>
-  <string name="pref_select_apps_summary">اختر اÙ?براÙ?Ø­ اÙ?تÙ? ترÙ?د تÙ?رÙ?رÙ?ا Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر</string>
-  <string name="pref_node_configuration">تÙ?Ù?Ù?Ù? Ù?Ù?طة اÙ?اتصاÙ?</string>
-  <string name="pref_node_configuration_summary">Ù?Ø°Ù? اÙ?إعدادات Ù?تÙ?دÙ?Ø© Ù? Ù?د تÙ?Ù?Ù? Ù?Ù? Ø­Ù?اÙ?Ø© Ù?Ù?Ù?تÙ?</string>
-  <string name="pref_entrance_node">Ù?Ù?اط اÙ?دخÙ?Ù?</string>
-  <string name="pref_entrance_node_summary">بصÙ?اتØ? اسÙ?اء Ù?ستعارةØ? اÙ?بÙ?داÙ? Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?Ø£Ù?Ù? Ù?Ù?طة اتصاÙ?</string>
-  <string name="pref_entrance_node_dialog">أدخÙ? Ù?Ù?اط اÙ?دخÙ?Ù?</string>
-  <string name="pref_allow_background_starts_title">إسÙ?Ø­ Ù?Ù?Ø®Ù?Ù?Ù?Ø© بأÙ?بدأ</string>
-  <string name="pref_allow_background_starts_summary">إسÙ?Ø­ Ù?Ø£Ù? تطبÙ?Ù? بأÙ? Ù?Ù?خبÙ?ر اÙ?ربت بأÙ? Ù?Ù?عÙ? تÙ?ر Ù?ع اÙ?خدÙ?ات اÙ?Ù?رتبطة بÙ?</string>
-  <string name="button_proxy_all">اÙ?Ø®Ù?Ù?Ù?Ù? اÙ?Ù?Ù?</string>
-  <string name="button_proxy_none">بدÙ?Ù? تخÙ?Ù?Ù?</string>
-  <string name="button_invert_selection">اعÙ?س اÙ?Ù?Ù?حدد</string>
-  <string name="pref_proxy_title">برÙ?Ù?سÙ? اÙ?شبÙ?Ø© اÙ?صادرة (اختÙ?ارÙ?)</string>
-  <string name="pref_proxy_type_title">Ù?Ù?ع اÙ?برÙ?Ù?سÙ? اÙ?صادر</string>
-  <string name="pref_proxy_type_summary">اÙ?برÙ?تÙ?Ù?Ù?Ù? اÙ?Ù?ستخدÙ? Ù?خادÙ? اÙ?برÙ?Ù?سÙ?: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">أدخÙ? Ù?Ù?ع اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_host_title">عÙ?Ù?اÙ? اÙ?برÙ?Ù?سÙ? اÙ?صادر</string>
-  <string name="pref_proxy_host_summary">اسÙ? Ù?ضÙ?Ù? خادÙ? اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_host_dialog">أدخÙ? Ù?ضÙ?Ù? اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_port_title">Ù?Ù?Ù?Ø° اÙ?برÙ?Ù?سÙ? اÙ?صادر</string>
-  <string name="pref_proxy_port_summary">Ù?Ù?Ù?Ø° خادÙ? اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_port_dialog">أدخÙ? Ù?Ù?Ù?Ø° اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_username_title">اسÙ? Ù?ستخدÙ? اÙ?برÙ?Ù?سÙ? اÙ?صادر</string>
-  <string name="pref_proxy_username_summary">اسÙ? Ù?ستخدÙ? اÙ?برÙ?Ù?سÙ? (اختÙ?ارÙ?)</string>
-  <string name="pref_proxy_username_dialog">ادخÙ? اسÙ? Ù?ستخدÙ? اÙ?برÙ?Ù?سÙ?</string>
-  <string name="pref_proxy_password_title">Ù?Ù?Ù?Ø© Ù?رÙ?ر برÙ?Ù?سÙ? اÙ?شبÙ?Ø© اÙ?صادرة</string>
-  <string name="pref_proxy_password_summary">Ù?Ù?Ù?Ø© Ù?رÙ?ر اÙ?برÙ?Ù?سÙ? (اختÙ?ارÙ?)</string>
-  <string name="pref_proxy_password_dialog">ادخÙ? Ù?Ù?Ù?Ø© Ù?رÙ?ر اÙ?برÙ?Ù?سÙ?</string>
-  <string name="status">اÙ?حاÙ?Ø©</string>
-  <string name="setting_up_full_transparent_proxying_">Ù?تÙ? إعداد برÙ?Ù?سÙ? ضÙ?Ù?Ù? Ù?اÙ?Ù?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ù?تÙ? إعداد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? حسب اÙ?براÙ?ج...</string>
-  <string name="transparent_proxying_enabled">اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? Ù?Ù?Ù?عÙ?</string>
-  <string name="transproxy_enabled_for_tethering_">اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? جاÙ?ز Ù?Ù?ربط!</string>
-  <string name="warning_error_starting_transparent_proxying_">تحذÙ?ر: حصÙ? خطأ بتشغÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?!</string>
-  <string name="transproxy_rules_cleared">تÙ? Ù?سح Ù?Ù?اعد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù?</string>
-  <string name="couldn_t_start_tor_process_">Ù?Ù?د تعذر بدء تشغÙ?Ù? تÙ?ر:</string>
-  <string name="privoxy_is_running_on_port_">بÙ?Ù?Ù?بÙ? Ù?عÙ?Ù? عÙ?Ù?  اÙ?Ù?Ø­Ù?Ù?Ù? </string>
-  <string name="setting_up_port_based_transparent_proxying_">Ù?تÙ? إعداد اÙ?برÙ?Ù?سÙ? اÙ?ضÙ?Ù?Ù? حسب اÙ?Ù?Ù?Ù?Ø°...</string>
-  <string name="bridge_error">خطأ باÙ?جسر</string>
-  <string name="bridge_requires_ip">حتÙ? تستطÙ?ع إستخدÙ? Ù?Ù?زة اÙ?جسÙ?رØ? Ù?جب عÙ?Ù?Ù? ادخاÙ? عÙ?Ù?اÙ? اÙ?ترÙ?ت Ù?جسر Ù?احد عÙ?Ù? اÙ?Ø£Ù?Ù?.</string>
-  <string name="send_email_for_bridges">أرسÙ? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? Ø¥Ù?Ù? bridges@xxxxxxxxxxxxxx Ù?ع عبارة \"get bridges\" بداخÙ? اÙ?رساÙ?Ø© Ù?Ù? حساب برÙ?د gmail.</string>
-  <string name="error">خطأ</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات اÙ?عÙ?Ù?اÙ? اÙ?Ù?ابÙ? Ù?Ù?اتصاÙ? Ù?دÙ?Ù? تسببت بخطأ!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ù?Ù?د تعذر بدء تشغÙ?Ù? تÙ?ر:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">إعدادات اÙ?عÙ?Ù?اÙ? اÙ?Ù?ابÙ? Ù?Ù?اتصاÙ? Ù?دÙ?Ù? تسببت بخطأ!</string>
   <string name="your_relay_settings_caused_an_exception_">إعدادات اÙ?Ù?رحÙ?ات Ù?دÙ?Ù? تسببت بخطأ!</string>
-  <string name="exit_nodes">Ù?Ù?اط اÙ?خرÙ?ج</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اÙ?بصÙ?اتØ? اÙ?اسÙ?اء اÙ?Ù?ستعارةØ? اÙ?بÙ?داÙ? Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?آخر Ù?Ù?طة اتصاÙ?</string>
-  <string name="enter_exit_nodes">أدخÙ? Ù?Ù?اط اÙ?خرÙ?ج</string>
-  <string name="exclude_nodes">استثÙ?Ù? اÙ?Ù?Ù?اط</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">بصÙ?اتØ? اÙ?أسÙ?اء اÙ?Ù?ستعارةØ? اÙ?بÙ?داÙ? Ù? اÙ?عÙ?اÙ?Ù?Ù? Ù?Ù?تÙ? استثÙ?ائÙ?ا</string>
-  <string name="enter_exclude_nodes">أدخÙ? اÙ?Ù?Ù?اط اÙ?Ù?ستثÙ?اÙ?</string>
-  <string name="strict_nodes">اÙ?Ù?Ù?اط اÙ?Ù?شددة</string>
-  <string name="use_only_these_specified_nodes">استخدÙ? Ù?Ù?Ø· تÙ?Ù? اÙ?Ù?Ù?اط اÙ?Ù?حددة</string>
-  <string name="bridges">اÙ?جسÙ?ر</string>
-  <string name="use_bridges">استخدÙ? اÙ?جسÙ?ر</string>
-  <string name="bridges_obfuscated">اÙ?جسÙ?ر اÙ?غاÙ?ضة</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">اسÙ?Ø­ باستخداÙ? Ù?Ù?اط دخÙ?Ù? بدÙ?Ù?Ø© Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ù?عÙ? Ù?ذا اÙ?Ø®Ù?ار إذا Ù?اÙ?ت اÙ?جسÙ?ر اÙ?Ù?حددة جسÙ?ر غاÙ?ضة</string>
-  <string name="ip_address_and_port_of_bridges">عÙ?Ù?اÙ? اÙ?اÙ?ترÙ?ت Ù? اÙ?Ù?Ù?Ù?Ø° Ù?Ù?جسÙ?ر</string>
-  <string name="enter_bridge_addresses">أدخÙ? عÙ?اÙ?Ù?Ù? اÙ?جسÙ?ر</string>
-  <string name="relays">اÙ?Ù?رحÙ?ات</string>
-  <string name="relaying">Ù?رحÙ?</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">اسÙ?Ø­ Ù?جÙ?ازÙ? Ù?Ù?Ù?Ù?Ù? Ù?رحÙ? غÙ?ر Ù?Ù?ائÙ?</string>
-  <string name="relay_port">Ù?Ù?Ù?Ø° اÙ?Ù?رحÙ?</string>
-  <string name="listening_port_for_your_tor_relay">اÙ?Ù?Ù?Ù?Ø° اÙ?Ù?صغÙ? Ù?Ù?Ù?رحÙ? تÙ?ر اÙ?خاص بÙ?</string>
-  <string name="enter_or_port">أدخÙ? Ù?Ù?Ù?Ø° OR</string>
-  <string name="relay_nickname">اÙ?اسÙ? اÙ?Ù?ستعار Ù?Ù?Ù?Ù?رحÙ?</string>
-  <string name="the_nickname_for_your_tor_relay">اÙ?اسÙ? اÙ?Ù?ستعار Ù?Ù?Ù?رحÙ? تÙ?ر اÙ?خاص بÙ?</string>
-  <string name="enter_a_custom_relay_nickname">أدخÙ? اسÙ? Ù?ستعار Ù?Ù?Ù?Ù?رحÙ?</string>
-  <string name="reachable_addresses">اÙ?عÙ?اÙ?Ù?Ù? اÙ?تÙ? Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">اÙ?عÙ?Ù? Ù?خدÙ?Ø© Ù?Ù? Ù?راء جدار Ù?ارÙ? بسÙ?اسات تÙ?Ù?دÙ?Ø©</string>
-  <string name="reachable_ports">اÙ?Ù?Ù?اÙ?Ø° اÙ?تÙ? Ù?Ù?Ù?Ù? اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù?ا</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ù?Ù?اÙ?Ø° Ù?Ù?تÙ?حة عبر جدار Ù?ارÙ? تÙ?Ù?دÙ?</string>
-  <string name="enter_ports">أدخÙ? اÙ?Ù?Ù?اÙ?Ø°</string>
-  <string name="enable_hidden_services">استضاÙ?Ø© اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="run_servers_accessible_via_the_tor_network">اÙ?سÙ?اح Ù?Ù?خادÙ? اÙ?Ø°Ù? عÙ?Ù? جÙ?ازÙ? بأÙ?Ù?اÙ?Ù?Ø© اÙ?Ù?صÙ?Ù? Ø¥Ù?Ù?Ù? Ù?Ù? Ø®Ù?اÙ? شبÙ?Ø© تÙ?ر</string>
-  <string name="enter_localhost_ports_for_hidden_services">أدخÙ? اÙ?Ù?Ù?اÙ?Ø° اÙ?Ù?Ø­Ù?Ù?Ø© Ù?Ù?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="hidden_service_ports">Ù?Ù?اÙ?Ø° اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø©</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">اسÙ? اÙ?عÙ?Ù?اÙ? Ù?خدÙ?تÙ? اÙ?Ù?Ø®Ù?Ù?Ø© (Ù?تÙ? اÙ?شائÙ? تÙ?Ù?ائÙ?اÙ?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">شغÙ? سجÙ? اÙ?Ù?debug ( Ù?Ù?Ù?راجعة Ù?جب استخداÙ? adb Ø£Ù? LogCat)</string>
-  <string name="project_home">اÙ?Ù?Ù?Ù?ع اÙ?رسÙ?Ù? Ù?Ù?Ù?شرÙ?ع (اÙ?Ù?شارÙ?ع):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">رخصة استخداÙ? تÙ?ر</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">براÙ?ج Ù?Ù? اÙ?طرÙ? اÙ?ثاÙ?Ø«:</string>
-  <string name="tor_version">تÙ?ر: https://www.torproject.org</string>
-  <string name="libevent_version">Ù?ب Ø¥Ù?Ù?Ù?Ù?ت اÙ?Ù?سخة http://www.monkey.org/~provos/libevent/ :v2.0.21</string>
-  <string name="polipo_version">بÙ?Ù?Ù?بÙ? اÙ?Ù?سخة 1.1.9 : https://github.com/jech/polipo</string>
-  <string name="iptables_version">Ø¢Ù? بÙ? تاÙ?بÙ?ز اÙ?Ù?سخة 1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">اÙ?بÙ? اس اس اÙ? اÙ?Ù?سخة: http://www.openssl.org 1.0.1q</string>
-  <string name="hidden_service_request">Ù?Ù?اÙ? برÙ?اÙ?ج Ù?حاÙ?Ù? Ù?تح Ù?Ù?Ù?Ø° Ù?خادÙ? Ù?Ø®Ù?Ù? %S Ø¥Ù?Ù? شبÙ?Ø© تÙ?ر. Ù?ذا اÙ?سÙ?Ù?Ù? Ø¢Ù?Ù? إذا Ù?Ù?ت تثÙ? بÙ?ذا اÙ?برÙ?اÙ?ج.</string>
-  <string name="found_existing_tor_process">عÙ?ثر عÙ?Ù? عÙ?Ù?Ù?Ø© تÙ?ر سابÙ?Ø© تعÙ?Ù?...</string>
+    <string name="found_existing_tor_process">عÙ?ثر عÙ?Ù? عÙ?Ù?Ù?Ø© تÙ?ر سابÙ?Ø© تعÙ?Ù?...</string>
   <string name="something_bad_happened">حصÙ? خطأ Ù?ا. اÙ?حص اÙ?سجÙ?</string>
-  <string name="hidden_service_on">اÙ?خدÙ?ات اÙ?Ù?Ø®Ù?Ù?Ø© اÙ?تÙ? تعÙ?Ù? حاÙ?Ù?اÙ?:</string>
-  <string name="unable_to_read_hidden_service_name">غÙ?ر Ù?ادر عÙ?Ù? Ù?راءة اسÙ? اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
+    <string name="unable_to_read_hidden_service_name">غÙ?ر Ù?ادر عÙ?Ù? Ù?راءة اسÙ? اÙ?خدÙ?Ø© اÙ?Ù?Ø®Ù?Ù?Ø©</string>
   <string name="unable_to_start_tor">غÙ?ر Ù?ادر عÙ?Ù? بدء تÙ?ر:</string>
-  <string name="unable_to_reset_tor">أعÙ?د تشغÙ?Ù? جÙ?ازÙ?, غÙ?ر Ù?ادر عÙ?Ù? اعادة تشغÙ?Ù? تÙ?ر</string>
-  <string name="pref_use_sys_iptables_title">استخدÙ? اÙ?Ù?iptables اÙ?تÙ?Ù?ائÙ?Ø©</string>
-  <string name="pref_use_sys_iptables_summary">استخدÙ? Ù?Ù?Ù?Ù?ات اÙ?Ù?iptables اÙ?Ù?Ù?جÙ?دة ضÙ?Ù?اÙ? باÙ?جÙ?از بدÙ? اÙ?Ù?سخة اÙ?Ù?رÙ?Ù?Ø© Ù?ع اÙ?ربÙ?ت</string>
-  <string name="error_installing_binares">غÙ?ر Ù?ادرة عÙ?Ù? تثبÙ?ت Ø£Ù? تحدÙ?Ø« تÙ?ر</string>
-  <string name="pref_use_persistent_notifications">دائÙ?ا ضع اÙ?Ø£Ù?Ù?Ù?Ù?Ø© Ù?Ù? شرÙ?Ø· اÙ?أدÙ?ات عÙ?دÙ?ا Ù?Ù?Ù?Ù? اÙ?ربÙ?ت Ù?تصÙ?اÙ?</string>
-  <string name="pref_use_persistent_notifications_title">تÙ?بÙ?Ù?ات دائÙ?Ø©</string>
-  <string name="pref_use_expanded_notifications">Ù?Ù? بأظÙ?ار اÙ?تÙ?بÙ?Ù? بشÙ?Ù? Ù?Ù?سع بأستخداÙ? تÙ?ر. أخرج Ù?Ù? اÙ?بÙ?د Ù?رÙ?Ù? اÙ?Ø¢Ù? بÙ? رÙ?Ù? اÙ?عÙ?Ù?اÙ? عÙ?Ù? اÙ?شبÙ?Ø©</string>
-  <string name="pref_use_expanded_notifications_title">تÙ?بÙ?Ù? Ù?Ù?سÙ?ع</string>
-  <string name="notification_using_bridges">تÙ? تÙ?عÙ?Ù? اÙ?جسÙ?ر!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">اÙ?Ù?غة</string>
-  <string name="set_locale_summary">اختار  اÙ?إعدادات اÙ?Ù?Ø­Ù?Ù?Ø© Ù? اÙ?Ù?غة Ù?اÙ?ربÙ?ت</string>
-  <string name="wizard_locale_title">اختار اÙ?Ù?غة</string>
-  <string name="wizard_locale_msg">Ø¥Ù?ا اÙ? تترÙ? اÙ?Ù?غة اÙ?اÙ?تراضÙ?Ø© اÙ? Ø¥Ù?ا اÙ? تغÙ?ر اÙ?Ù?غة</string>
-  <string name="powered_by">Ù?دعÙ?Ù?Ø© Ù?Ù? Ù?بÙ? تÙ?ر</string>
-  <string name="btn_save_settings">Ø­Ù?ظ اÙ?إعدادات</string>
-  <string name="no_internet_connection_tor">Ù?ا Ù?Ù?جد ارتباط بأÙ?اÙ?ترÙ?Ù?ت: تÙ?ر Ù?Ù? Ù?ضع اÙ?Ù?Ù?Ù? اÙ?Ù?ؤÙ?ت</string>
-  <string name="bandwidth_">عرض اÙ?Ù?طاÙ?</string>
-  <string name="down">اسÙ?Ù?</string>
-  <string name="up">أعÙ?Ù?</string>
-  <string name="pref_disable_network_title">Ù?اتÙ?جد شبÙ?Ø© Ù?Ù?Ù?-Ø¢Ù?Ù?</string>
-  <string name="pref_disable_network_summary">ضع تÙ?ر Ù?Ù? Ù?ضع اÙ?Ù?Ù?Ù? عÙ?د عدÙ? Ù?جÙ?د اÙ?Ø£Ù?ترÙ?Ù?ت</string>
-  <string name="newnym">Ù?Ù?د تحÙ?Ù?ت اÙ?Ù? Ù?Ù?Ù?Ø© تÙ?ر جدÙ?دة</string>
-  <string name="menu_verify_browser">Ù?تصÙ?Ø­</string>
-  <string name="menu_use_chatsecure">استخدÙ? جات سÙ?Ù?Ù?ر </string>
-  <string name="permission_manage_tor_label">أدارة تÙ?ر</string>
-  <string name="permission_manage_tor_description">Ù?Ù? بتÙ?Ù?Ù?Ù? Ù?ذا اÙ?تطبÙ?Ù? Ù?Ù? اÙ?تحÙ?Ù? بخدÙ?ات تÙ?ر</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ù?ا Ù?بدÙ? بأÙ? Ù?دÙ?Ù? اÙ?رÙ?Ù?Ù?س Ù?Ù?صباÙ?. Ù?Ù? ترÙ?د Ù?ساعدتاÙ? Ù?Ù? Ø°Ù?Ù? اÙ? Ù?Ù?Ù?Ù? Ù?Ù?Ø· بتشغÙ?Ù? اÙ?Ù?تصÙ?Ø­Ø?</string>
-  <string name="install_apps_">Ù?Ù? ترغب بتÙ?صÙ?ب اÙ?تطبÙ?Ù?اتØ?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ù?ا Ù?Ù?جد اتصاÙ? بأÙ?شبÙ?Ø©. سÙ?دخÙ? تÙ?ر اÙ?Ù? Ù?ضع اÙ?Ù?Ù?Ù?</string>
+    <string name="no_internet_connection_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_">اÙ?اتصاÙ? بأÙ?شبÙ?Ø© جÙ?د. تÙ?بÙ?Ù? تÙ?ر Ù?Ù? اÙ?Ù?Ù?Ù?</string>
   <string name="updating_settings_in_tor_service">تحدÙ?Ø« اÙ?اعدادات Ù?Ù? خدÙ?ات تÙ?ر</string>
-  <string name="pref_socks_title">تÙ?ر  سÙ?Ù?س</string>
-  <string name="pref_socks_summary">Ù?Ù?Ù?Ø° اÙ?شبÙ?ات اÙ?حاسÙ?بÙ?Ø© اÙ? بÙ?رت اÙ?Ø°Ù? Ù?Ù?دÙ?Ù? تÙ?ر اÙ?Ù? Ù?حدة اÙ?خدÙ?Ø© اÙ?Ù?ائبة اÙ?برÙ?Ù?سÙ? Ù?Ù? سÙ?Ù?س. (اÙ?تÙ?صÙ?ر 9050 اÙ? 0 عدÙ? اÙ?Ù?درة)</string>
-  <string name="pref_socks_dialog">تÙ?Ù?ئة Ù?Ù?Ù?Ø° اÙ?شبÙ?ات اÙ?حاسÙ?بÙ?Ø©  بÙ?رت Ù?Ù? سÙ?Ù?س</string>
-  <string name="pref_transport_title">Ù?Ù?Ù?Ø° اÙ?شبÙ?ات اÙ?حاسÙ?بÙ?Ø© Ù?Ù? Ù?حدة اÙ?خدÙ?Ø© اÙ?Ù?ائبة اÙ?برÙ?Ù?سÙ? Ù?Ù? تÙ?ر</string>
-  <string name="pref_transport_summary">Ù?Ù?Ù?Ø° اÙ?شبÙ?ات اÙ?حاسÙ?بÙ?Ø© اÙ? بÙ?رت اÙ?Ø°Ù? Ù?Ù?دÙ?Ù? تÙ?ر اÙ?Ù? اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ? (اÙ?تÙ?صÙ?ر 9040 اÙ? 0 عدÙ? اÙ?Ù?درة)</string>
-  <string name="pref_transport_dialog">تÙ?Ù?ئة بÙ?رت اÙ?برÙ?Ù?سÙ? اÙ?Ø´Ù?اÙ?</string>
-  <string name="pref_dnsport_title">تÙ?ر, Ù?ظاÙ? اسÙ?اء اÙ?Ù?طاÙ?ات, بÙ?رت</string>
-  <string name="pref_dnsport_summary">Ù?Ù?Ù?Ø° اÙ?شبÙ?ات اÙ?حاسÙ?بÙ?Ø© اÙ? بÙ?رت اÙ?Ø°Ù? Ù?Ù?دÙ?Ù? تÙ?ر اÙ?Ù? خدÙ?Ø© اسÙ?اء اÙ?Ù?طاÙ? دÙ? اÙ? اس. (اÙ?تÙ?صÙ?ر 5400 اÙ? 0 Ù?عدÙ? اÙ?Ù?درة)</string>
-  <string name="pref_dnsport_dialog">إعدادات بÙ?رت خادÙ? اسÙ?اء اÙ?Ù?طاÙ?</string>
-  <string name="menu_vpn">Ù?Ù? بÙ? اÙ? شبÙ?Ø© Ù?Ù?Ù?Ù?Ø© خاصة</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-az/strings.xml b/orbotservice/src/main/res/values-az/strings.xml
index c1d53370..647d20e2 100644
--- a/orbotservice/src/main/res/values-az/strings.xml
+++ b/orbotservice/src/main/res/values-az/strings.xml
@@ -2,296 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Pulsuz proksi tÉ?tbiqetmÉ?si olan Orbot baÅ?qa tÉ?tbiqetmÉ?lÉ?rÉ? internetdÉ?n daha tÉ?hlükÉ?siz istifadÉ? etmÉ?k imkanı verir. Orbot sizin internet trafikinizi Å?ifrÉ?lÉ?mÉ?k üçün Tordan istifadÉ? edir vÉ? dünyanın hÉ?r yerindÉ? kompüterlÉ?rin birindÉ?n o birinÉ? sıçramaqla bunu gizlÉ?dir. Tor pulsuz proqram tÉ?minatıdır, eyni zamanda sizin Å?É?xsi azadlıÄ?ınız vÉ? tÉ?hlükÉ?sizliyinizÉ?, gizli biznes fÉ?aliyyÉ?ti vÉ? É?laqÉ?lÉ?rÉ?, o cümlÉ?dÉ?n trafik analiz adlanan dövlÉ?t tÉ?hlükÉ?sizliyinÉ? xÉ?lÉ?l gÉ?tirÉ? bilÉ?cÉ?k Å?É?bÉ?kÉ? nÉ?zarÉ?ti formalarından müdafiÉ? olunmaÄ?a yardım edÉ?n açıq Å?É?bÉ?kÉ?dir.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Toru baÅ?lat vÉ? dayandır
-</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot baÅ?layır...</string>
+    <string name="status_starting_up">Orbot baÅ?layır...</string>
   <string name="status_activated">Tor Å?É?bÉ?kÉ?sinÉ? baÄ?landı</string>
   <string name="status_disabled">Orbot deaktivasiya edildi</string>
   <string name="status_shutting_down">Tor xidmÉ?ti iÅ?ini baÅ?a vurur</string>
   <string name="tor_process_starting">Tor xidmÉ?ti baÅ?layır...</string>
   <string name="tor_process_complete">tamamla.</string>
-  <string name="tor_process_waiting">gözlÉ?yirik.</string>
-  <string name="not_anonymous_yet">TÆ?HLÃ?KÆ?: SÉ?nin trafikin hÉ?lÉ? anonim deyil! LütfÉ?n, aplikasiyanı ya HTTP proksi 127.0.0.1:8118, ya SOCKS4A, ya da SOCKS5 proksi 127.0.0.1:9050 istifadÉ? etmÉ?k üçün quraÅ?dır.</string>
-  <string name="menu_home">Ev</string>
-  <string name="menu_browse">Bax</string>
-  <string name="menu_settings">QuraÅ?dırmalar</string>
-  <string name="menu_log">Jurnal</string>
-  <string name="menu_info">KömÉ?k</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">BaÅ?la</string>
-  <string name="menu_stop">Dur</string>
-  <string name="menu_about">Haqqında</string>
-  <string name="menu_promo_apps">TÉ?tbiqetmÉ?lÉ?ri É?ldÉ? edin...</string>
-  <string name="main_layout_download">Endir</string>
-  <string name="main_layout_upload">YüklÉ?</string>
-  <string name="button_help">KömÉ?k</string>
-  <string name="button_close">BaÄ?la</string>
-  <string name="button_about">Haqqında</string>
-  <string name="button_clear_log">Jurnalı TÉ?mizlÉ?</string>
-  <string name="menu_verify">Yoxla</string>
-  <string name="menu_exit">�ıx</string>
-  <string name="menu_scan">KörpüQR kodu skan edin</string>
-  <string name="menu_share_bridge">KörpüQR kodu paylaÅ?ın</string>
-  <string name="press_to_start">- baÅ?lamaq üçün uzun klik -</string>
-  <string name="pref_trans_proxy_group">Å?É?ffaf ProksilÉ?mÉ? (Root TÉ?lÉ?b Edir)</string>
-  <string name="pref_trans_proxy_title">Å?É?ffaf ProksilÉ?mÉ?</string>
-  <string name="pref_trans_proxy_summary">Aplikasiyaların Avtomatik Torlanması</string>
-  <string name="pref_transparent_all_title">HÉ?r Å?eyi Torla</string>
-  <string name="pref_transparent_all_summary">Tor vasitÉ?silÉ? bütün aplikasiyaların proksi trafiki</string>
-  <string name="pref_transparent_port_fallback_title">Port Proksi Ehtiyatı</string>
-  <string name="pref_transparent_port_fallback_summary">TÆ?HLÃ?KÆ?: Ã?mumi alt portlar (80, 443 vÉ? s.). \'Hamısı\' vÉ? ya \'TÉ?tbiqetmÉ?\' iÅ?lÉ?mirsÉ?, *YALNIZ Ä°STÄ°FADÆ? ET*.</string>
-  <string name="pref_transparent_port_title">Port Siyahısı</string>
-  <string name="pref_transparent_port_summary">ProksiyÉ? port siyahısı. \'Hamısı\' vÉ? ya \'TÉ?tbiqetmÉ?\' iÅ?lÉ?mirsÉ?, *YALNIZ Ä°STÄ°FADÆ? ET*.</string>
-  <string name="pref_transparent_port_dialog">ProksiyÉ? port daxil et</string>
-  <string name="pref_has_root">Root GiriÅ? TÉ?lÉ?b Et</string>
-  <string name="pref_has_root_summary">Å?É?ffaf proksilÉ?mÉ? üçün mÉ?nbÉ? tÉ?lÉ?b et</string>
-  <string name="status_install_success">Tor ikilisi müvÉ?ffÉ?qiyyÉ?tlÉ? yüklÉ?ndi!</string>
-  <string name="status_install_fail">Tor ikili fayllarının quraÅ?dırılması mümkün olmadı. LütfÉ?n giriÅ?i yoxla vÉ? assistants@xxxxxxxxxxxxxx-a xÉ?bÉ?r ver.</string>
-  <string name="title_error">TÉ?tbiq SÉ?hvi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot Haqqında</string>
-  <string name="btn_next">Sonrakı</string>
-  <string name="btn_back">Geri</string>
-  <string name="btn_finish">Bitir</string>
-  <string name="btn_okay">Okey</string>
-  <string name="btn_cancel">LÉ?Ä?v et</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">BÉ?zi Orbot Detalları</string>
-  <string name="wizard_details_msg">Orbot Tor, LibEvent vÉ? Polipodan ibarÉ?t olan açıq mÉ?nbÉ?li tÉ?tbiqetmÉ?dir. O, Tor Å?É?bÉ?kÉ?sini yerli HTTP proksi (8118) vÉ? SOCKS proksi (9050) ilÉ? tÉ?min edir. Orbot hÉ?m dÉ? bütün internet trafiklÉ?ri köklü mexanizm É?sasında Tor vasitÉ?siylÉ? göndÉ?rmÉ?k qabiliyyÉ?tinÉ? malikdir. </string>
-  <string name="wizard_permissions_root">Ä°cazÉ? Verilir</string>
-  <string name="wizard_permissions_stock">Orbot Ä°cazÉ?lÉ?ri</string>
-  <string name="wizard_premissions_msg_root">Æ?la! SÉ?nin Orbot üçün mÉ?nbÉ? icazÉ?lÉ?rinÉ? malik olmanı müÉ?yyÉ?n etmiÅ?ik. Biz bu gücü aÄ?ılla istifadÉ? edÉ?cÉ?yik.</string>
-  <string name="wizard_permissions_msg_stock">Bu tÉ?lÉ?b edilmÉ?diyi halda sÉ?nin qurÄ?unun mÉ?nbÉ? giriÅ?i varsa, Orbot daha güclü iÅ?lÉ?yÉ?cÉ?k. Orbota super gücü vermÉ?k üçün aÅ?aÄ?ıdakı düymÉ?ni istifadÉ? et!</string>
-  <string name="wizard_permissions_no_root">Æ?gÉ?r sÉ?nin mÉ?nbÉ? giriÅ?inÉ? icazÉ?n yoxdursa, ya da nÉ? haqqında danıÅ?dıÄ?ımızı anlamırsansa, É?min ol ki, istifadÉ? etdiyin aplikasiyalar Orbotla iÅ?lÉ?yÉ? bilÉ?ndirlÉ?r.</string>
-  <string name="wizard_permissions_consent">SuperistifadÉ?çisiz davam etmÉ?yi anlayır vÉ? istÉ?yirÉ?m</string>
-  <string name="wizard_permission_enable_root">Orbot üçün MÉ?nbÉ? Ver</string>
-  <string name="wizard_configure">Torifikasiyanı QuraÅ?dır</string>
-  <string name="wizard_configure_msg">Orbot sÉ?nÉ? bütün vÉ? ya seçilmiÅ? aplikasiyalarını Tor vasitÉ?silÉ? istifadÉ? etmÉ?yÉ? imkan yaradır.</string>
-  <string name="wizard_configure_all">Bütün Aplikasiyaları Tor VasitÉ?silÉ? Proksi Et</string>
-  <string name="wizard_configure_select_apps">Tor üçün MüÉ?yyÉ?n Aplikasiyaları Seç</string>
-  <string name="wizard_tips_tricks">Orbota-açıq Aplikasiyalar</string>
-  <string name="wizard_tips_msg">AÅ?aÄ?ıdakı aplikasiyalar Orbotla iÅ?lÉ?mÉ?k üçün quraÅ?dırılmıÅ?dır. Ä°ndi quraÅ?dırmaq üçün hÉ?r düymÉ?ni kliklÉ?, ya da baÅ?qa vaxt onları Google Play, GuardianProject.info saytı vÉ? ya F-Doid.org-da tap.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android üçün tÉ?hlükÉ?siz mesajlaÅ?ma müÅ?tÉ?risi</string>
-  <string name="wizard_tips_proxy">Proksi SeçimlÉ?ri - Aplikasiyaların Orbotla necÉ? iÅ?lÉ?yÉ?cÉ?yini öyrÉ?n</string>
-  <string name="wizard_tips_duckgo">DuckDuckGO AxtarıÅ? QurÄ?u aplikasiyası</string>
-  <string name="wizard_tips_twitter">\"Yerlihost\" vÉ? 8118 portuna sahiblik üçün Twitter proksini quraÅ?dır</string>
-  <string name="wizard_tips_story_maker">StoryMaker--Yazı yaz, tÉ?hlükÉ?sizlik mÉ?sÉ?lÉ?sini torun öhdÉ?sinÉ? burax!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proksi qurÄ?uları</string>
-  <string name="wizard_proxy_help_msg">Ä°stifadÉ? etdiyiniz Android tÉ?tbiqetmÉ?si HTTP vÉ? SOCKS proksinin istifadÉ?sini dÉ?stÉ?klÉ?yÉ? bilirsÉ?, siz onu Orbotla birlÉ?Å?dirmÉ?k üçün tÉ?nzimlÉ?yÉ? vÉ? Tor.\n\n\n-dÉ?n istifadÉ? edÉ? bilÉ?rsiniz.   Host quraÅ?dırmaları 127.0.0.1-dir, yaxud \"yerlihost\"dur. HTTP üçün port quraÅ?dırması 8118-dir. SOCKS üçün proksi  9050-dir. Siz SOCKS4A, yaxud mümkünsÉ?, SOCKS5-dÉ?n istifadÉ? etmÉ?lisiniz.\n \n\n\n FAQ vasitÉ?siylÉ? siz AndroiddÉ? proksilÉ?mÉ? haqda daha çox mÉ?lumat ala bilÉ?rsiniz: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot hazırdır!</string>
-  <string name="wizard_final_msg">Dünyanın müxtÉ?lif yerlÉ?rindÉ? milyonlarla insan Tordan müxtÉ?lif mÉ?qsÉ?dlÉ?rlÉ? istifadÉ? edir. \n\n JurnalistlÉ?r, blogerlÉ?r, insan haqları müdafiÉ?çilÉ?ri, hüquq-mühafizÉ? orqanlarının iÅ?çilÉ?ri, É?sgÉ?rlÉ?r, korporasiyalar, repressiv rejimlÉ?rin vÉ?tÉ?ndaÅ?ları, ya da adi vÉ?tÉ?ndaÅ?lar...Ä°ndi buna siz dÉ? hazırsınız!</string>
-  <string name="wizard_exit_at_first_screen_toast">ZÉ?hmÉ?t olmasa, istifadÉ?yÉ? baÅ?lamazdan É?vvÉ?l Orbotu tÉ?nzimlÉ?yin!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Siz Tor Å?É?bÉ?kÉ?sinÉ? uÄ?urla qoÅ?uldunuz. Ancaq bu o demÉ?k deyil ki, sizin cihazınız tÉ?hlükÉ?sizdir. Æ?lqÉ?ni yoxlamaq üçün  \'Browser\' düymÉ?sindÉ?n istifadÉ? edÉ? bilÉ?rsiniz. \n\n BizÉ? https://guardianproject.info/apps/orbot sÉ?hifÉ?sindÉ? qonaq ola bilÉ?rsiniz. Daha çox mÉ?lumat É?ldÉ? etmÉ?k üçün help@xxxxxxxxxxxxxxxxxxxx ünvanına mÉ?ktub yazmaq olar. </string>
-  <string name="tor_check">Orbotun konfiqurasiya edilmÉ?sini vÉ? sÉ?nin Tor-a qoÅ?ulduÄ?unu dÉ?qiqlÉ?Å?dirmÉ?k üçün bu sÉ?nin brauzerini https://check.torproject.org saytı ilÉ? açacaq.</string>
-  <string name="pref_hs_group">Gizli XidmÉ?t Hostinqi</string>
-  <string name="pref_general_group">Æ?sas</string>
-  <string name="pref_start_boot_title">Android Açıldıqda Orbotu BaÅ?lat</string>
-  <string name="pref_start_boot_summary">Android cihazın iÅ?É? baÅ?ladıqda avtomatik olaraq Orbot baÅ?lansın vÉ? Tor-a qoÅ?ulsun</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot Toru AndroidÉ? gÉ?tirir!\n\nTor mÉ?xfiliyÉ?, gizli informasiya vÉ? Å?É?xsi münasibÉ?tlÉ?rÉ? xÉ?lÉ?l gÉ?tirÉ? bilÉ?cÉ?k Å?É?bÉ?kÉ? nÉ?zarÉ?ti, mÉ?zmunun süzgÉ?cdÉ?n keçirilmÉ?si vÉ? trafik analizindÉ?n müdafiÉ? olunmaqda sizÉ? yardım edir.\n\nBu sehrbaz Orbot vÉ? Toru sizin cihazınıza quraÅ?dırmaÄ?a kömÉ?k edÉ?cÉ?k.  </string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">XÉ?bÉ?rdarlıq</string>
-  <string name="wizard_warning_msg">SadÉ?cÉ? Orbotun quraÅ?dırılması mobil trafikinizi avtomatik olaraq anonimlÉ?Å?dirÉ? bilmÉ?z.\n\nTordan uÄ?urla istifadÉ? etmÉ?k üçün siz Orbotu, cihazınızı vÉ? baÅ?qa tÉ?tbiqetmÉ?lÉ?ri bir-birinÉ? uyÄ?unlaÅ?dırmalısınız.  </string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ä°cazÉ?</string>
-  <string name="wizard_permissions_root_msg1">SÉ?n istÉ?sÉ?n Orbot-un \'SuperistifadÉ?çi\' giriÅ?ini É?ldÉ? edib Å?É?ffaf ProksilÉ?mÉ? kimi É?lavÉ? seçimlÉ?r qazana bilÉ?rsÉ?n.</string>
-  <string name="wizard_permissions_root_msg2">Bunu etmÉ?k istÉ?mirsÉ?nsÉ?, yalnız Orbot-la iÅ?lÉ?mÉ?si mümkün aplikasiyalara sahib olduÄ?una É?min ol</string>
-  <string name="wizard_permissions_no_root_msg">Sizin cihazınız yÉ?qin ki, rout olunmayıb, ya da rout vÉ? ya \"SuperistifadÉ?çi\" keçidi ilÉ? tÉ?min etmir.\n\nXahiÅ? edirik, bunun É?vÉ?zinÉ? É?sas ekranda \'TÉ?tbiqetmÉ?lÉ?r\' rejimindÉ?n istifadÉ? etmÉ?yÉ? çalıÅ?ın. </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-a Açıq Aplikasiyalar</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ã?at aplikasiyasını Qeydsiz Å?ifrlÉ?mÉ? ilÉ? tÉ?hlükÉ?sizlÉ?Å?dir</string>
-  <string name="wizard_tips_orweb">Orfox: Tor vasitÉ?siylÉ? iÅ?lÉ?yÉ?n vÉ? mÉ?xfiliyi artıran brauzer</string>
-  <string name="wizard_tips_play">Google Play-dÉ? bütün Guardian LayihÉ? aplikasiyaları tap</string>
-  <string name="wizard_tips_fdroid">F-DroiddÉ?ki bütün Guardian Project tÉ?tbiqetmÉ?lÉ?rini tapın </string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org-dÉ;? bütün Guardian Project tÉ?tbiqetmÉ?lÉ?rini tapın</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Å?É?ffaf ProksilÉ?mÉ?</string>
-  <string name="wizard_transproxy_msg">Bu heç bir konfiqurasiyaya ehtiyac olmadan aplikasiyalarının avtomatik olaraq Tor Å?É?bÉ?kÉ?si vasitÉ?silÉ? iÅ?lÉ?mÉ?sini tÉ?min edir.</string>
-  <string name="wizard_transproxy_hint">(DediklÉ?rimizdÉ?n heç biri haqqında xÉ?bÉ?rin yoxdursa, qutunu iÅ?arÉ?lÉ?)</string>
-  <string name="wizard_transproxy_none">Heç biri</string>
-  <string name="pref_transparent_tethering_title">Tor-un Son HÉ?ddi</string>
-  <string name="pref_transparent_tethering_summary">Wi-Fi vÉ? USB ilÉ? BaÄ?lanan Cihazlar üçün Tor Å?É?ffaf ProksilÉ?mÉ?ni AktivlÉ?Å?dir (cihazın yenidÉ?n yüklÉ?nmÉ?sini tÉ?lÉ?b edir)</string>
-  <string name="button_grant_superuser">SuperistifadÉ?çi GiriÅ? TÉ?lÉ?bi</string>
-  <string name="pref_select_apps">Aplikasiya Seç</string>
-  <string name="pref_select_apps_summary">Tor vasitÉ?silÉ? açılması üçün Aplikasiya seç</string>
-  <string name="pref_node_configuration">KÉ?siÅ?mÉ? Konfiqurasiyası</string>
-  <string name="pref_node_configuration_summary">Bunlar sÉ?nin anonimliyini azalda bilÉ?cÉ?k É?traflı seçimlÉ?rdir</string>
-  <string name="pref_entrance_node">GiriÅ? KÉ?siÅ?mÉ?lÉ?ri</string>
-  <string name="pref_entrance_node_summary">Birinci sıçrayıÅ? üçün barmaq izlÉ?ri, niÅ?anlar, ölkÉ?lÉ?r vÉ? ünvanlar</string>
-  <string name="pref_entrance_node_dialog">GiriÅ? KÉ?siÅ?mÉ?lÉ?rini Æ?lavÉ? et</string>
-  <string name="pref_allow_background_starts_title">Arxa fonun iÅ?É? baÅ?lamasına icazÉ? verin</string>
-  <string name="pref_allow_background_starts_summary">Qoy hÉ?r-hansı tÉ?tbiqetmÉ? Orbota Tor vÉ? É?laqÉ?li xidmÉ?tlÉ?ri iÅ?É? salmalı olduÄ?unu desin</string>
-  <string name="button_proxy_all">HÉ?r Å?eyi proksilÉ?
-</string>
-  <string name="button_proxy_none">Heç nÉ?yi proksilÉ?mÉ?</string>
-  <string name="button_invert_selection">Seçiminin yerini dÉ?yiÅ?</string>
-  <string name="pref_proxy_title">Ä°xrac EdilÉ?n Å?É?bÉ?kÉ? Proksisi (istÉ?yÉ? baÄ?lı)</string>
-  <string name="pref_proxy_type_title">Ä°xrac EdilÉ?n Proksi Növü</string>
-  <string name="pref_proxy_type_summary">Proksi serveri istifadÉ? etmÉ?k üçün protokol: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Proksi Növünü Daxil Et</string>
-  <string name="pref_proxy_host_title">Ä°xrac EdilÉ?n Proksi Hostu</string>
-  <string name="pref_proxy_host_summary">Proksi Server host adı</string>
-  <string name="pref_proxy_host_dialog">Proksi Hostu Daxil Et</string>
-  <string name="pref_proxy_port_title">Ä°xrac EdilÉ?n Proksi Port</string>
-  <string name="pref_proxy_port_summary">Proksi Server portu</string>
-  <string name="pref_proxy_port_dialog">Proksi portu daxil et</string>
-  <string name="pref_proxy_username_title">Ä°xrac EdilÉ?n Proxy Ä°stifadÉ?çi Adı</string>
-  <string name="pref_proxy_username_summary">Proksi Ä°stifadÉ?çi Adı (istÉ?yÉ? baÄ?lı)</string>
-  <string name="pref_proxy_username_dialog">Proksi Ä°stifadÉ?çi Adı Daxil Et</string>
-  <string name="pref_proxy_password_title">Ä°xrac EdilÉ?n Proksi Å?ifrÉ?</string>
-  <string name="pref_proxy_password_summary">Proksi Å?ifrÉ? (istÉ?yÉ? baÄ?lı)</string>
-  <string name="pref_proxy_password_dialog">Proksi Å?ifrÉ? Daxil et</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tam Å?É?ffaf proksilÉ?mÉ?nin quraÅ?dırılması...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Aplikasiya É?saslı Å?É?ffaf proksilÉ?mÉ?nin quraÅ?dırılması...</string>
-  <string name="transparent_proxying_enabled">Å?É?ffaf proksilÉ?mÉ? AKTÄ°VLÆ?Å?DÄ°RÄ°LDÄ°</string>
-  <string name="transproxy_enabled_for_tethering_">BaÄ?lanma üçün TransProksi aktivlÉ?Å?dirildi!</string>
-  <string name="warning_error_starting_transparent_proxying_">TÆ?HLÃ?KÆ?: Å?É?ffaf proksilÉ?mÉ?nin baÅ?lanmasında xÉ?ta!</string>
-  <string name="transproxy_rules_cleared">TransProksi qaydalar tÉ?mizlÉ?ndi</string>
-  <string name="couldn_t_start_tor_process_">Tor prosesi baÅ?lana bilmÉ?di:</string>
-  <string name="privoxy_is_running_on_port_">Polipo portda iÅ?lÉ?yir</string>
-  <string name="setting_up_port_based_transparent_proxying_">Porta É?saslanmıÅ? proksilÉ?mÉ?nin quraÅ?dırılması...</string>
-  <string name="bridge_error">Körpü XÉ?tası</string>
-  <string name="bridge_requires_ip">Körpü funksiyasını istifadÉ? etmÉ?k üçün É?n azı bir körpü IP ünvanı É?lavÉ? etmÉ?lisÉ?n.</string>
-  <string name="send_email_for_bridges">Gmail hesabından bridges@xxxxxxxxxxxxxx ünvanına mÉ?tn hissÉ?sindÉ? \"körpü É?ldÉ? et\" sözlÉ?ri yazılmaqla mÉ?ktub göndÉ?r.</string>
-  <string name="error">XÉ?ta</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">SÉ?nin Æ?lçatanÃ?nvanlar seçimin istisnaya sÉ?bÉ?b oldu!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor prosesi baÅ?lana bilmÉ?di:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">SÉ?nin Æ?lçatanÃ?nvanlar seçimin istisnaya sÉ?bÉ?b oldu!</string>
   <string name="your_relay_settings_caused_an_exception_">SÉ?nin keçid seçimlÉ?rin istisnaya sÉ?bÉ?b oldu!</string>
-  <string name="exit_nodes">KÉ?siÅ?mÉ?lÉ?ri Xaric Et</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son sıçrayıÅ? üçün barmaq izlÉ?ri, niÅ?anlar, ölkÉ?lÉ?r vÉ? ünvanlar</string>
-  <string name="enter_exit_nodes">Ã?ıxıÅ? KÉ?siÅ?mÉ?lÉ?rini Daxil Et</string>
-  <string name="exclude_nodes">KÉ?siÅ?mÉ?lÉ?ri Xaric Et</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ä°xrac üçün barmaq izlÉ?ri, niÅ?anlar, ölkÉ?lÉ?r vÉ? ünvanlar</string>
-  <string name="enter_exclude_nodes">Ä°xrac KÉ?siÅ?mÉ?lÉ?rini Daxil Et</string>
-  <string name="strict_nodes">KÉ?skin KÉ?siÅ?mÉ?lÉ?r</string>
-  <string name="use_only_these_specified_nodes">*Yalnız* bu xüsusi kÉ?siÅ?mÉ?lÉ?ri istifadÉ? et</string>
-  <string name="bridges">KörpülÉ?r</string>
-  <string name="use_bridges">Körpü Ä°stifadÉ? Et</string>
-  <string name="bridges_obfuscated">Ã?aÅ?dırıcı KörpülÉ?r</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor Å?É?bÉ?kÉ?sinÉ? alternativ giriÅ? kÉ?siÅ?mÉ?lÉ?rini aktivlÉ?Å?dir</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">QuraÅ?dırılmıÅ? körpülÉ?r çaÅ?dırıcı körpülÉ?r olsa, aktivlÉ?Å?dir</string>
-  <string name="ip_address_and_port_of_bridges">KörpülÉ?rin IP ünvanı vÉ? portu</string>
-  <string name="enter_bridge_addresses">Körpü �nvanlarını Daxil et</string>
-  <string name="relays">KeçidlÉ?r</string>
-  <string name="relaying">KeçidlÉ?mÉ?</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Cihazının son-keçid funksiyasını aktivlÉ?Å?dir</string>
-  <string name="relay_port">Keçid Portu</string>
-  <string name="listening_port_for_your_tor_relay">Tor keçidin üçün portun dinlÉ?nmÉ?si</string>
-  <string name="enter_or_port">OR port daxil et</string>
-  <string name="relay_nickname">Keçid adı</string>
-  <string name="the_nickname_for_your_tor_relay">Tor keçidin üçün ad</string>
-  <string name="enter_a_custom_relay_nickname">Ä°lkin keçidÉ? ad daxil et</string>
-  <string name="reachable_addresses">Æ?lçatan Ã?nvanlar</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">MÉ?hdudlaÅ?mıÅ? siyasÉ?tlÉ? qoruyucu divar arxasındakı müÅ?tÉ?ri kimi iÅ?lÉ?t</string>
-  <string name="reachable_ports">Æ?lçatan portlar</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">MÉ?hdudlaÅ?dırılmıÅ? qoruyucu divar arxasında É?lçatan portlar</string>
-  <string name="enter_ports">Port daxil et</string>
-  <string name="enable_hidden_services">Gizli XidmÉ?t Hostinqi</string>
-  <string name="run_servers_accessible_via_the_tor_network">cihaz serverinin Tor Å?É?bÉ?kÉ?si tÉ?rÉ?findÉ?nÉ?ldÉ? edilÉ?n olmasına icazÉ? ver</string>
-  <string name="enter_localhost_ports_for_hidden_services">gizli xidmÉ?tlÉ?r üçün yerlihost portlarını daxil et</string>
-  <string name="hidden_service_ports">Gizli XidmÉ?t Portları</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">gizli xidmÉ?tin üçün ünvanlanan ad (avtomatik hazırlanmıÅ?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">mÉ?hsul üçün sazlama giriÅ?i daxil et (baxmaq üçün adb vÉ? ya aLogCat istifadÉ? etmÉ?lisÉ?n)</string>
-  <string name="project_home">LayihÉ? Evi(lÉ?ri):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor Lisenziyası</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">XidmÉ?ti QuraÅ?dırma:</string>
-  <string name="tor_version">
-Tor: https://www.torproject.org</string>
-  <string name="libevent_version">
-LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">SSL-i aç v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Aplikasiya Tor Å?É?bÉ?kÉ?sinÉ? %S gizli server portu açmaq istÉ?yir. Aplikasiyaya inandıÄ?ın halda bu tÉ?hlükÉ?sizdir.</string>
-  <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
+    <string name="found_existing_tor_process">mövcud Tor prosesi tapıldı...</string>
   <string name="something_bad_happened">NÉ? isÉ? pis bir Å?ey oldu. GiriÅ?i yoxla</string>
-  <string name="hidden_service_on">burada gizli xidmÉ?ti:</string>
-  <string name="unable_to_read_hidden_service_name">gizli xidmÉ?t adını oxumaÄ?ı deaktivlÉ?Å?dir</string>
+    <string name="unable_to_read_hidden_service_name">gizli xidmÉ?t adını oxumaÄ?ı deaktivlÉ?Å?dir</string>
   <string name="unable_to_start_tor">Tor-un baÅ?lanmasını dayandır:</string>
-  <string name="unable_to_reset_tor">Cihazınızı yenidÉ?n yüklÉ?yin, Toru bÉ?rpa etmÉ?k olmur!</string>
-  <string name="pref_use_sys_iptables_title">Mövcud Ipstol Ä°stifadÉ? Et</string>
-  <string name="pref_use_sys_iptables_summary">Orbotla baÄ?lanmıÅ? ipstol É?vÉ?zinÉ? daxili cüt ipstol istifadÉ? et</string>
-  <string name="error_installing_binares">Tor cütlüklÉ?ri quraÅ?dırıla vÉ? ya tÉ?kmillÉ?Å?dirilÉ? bilmÉ?di.</string>
-  <string name="pref_use_persistent_notifications">HÉ?miÅ?É? Orbot qoÅ?ulduÄ?u hallarda niÅ?anı alÉ?tlÉ?t panelindÉ? saxla</string>
-  <string name="pref_use_persistent_notifications_title">HÉ?miÅ?É? Açıq XÉ?bÉ?rdarlıqlar</string>
-  <string name="pref_use_expanded_notifications">Torla birlikdÉ? É?traflı bildiriÅ?i göstÉ?rib ölkÉ? vÉ? IP-dÉ?n çıxın. </string>
-  <string name="pref_use_expanded_notifications_title">Æ?traflı bildiriÅ?lÉ?r</string>
-  <string name="notification_using_bridges">KörpülÉ?r aktivlÉ?Å?dirildi!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Dil</string>
-  <string name="set_locale_summary">Orbot üçün dil standartlarını vÉ? dili seç</string>
-  <string name="wizard_locale_title">Dil Seç</string>
-  <string name="wizard_locale_msg">OlduÄ?u kimi saxla, ya da mövcud dilÉ? keç</string>
-  <string name="powered_by">Tor tÉ?rÉ?findÉ?n yaradılmıÅ?</string>
-  <string name="btn_save_settings">SeçimlÉ?ri Saxla</string>
-  <string name="no_internet_connection_tor">Ä°nternet yoxdur; Tor gözlÉ?yir</string>
-  <string name="bandwidth_">Ã?türmÉ? qabiliyyÉ?ti:</string>
-  <string name="down">aÅ?aÄ?ı</string>
-  <string name="up">yuxarı</string>
-  <string name="pref_disable_network_title">Avto-Yuxu Å?É?bÉ?kÉ?si Yoxdur</string>
-  <string name="pref_disable_network_summary">Ä°nternet olmadıqda icazÉ? ver Tor yatsın</string>
-  <string name="newnym">Yeni Tor oxÅ?arına qoÅ?uldun!</string>
-  <string name="menu_verify_browser">Bax</string>
-  <string name="menu_use_chatsecure">ChatSecure istifadÉ? et</string>
-  <string name="permission_manage_tor_label">Toru Ä°darÉ? Et</string>
-  <string name="permission_manage_tor_description">Tor xidmÉ?tini idarÉ? etmÉ?si üçün aplikasiyanı aktivlÉ?Å?dir</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">DeyÉ?sÉ?n Orfoxu quraÅ?dırmamısınız. Yardıma ehtiyacınız var, yoxsa yalnız brauzeri açmalıyıq?</string>
-  <string name="install_apps_">Aplikasiya quraÅ?dırılsın?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ä°nternetlÉ? É?laqÉ? yoxdur. Tor gözlÉ?mÉ? rejiminÉ? keçir...</string>
+    <string name="no_internet_connection_tor">Ä°nternet yoxdur; Tor gözlÉ?yir</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="wizard_tips_martus">Mobile Martus - Benetech Ä°nsan haqları SÉ?nÉ?dlÉ?ri tÉ?tbiqetmÉ?si</string>
-  <string name="your_tor_public_ips_">Sizin ictimai Tor Ä°P-lÉ?riniz</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotla baÄ?lı probleminiz varsa, lütfÉ?n, Android-&gt;Settings-&gt;Apps-dÉ? bu tÉ?tbiqetmÉ?ni söndürün;</string>
-  <string name="app_conflict">TÉ?tbiqetmÉ? konflikti</string>
-  <string name="pref_transproxy_refresh_title">Transproxy avtomatik yenilÉ?mÉ?</string>
-  <string name="pref_transproxy_refresh_summary">Å?É?bÉ?kÉ? vÉ?ziyyÉ?ti dÉ?yiÅ?É?ndÉ? Transproxy qaydalarını yenidÉ?n tÉ?tbiq edin</string>
-  <string name="pref_transproxy_flush_title">Transproxy MÆ?CBURÄ° POZMA</string>
-  <string name="pref_transproxy_flush_summary">Bütün transproxy Å?É?bÉ?kÉ? qaydalarını elÉ? Ä°NDÄ° lÉ?Ä?v etmÉ?k üçün bura kliklÉ?yin</string>
-  <string name="transparent_proxy_rules_flushed_">Transparent proksi qaydaları lÉ?Ä?v edildi</string>
-  <string name="you_do_not_have_root_access_enabled">Root giriÅ?iniz yoxdur</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">QuraÅ?dırma dÉ?yiÅ?ikliklÉ?rinin tÉ?tbiq edilmÉ?si üçün Orbota baÅ?lamaÄ?a vÉ? ya onu dayandırmaÄ?a ehtiyacınız ola bilÉ?r. </string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">KörpülÉ?r yenilÉ?ndi</string>
-  <string name="restart_orbot_to_use_this_bridge_">LütfÉ?n, Orbotu söndürün vÉ? yenidÉ?n yandırın ki, dÉ?yiÅ?ikliklÉ?r tÉ?tbiq edilsin.</string>
-  <string name="menu_qr">QR kodlar</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">SÉ?nin mobil Å?É?bÉ?kÉ?n Toru aktiv Å?É?kildÉ? É?ngÉ?llÉ?yirsÉ?,  Å?É?bÉ?kÉ?yÉ? daxil olmaq üçün KörpüdÉ?n istifadÉ? edÉ? bilÉ?rsÉ?n. KörpülÉ?ri aktivlÉ?Å?dirmÉ?k üçün yuxarıdakı körpü növlÉ?rindÉ?n birini SEÃ?.</string>
-  <string name="bridge_mode">Körpü rejimi</string>
-  <string name="get_bridges_email">Emeyl</string>
-  <string name="get_bridges_web">Veb</string>
-  <string name="activate">AktivlÉ?Å?dir</string>
-  <string name="apps_mode">TÉ?tbiqetmÉ?lÉ?r VPN Rejimi</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Tor Å?É?bÉ?kÉ?si vasitÉ?siylÉ? qoÅ?ulmaq üçün Android.\n\n*WARNING*-in VPN funksiyasından istifadÉ? edÉ?rÉ?k öz qurÄ?unda bütün tÉ?tbiqetmÉ?lÉ?ri aktivlÉ?Å?dirÉ? bilÉ?rsÉ?n. Bu, yeni, eksperimental funksiyadır vÉ? bÉ?zÉ?n avtomatik olaraq baÅ?lamaya, yaxud dayana bilÉ?r. Bundan anonimlik mÉ?qsÉ?diylÉ? istifadÉ? etmÉ?k OLMAZ, bundan YALNIZ  süzgÉ?c vÉ? qoruma divarlarından keçmÉ?k üçün istifadÉ? etmÉ?k lazımdır. </string>
-  <string name="send_email">Emeyl göndÉ?rin</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Körpü ünvanını siz emeyl vÉ? veb vasitÉ?siylÉ?, ya da körpünün QR kodunu skan etmÉ?klÉ? É?ldÉ? edÉ? bilÉ?rsiniz. Körpü ünvanı haqda sorÄ?unun altında  \'Email\'i, yaxud \'Web\'i seçin.\n\nÃ?nvanı É?ldÉ? edÉ?ndÉ?n sonra  &amp;amp-i nüsxÉ?lÉ?yin vÉ? onu Orbot quraÅ?dırmasındakı \"Bridges\" parametrinÉ? qoyun vÉ? cihazı yenidÉ?n yüklÉ?yin.</string>
-  <string name="install_orweb">Orfoxu quraÅ?dırın</string>
-  <string name="standard_browser">Standart Brauzer</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">QEYD: Intel X86/ATOM cihazlarında yalnız standart Tor körpülÉ?r iÅ?lÉ?yir.</string>
-  <string name="vpn_default_world">Dünya</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-bg/strings.xml b/orbotservice/src/main/res/values-bg/strings.xml
index fb0e1287..2d39773a 100644
--- a/orbotservice/src/main/res/values-bg/strings.xml
+++ b/orbotservice/src/main/res/values-bg/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Ð?Ñ?боÑ?</string>
   <string name="app_description">Orbot е безплаÑ?на пÑ?окÑ?и пÑ?огÑ?ама, коÑ?Ñ?о дава вÑ?зможноÑ?Ñ?а на дÑ?Ñ?ги пÑ?огÑ?ами да използваÑ? инÑ?еÑ?енÑ? по-Ñ?игÑ?Ñ?но. Orbot използва Tor, за да кÑ?ипÑ?иÑ?а Ð?нÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ика и Ñ?лед Ñ?ова го Ñ?кÑ?ива каÑ?о пÑ?епÑ?аÑ?а пÑ?ез нÑ?колко компÑ?Ñ?Ñ?Ñ?а по Ñ?елиÑ? Ñ?вÑ?Ñ?. Tor е безплаÑ?ен Ñ?оÑ?Ñ?Ñ?еÑ? и оÑ?воÑ?ена мÑ?ежа, коÑ?Ñ?о Ñ?и помага да Ñ?е пÑ?едпазиÑ? оÑ? Ñ?пиониÑ?ане по мÑ?ежаÑ?а, коеÑ?о заплаÑ?ва Ñ?воÑ?Ñ?а Ñ?вобода и лиÑ?но пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во, конÑ?иденÑ?иални бизнеÑ? оÑ?ноÑ?ение и вÑ?Ñ?зки, и оÑ? вид пÑ?авиÑ?елÑ?Ñ?вено Ñ?ледене наÑ?еÑ?ено Ñ?Ñ?аÑ?ик анализ.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ñ?Ñ?аÑ?Ñ?иÑ?ай и Ñ?Ñ?опиÑ?ай ТоÑ?</string>
-  <string name="tor_proxy_service_process">Tor пÑ?окÑ?и</string>
-  <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?Ñ?аÑ?Ñ?иÑ?а...</string>
+    <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?Ñ?аÑ?Ñ?иÑ?а...</string>
   <string name="status_activated">СвÑ?Ñ?зан кÑ?м ТоÑ? мÑ?ежаÑ?а</string>
   <string name="status_disabled">Ð?Ñ?боÑ? е деакÑ?ивиÑ?ан</string>
   <string name="status_shutting_down">TorService Ñ?пиÑ?а</string>
   <string name="tor_process_starting">СÑ?аÑ?Ñ?иÑ?ане на ТоÑ? клиенÑ?...</string>
   <string name="tor_process_complete">завÑ?Ñ?Ñ?ено.</string>
-  <string name="tor_process_waiting">изÑ?акване.</string>
-  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: ТÑ?аÑ?икÑ?Ñ? Ð?и не е анонимен! Ð?олÑ? конÑ?игÑ?Ñ?иÑ?айÑ?е пÑ?иложениÑ?Ñ?а Ñ?и да използваÑ? HTTP proxy 127.0.0.1:8118 или SOCKS4A или SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?аÑ?ало</string>
-  <string name="menu_browse">Ð?Ñ?елиÑ?Ñ?и</string>
-  <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
-  <string name="menu_log">Ð?ог</string>
-  <string name="menu_info">Ð?омоÑ?</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">СÑ?аÑ?Ñ?</string>
-  <string name="menu_stop">СÑ?оп</string>
-  <string name="menu_about">Ð?Ñ?ноÑ?но</string>
-  <string name="menu_promo_apps">Ð?зÑ?егли пÑ?иложениÑ?...</string>
-  <string name="main_layout_download">Ð?зÑ?егли</string>
-  <string name="main_layout_upload">Ð?аÑ?и</string>
-  <string name="button_help">Ð?омоÑ?</string>
-  <string name="button_close">Ð?аÑ?воÑ?и</string>
-  <string name="button_about">Ð?Ñ?ноÑ?но</string>
-  <string name="button_clear_log">Ð?зÑ?иÑ?Ñ?и лог</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Ð?зÑ?од</string>
-  <string name="menu_scan">СканиÑ?ай BridgeQR</string>
-  <string name="menu_share_bridge">Сподели BridgeQR</string>
-  <string name="press_to_start">- за Ñ?Ñ?аÑ?Ñ? наÑ?иÑ?ни и задÑ?Ñ?ж -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и (Ð?зиÑ?ква Root)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?но пÑ?екаÑ?ване на пÑ?иложениÑ?Ñ?а пÑ?ез ТоÑ?</string>
-  <string name="pref_transparent_all_title">Ð?Ñ?иÑ?ко пÑ?ез ТоÑ?</string>
-  <string name="pref_transparent_all_summary">Ð?Ñ?еÑ?вÑ?Ñ?лÑ?й пÑ?ез ТоÑ? Ñ?Ñ?аÑ?ика на вÑ?иÑ?ки пÑ?иложениÑ?</string>
-  <string name="pref_transparent_port_fallback_title">ТоÑ? пÑ?окÑ?и Ñ?Ñ?лÑ?гаÑ?а Ñ?мени поÑ?Ñ?а</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аобикалÑ? Ñ?Ñ?андаÑ?Ñ?ниÑ?е поÑ?Ñ?ове(80, 443, Ñ?.н.). *Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? СÐ?Ð?Ð?* ако Ñ?ежимиеÑ?е \'Ð?Ñ?иÑ?ки\' или \'Ð?Ñ?огÑ?ама\' не Ñ?абоÑ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпиÑ?Ñ?к поÑ?Ñ?ове</string>
-  <string name="pref_transparent_port_summary">СпиÑ?Ñ?к Ñ? поÑ?Ñ?овеÑ?е, на коиÑ?о да Ñ?е ползва пÑ?окÑ?и. *Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? СÐ?Ð?Ð?* ако Ñ?ежимиеÑ?е \'Ð?Ñ?иÑ?ки\' или \'Ð?Ñ?огÑ?ама\' не Ñ?абоÑ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?Ñ?веди поÑ?Ñ?ове на пÑ?окÑ?и</string>
-  <string name="pref_has_root">Ð?зиÑ?квай Root доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?зиÑ?квай root доÑ?Ñ?Ñ?п за пÑ?озÑ?аÑ?но пÑ?окÑ?и</string>
-  <string name="status_install_success">ТоÑ? е Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ан!</string>
-  <string name="status_install_fail">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не Ñ?а инÑ?Ñ?алиÑ?ани. Ð?олÑ? пÑ?овеÑ?еÑ?е лога и Ñ?ведомеÑ?е tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?еÑ?ка в пÑ?иложениеÑ?о</string>
-  <string name="wizard_title">Ð?Ñ?боÑ?</string>
-  <string name="wizard_btn_tell_me_more">Ð?Ñ?ноÑ?но Ð?Ñ?боÑ?</string>
-  <string name="btn_next">СледваÑ?</string>
-  <string name="btn_back">Ð?бÑ?аÑ?но</string>
-  <string name="btn_finish">Ð?Ñ?ай</string>
-  <string name="btn_okay">Ð?Ð?</string>
-  <string name="btn_cancel">Ð?Ñ?кажи</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Ð?Ñ?кои Ð?Ñ?боÑ? деÑ?айли</string>
-  <string name="wizard_details_msg">Orbot е пÑ?иложение Ñ? оÑ?воÑ?ен код, коеÑ?о Ñ?Ñ?дÑ?Ñ?жа Tor, LibEvent и Polipo. То пÑ?едлага локално HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) кÑ?м Tor мÑ?ежаÑ?а. Orbot Ñ?Ñ?Ñ?о Ñ?ака има вÑ?зможноÑ?Ñ?а, на Ñ?Ñ?Ñ?ойÑ?Ñ?ва Ñ? root доÑ?Ñ?Ñ?п, да пÑ?епÑ?аÑ?а Ñ?елиÑ?Ñ? инÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ик пÑ?ез Tor.</string>
-  <string name="wizard_permissions_root">Ð?Ñ?аваÑ?а дадени</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?аÑ?Ñ?коÑ?ме, Ñ?е имаÑ?е root пÑ?ава доÑ?Ñ?Ñ?пни за Ð?Ñ?боÑ?. Ще използваме Ñ?ази Ñ?ила Ñ?азÑ?мно.</string>
-  <string name="wizard_permissions_msg_stock"> Ð?Ñ?пÑ?еки Ñ?е не е задÑ?лжиÑ?елно, Ð?Ñ?боÑ? може да Ñ?Ñ?ане по-моÑ?но пÑ?иложение ако има root доÑ?Ñ?Ñ?п. Ð?зползвайÑ?е бÑ?Ñ?она долÑ? за да дадеÑ?е на Ð?Ñ?боÑ? Ñ?Ñ?пеÑ?Ñ?или!</string>
-  <string name="wizard_permissions_no_root">Ð?ко нÑ?маÑ?е root доÑ?Ñ?Ñ?п или не знаеÑ?е за какво Ñ?Ñ?ава вÑ?пÑ?оÑ?, пÑ?оÑ?Ñ?о използвайÑ?е пÑ?иложениÑ? напÑ?авени да Ñ?абоÑ?Ñ?Ñ? Ñ? Ð?Ñ?боÑ?.</string>
-  <string name="wizard_permissions_consent">РазбиÑ?ам и иÑ?кам да пÑ?одÑ?лжа без СÑ?пеÑ?поÑ?Ñ?ебиÑ?ел</string>
-  <string name="wizard_permission_enable_root">РазÑ?еÑ?и Root за Ð?Ñ?боÑ?</string>
-  <string name="wizard_configure">Ð?аÑ?Ñ?Ñ?ой ТоÑ?иÑ?икаÑ?иÑ?Ñ?а</string>
-  <string name="wizard_configure_msg">Ð?Ñ?боÑ? Ð?и дава вÑ?зможноÑ?Ñ? да пÑ?екаÑ?аÑ?е вÑ?иÑ?киÑ? Ñ?Ñ?аÑ?ик пÑ?ез ТоÑ? или да избеÑ?еÑ?е пÑ?иложениÑ? по оÑ?делно.</string>
-  <string name="wizard_configure_all">Ð?Ñ?екаÑ?ай вÑ?иÑ?ки пÑ?иложениÑ? пÑ?ез ТоÑ?</string>
-  <string name="wizard_configure_select_apps">Ð?збеÑ?и оÑ?делни пÑ?иложениÑ? за ТоÑ?</string>
-  <string name="wizard_tips_tricks">Ð?оддÑ?Ñ?жани оÑ? Ð?Ñ?боÑ? пÑ?иложениÑ?</string>
-  <string name="wizard_tips_msg">Ð?Ñ?иложениÑ?Ñ?а по-долÑ? Ñ?а Ñ?Ñ?здадени Ñ?ака, Ñ?е да Ñ?абоÑ?Ñ?Ñ? Ñ? Ð?Ñ?боÑ?. ЦÑ?кни на вÑ?еки бÑ?Ñ?он, за да инÑ?Ñ?алиÑ?аÑ? Ñ?ега или може да ги намеÑ?иÑ? по-кÑ?Ñ?но в Ð?ндÑ?оид маÑ?кеÑ?.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?Ñ?ипÑ?иÑ?ан Ñ?аÑ? пÑ?огÑ?ама за Ð?ндÑ?оид</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Ð?аÑ?Ñ?еÑ?е как да конÑ?игÑ?Ñ?иÑ?аÑ?е пÑ?иложениÑ? да Ñ?абоÑ?Ñ?Ñ? пÑ?ез Ð?Ñ?боÑ?</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ТÑ?Ñ?Ñ?аÑ?ка</string>
-  <string name="wizard_tips_twitter">Ð?аглаÑ?еÑ?е пÑ?окÑ?иÑ?о на Twitter на \"localhost\" и поÑ?Ñ? 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - СÑ?здай иÑ?Ñ?оÑ?иÑ? и оÑ?Ñ?ави Ñ?игÑ?Ñ?ноÑ?Ñ?а на tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?Ñ?окÑ?и наÑ?Ñ?Ñ?ойки</string>
-  <string name="wizard_proxy_help_msg">Ð?ко Ð?ндÑ?оид пÑ?иложениеÑ?о, коеÑ?о използваÑ? поддÑ?Ñ?жа HTTP или SOCKS пÑ?окÑ?и, Ñ?огава мжоеÑ? да го конÑ?игÑ?Ñ?иÑ?аÑ? да Ñ?е Ñ?вÑ?Ñ?зва Ñ? Orbot и да използва Tor.\n\n\nÐ?аÑ?Ñ?ойкиÑ?е Ñ?а host 127.0.0.1 или \"localhost\". Ð?а HTTP, поÑ?Ñ?Ñ?Ñ? е 8118. Ð?а SOCKS пÑ?окÑ?иÑ?о е 9050. Ð?ай-добÑ?е е по вÑ?зможноÑ?Ñ? да Ñ?е използва SOCKS4A или SOCKS5.\n\n\n\nÐ?ожеÑ? да наÑ?Ñ?иÑ? повеÑ?е за пÑ?окÑ?иÑ?аÑ?а в Ð?ндÑ?оид пÑ?ез Ñ?Ñ?Ñ?анÑ?иÑ?а Ñ? вÑ?пÑ?оÑ?и и оÑ?говоÑ?и: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Ð?Ñ?боÑ? е гоÑ?ов!</string>
-  <string name="wizard_final_msg">Ð?илиони Ñ?оÑ?а по Ñ?веÑ?а използваÑ? Tor по голÑ?м бÑ?ой пÑ?иÑ?ини.\n\nÐ?Ñ?Ñ?налиÑ?Ñ?и и блогÑ?Ñ?и, заÑ?иÑ?ниÑ?и на Ñ?овеÑ?киÑ?е пÑ?ава, оÑ?ганиÑ?е на Ñ?еда, войниÑ?и, коÑ?поÑ?аÑ?ии, гÑ?аждани на дÑ?Ñ?жави Ñ? Ñ?епÑ?еÑ?ивни Ñ?ежими, и най-обикновени гÑ?аждани... а Ñ?ега и Ñ?и!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?олÑ?, наÑ?Ñ?Ñ?ой Orbot пÑ?еди да поÑ?неÑ? да го използваÑ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">УÑ?пеÑ?н Ñ?е Ñ?вÑ?Ñ?заÑ?Ñ?е Ñ? Tor мÑ?ежаÑ?а - Ñ?ова Ð?Ð? знаÑ?и, Ñ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ð?и е пÑ?едпазено. Ð?оже да използваÑ?е \'Ð?Ñ?аÑ?зÑ?Ñ?\' бÑ?Ñ?она да Ñ?еÑ?Ñ?ваÑ?е вÑ?Ñ?зкаÑ?а. \n\nÐ?Ñ?идеÑ?е на https://guardianproject.info/apps/orbot или изпÑ?аÑ?еÑ?е имейл на help@xxxxxxxxxxxxxxxxxxxx, за да наÑ?Ñ?иÑ?е повеÑ?е.</string>
-  <string name="tor_check">Това Ñ?е Ñ?е заведе на https://check.torproject.org, за да пÑ?овеÑ?и дали Orbot е пÑ?авилно наÑ?Ñ?Ñ?оен и дали Ñ?и Ñ?вÑ?Ñ?зан Ñ? TоÑ?.</string>
-  <string name="pref_hs_group">СкÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="pref_general_group">Ð?лавни</string>
-  <string name="pref_start_boot_title">СÑ?аÑ?Ñ?иÑ?ай Ð?Ñ?боÑ? пÑ?и Ñ?Ñ?аÑ?Ñ?иÑ?ане на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о</string>
-  <string name="pref_start_boot_summary">Ð?вÑ?омаÑ?иÑ?но Ñ?Ñ?аÑ?Ñ?иÑ?ай Ð?Ñ?боÑ? и Ñ?е Ñ?вÑ?Ñ?жи кÑ?м ТоÑ? когаÑ?о Ñ?воеÑ?о Ð?ндÑ?оид Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во Ñ?Ñ?аÑ?Ñ?иÑ?а</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Ð?Ñ?боÑ? дава доÑ?Ñ?Ñ?п до Tor пÑ?ез Android!\n\nTor Ñ?и помага да Ñ?е пÑ?едпазиÑ? оÑ? Ñ?илÑ?Ñ?иÑ?ане на инÑ?еÑ?неÑ?Ñ?Ñ?, анализ на Ñ?Ñ?аÑ?ика и подÑ?лÑ?Ñ?ване по инÑ?еÑ?неÑ? вÑ?иÑ?ки, оÑ? коиÑ?о заплаÑ?ваÑ? лиÑ?ноÑ?о Ñ?и пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во, конÑ?иденÑ?иалнаÑ?а Ñ?и инÑ?оÑ?маÑ?иÑ? и лиÑ?ниÑ?е Ñ?и вÑ?Ñ?зки.\n\nТози Ñ?Ñ?Ñ?пка по Ñ?Ñ?Ñ?пка наÑ?Ñ?Ñ?ни Ñ?е Ñ?и помогне да наÑ?Ñ?Ñ?оиÑ? Orbot и Tor на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?нимание</string>
-  <string name="wizard_warning_msg">СамоÑ?о инÑ?Ñ?алиÑ?ане на Orbot нÑ?ма авÑ?омаÑ?иÑ?но да анонимизиÑ?а мобилниÑ? Ñ?и Ñ?Ñ?аÑ?ик.\n\nТÑ?Ñ?бва да наÑ?Ñ?Ñ?оиÑ? Orbot, Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и и дÑ?Ñ?ги пÑ?иложениÑ?, за да ползваÑ? Tor Ñ?Ñ?пеÑ?но.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?Ñ?ава</string>
-  <string name="wizard_permissions_root_msg1">Ð?ко желаеÑ? може да Ñ?азÑ?еÑ?иÑ? на Orbot \'Superuser\' пÑ?ава, за да вклÑ?Ñ?иÑ? допÑ?лниÑ?елни Ñ?Ñ?нкиÑ?ии, каÑ?о Ð?Ñ?озÑ?аÑ?но Ð?Ñ?окÑ?иÑ?иÑ?иÑ?ане.</string>
-  <string name="wizard_permissions_root_msg2">Ð?ко не желаеÑ? Ñ?ова Ñ?е Ñ?веÑ?и, Ñ?е пÑ?огÑ?амиÑ?е, коиÑ?о Ñ?е използваÑ? Ñ?а Ñ?Ñ?вмеÑ?Ñ?ими Ñ? Orbot </string>
-  <string name="wizard_permissions_no_root_msg">УÑ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и не изглежда да има или пÑ?едлага root или Ñ?ака наÑ?еÑ?ениÑ? \'СÑ?пеÑ?поÑ?Ñ?ебиÑ?елÑ?ки\' доÑ?Ñ?Ñ?п.\n\nÐ?олÑ?, използвай Ñ?ежидÑ?мÑ?Ñ? \'Ð?Ñ?иложениÑ?\' на главниÑ? екÑ?ан.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?Ñ?иложениÑ? пÑ?ез Ð?Ñ?боÑ?</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ð?Ñ?ипÑ?иÑ?ана Ñ?аÑ? пÑ?огÑ?ама Ñ? подÑ?Ñ?жка на Off-the-Record енкÑ?ипÑ?иÑ?.</string>
-  <string name="wizard_tips_orweb">Orfox: Ð?Ñ?аÑ?зÑ?Ñ? Ñ? наÑ?оÑ?еноÑ?Ñ? кÑ?м оÑ?игÑ?Ñ?Ñ?ване на лиÑ?ноÑ?о пÑ?оÑ?Ñ?Ñ?анÑ?Ñ?во, койÑ?о Ñ?абоÑ?и пÑ?ез Tor</string>
-  <string name="wizard_tips_play">Ð?амеÑ?и вÑ?ики Guardin Project пÑ?огÑ?ами в Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?амеÑ?и вÑ?иÑ?ки пÑ?иложениÑ? на Guardian Project в F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?амеÑ?и вÑ?иÑ?ки Guardian Project пÑ?иложениÑ? на https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и</string>
-  <string name="wizard_transproxy_msg">Това позволÑ?ва на пÑ?иложениÑ?Ñ?а Ð?и авÑ?омаÑ?иÑ?но да използваÑ? мÑ?ежаÑ?а на ТоÑ? без никаква конÑ?игÑ?Ñ?аÑ?иÑ?.</string>
-  <string name="wizard_transproxy_hint">(Ð?збеÑ?и Ñ?ази опÑ?иÑ? ако нÑ?маÑ? пÑ?едÑ?Ñ?ава за какво Ñ?Ñ?ава вÑ?пÑ?оÑ?)</string>
-  <string name="wizard_transproxy_none">Ð?иÑ?о</string>
-  <string name="pref_transparent_tethering_title">ТеÑ?Ñ?Ñ?инг пÑ?ез ТоÑ?</string>
-  <string name="pref_transparent_tethering_summary">Ð?клÑ?Ñ?и Ð?Ñ?озÑ?аÑ?но ТоÑ? Ð?Ñ?окÑ?иÑ?иÑ?иÑ?ане пÑ?ез Wi-Fi и USB (изиÑ?ква Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?ване)</string>
-  <string name="button_grant_superuser">Ð?зиÑ?кай доÑ?Ñ?Ñ?п на СÑ?пеÑ?поÑ?Ñ?ебиÑ?ел</string>
-  <string name="pref_select_apps">Ð?збеÑ?и пÑ?иложениÑ?</string>
-  <string name="pref_select_apps_summary">Ð?збÑ?еÑ?и пÑ?иложениÑ? за използване пÑ?ез ТоÑ?</string>
-  <string name="pref_node_configuration">Ð?аÑ?Ñ?Ñ?ойки на node-а</string>
-  <string name="pref_node_configuration_summary">Това Ñ?а допÑ?лниÑ?елни наÑ?Ñ?Ñ?ойки, коиÑ?о могаÑ? да намалÑ?Ñ? Ð?аÑ?аÑ?а анонимноÑ?Ñ?</string>
-  <string name="pref_entrance_node">Ð?Ñ?одÑ?Ñ?и Ñ?оÑ?ки</string>
-  <string name="pref_entrance_node_summary">Ð?Ñ?пеÑ?аÑ?Ñ?Ñ?и, никÑ?ове, дÑ?Ñ?жави и адÑ?еÑ?и за пÑ?Ñ?виÑ? Ñ?кок</string>
-  <string name="pref_entrance_node_dialog">Ð?Ñ?веди вÑ?одÑ?Ñ?и Ñ?оÑ?ки</string>
-  <string name="pref_allow_background_starts_title">РазÑ?еÑ?и Ñ?иÑ?о Ñ?Ñ?аÑ?Ñ?иÑ?ане</string>
-  <string name="pref_allow_background_starts_summary">РазÑ?еÑ?и на вÑ?Ñ?ко пÑ?иложение да иÑ?ка оÑ? Orbot да Ñ?Ñ?аÑ?Ñ?иÑ?а Tor Ñ?Ñ?лÑ?ги</string>
-  <string name="button_proxy_all">Ð?Ñ?окÑ?и за вÑ?иÑ?ки</string>
-  <string name="button_proxy_none">Ð?Ñ?окÑ?и за ниÑ?о една</string>
-  <string name="button_invert_selection">Ð?бÑ?Ñ?ни Ñ?елекÑ?иÑ?Ñ?а</string>
-  <string name="pref_proxy_title">Ð?зÑ?одÑ?Ñ?о Ð?Ñ?ежово Ð?Ñ?окÑ?и (Ð?езадÑ?лжиÑ?елно)</string>
-  <string name="pref_proxy_type_title">Тип пÑ?окÑ?и</string>
-  <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол за пÑ?окÑ?и Ñ?Ñ?Ñ?вÑ?Ñ?: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Тип на вÑ?одÑ?Ñ?о пÑ?окÑ?и</string>
-  <string name="pref_proxy_host_title">Ð?Ñ?окÑ?и Ñ?оÑ?Ñ?</string>
-  <string name="pref_proxy_host_summary">Ð?дÑ?еÑ?а на Ð?Ñ?окÑ?и СÑ?Ñ?вÑ?Ñ?Ñ?Ñ?</string>
-  <string name="pref_proxy_host_dialog">Ð?Ñ?веди пÑ?окÑ?и Ñ?оÑ?Ñ?</string>
-  <string name="pref_proxy_port_title">Ð?оÑ?Ñ? на пÑ?окÑ?и</string>
-  <string name="pref_proxy_port_summary">Ð?оÑ?Ñ?а на Ð?Ñ?окÑ?и СÑ?Ñ?вÑ?Ñ?Ñ?Ñ?</string>
-  <string name="pref_proxy_port_dialog">Ð?Ñ?веди пÑ?окÑ?и поÑ?Ñ?</string>
-  <string name="pref_proxy_username_title">Ð?зÑ?одÑ?Ñ? Ð?Ñ?окÑ?и Ð?оÑ?Ñ?ебиÑ?елÑ?ко Ð?ме</string>
-  <string name="pref_proxy_username_summary">Ð?Ñ?окÑ?и Ð?оÑ?Ñ?ебиÑ?елÑ?ко Ð?ме (Ð?езадÑ?лжиÑ?елно)</string>
-  <string name="pref_proxy_username_dialog">Ð?Ñ?веди Ð?Ñ?окÑ?и Ð?оÑ?Ñ?ебиÑ?елÑ?ко Ð?ме</string>
-  <string name="pref_proxy_password_title">Ð?зÑ?одÑ?Ñ?а Ð?Ñ?окÑ?и Ð?аÑ?ола</string>
-  <string name="pref_proxy_password_summary">Ð?Ñ?окÑ?и Ð?аÑ?ола (Ð?езадÑ?лжиÑ?елно)</string>
-  <string name="pref_proxy_password_dialog">Ð?Ñ?веди Ð?Ñ?окÑ?и Ð?аÑ?ола</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на напÑ?лно пÑ?озÑ?аÑ?но пÑ?окÑ?и...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?окÑ?и на база пÑ?иложение...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?озÑ?аÑ?но пÑ?окÑ?и Ð?Ð?ТÐ?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy е вклÑ?Ñ?ен за ТеÑ?Ñ?Ñ?инг!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: гÑ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?оÑ?ки!</string>
-  <string name="transproxy_rules_cleared">TransProxy пÑ?авила изÑ?иÑ?Ñ?ени</string>
-  <string name="couldn_t_start_tor_process_">Ð?еÑ?Ñ?пеÑ?но Ñ?Ñ?аÑ?Ñ?иÑ?ане на ТоÑ? пÑ?оÑ?еÑ?: </string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?абоÑ?и на поÑ?Ñ?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?онÑ?игÑ?Ñ?иÑ?ане на пÑ?озÑ?аÑ?но пÑ?окÑ?и на база поÑ?Ñ?...</string>
-  <string name="bridge_error">Ð?Ñ?идж гÑ?еÑ?ка</string>
-  <string name="bridge_requires_ip">Ð?а да използваÑ?е бÑ?идж Ñ?Ñ?нкÑ?ионалноÑ?Ñ?Ñ?а Ñ?Ñ?Ñ?бва да вÑ?ведеÑ?е поне един IP адÑ?еÑ? на бÑ?идж.</string>
-  <string name="send_email_for_bridges">Ð?зпÑ?аÑ?и и-мейл до bridges@xxxxxxxxxxxxxx Ñ?Ñ?Ñ? Ñ?Ñ?дÑ?Ñ?жание \"get bridges\" в  и-мейл оÑ? акаÑ?нÑ? в gmail.</string>
-  <string name="error">Ð?Ñ?еÑ?ка</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">ТвоÑ?Ñ?а ReachableAddresses наÑ?Ñ?Ñ?ойка пÑ?едизвика гÑ?еÑ?ка!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ð?еÑ?Ñ?пеÑ?но Ñ?Ñ?аÑ?Ñ?иÑ?ане на ТоÑ? пÑ?оÑ?еÑ?: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">ТвоÑ?Ñ?а ReachableAddresses наÑ?Ñ?Ñ?ойка пÑ?едизвика гÑ?еÑ?ка!</string>
   <string name="your_relay_settings_caused_an_exception_">ТвоиÑ?е наÑ?Ñ?Ñ?ойки за пÑ?епÑ?аÑ?ане пÑ?едизвикаÑ?а изклÑ?Ñ?ение!</string>
-  <string name="exit_nodes">Ð?зÑ?одни Ñ?оÑ?ки</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ð?Ñ?пеÑ?аÑ?Ñ?Ñ?и, никÑ?ове, дÑ?Ñ?жави и адÑ?еÑ?и за поÑ?ледниÑ? Ñ?кок</string>
-  <string name="enter_exit_nodes">Ð?Ñ?веди изÑ?одни Ñ?оÑ?ки</string>
-  <string name="exclude_nodes">Ð?е ползвай Node-ве</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ð?Ñ?пеÑ?аÑ?Ñ?Ñ?и, никÑ?ове, дÑ?Ñ?жави и адÑ?еÑ?и, коиÑ?о да не бÑ?даÑ? ползвани</string>
-  <string name="enter_exclude_nodes">Ð?Ñ?ай</string>
-  <string name="strict_nodes">Ð?адÑ?лжиÑ?елни Node-we</string>
-  <string name="use_only_these_specified_nodes">Ð?зползвай *Ñ?амо* избÑ?оениÑ?е node-ве</string>
-  <string name="bridges">Ð?Ñ?иджове</string>
-  <string name="use_bridges">Ð?зползвай Ð?Ñ?иджове</string>
-  <string name="bridges_obfuscated">СкÑ?иÑ?и Ð?оÑ?Ñ?ове</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?клÑ?Ñ?и алÑ?еÑ?наÑ?ивени вÑ?одÑ?Ñ?и node-ве в Tor Ð?Ñ?ежаÑ?а</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?клÑ?Ñ?и ако наÑ?Ñ?Ñ?оениÑ?е моÑ?Ñ?ове Ñ?а Ñ?кÑ?иÑ?и моÑ?Ñ?ове</string>
-  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ? и поÑ?Ñ? на бÑ?иджове</string>
-  <string name="enter_bridge_addresses">Ð?Ñ?веди адÑ?еÑ?и на бÑ?иджове</string>
-  <string name="relays">Ð?Ñ?епÑ?аÑ?аÑ?и(Relays)</string>
-  <string name="relaying">Ð?Ñ?епÑ?аÑ?ане</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">РазÑ?еÑ?и Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и да бÑ?де не изÑ?оден пÑ?епÑ?аÑ?аÑ?</string>
-  <string name="relay_port">Ð?оÑ?Ñ? за Ð?Ñ?епÑ?аÑ?ане</string>
-  <string name="listening_port_for_your_tor_relay">Ð?оÑ?Ñ? за Ñ?лÑ?Ñ?ане на Ñ?воÑ? ТоÑ? пÑ?епÑ?аÑ?аÑ?</string>
-  <string name="enter_or_port">Ð?Ñ?веди OR поÑ?Ñ?</string>
-  <string name="relay_nickname">Ð?Ñ?Ñ?коÑ? на пÑ?епÑ?аÑ?аÑ?а</string>
-  <string name="the_nickname_for_your_tor_relay">Ð?Ñ?Ñ?коÑ? за Ñ?воÑ? Tor пÑ?епÑ?аÑ?аÑ?</string>
-  <string name="enter_a_custom_relay_nickname">Ð?Ñ?веди пÑ?Ñ?коÑ? за пÑ?епÑ?аÑ?аÑ?а</string>
-  <string name="reachable_addresses">Ð?оÑ?Ñ?ижими адÑ?еÑ?и</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">СÑ?аÑ?Ñ?иÑ?ай каÑ?о клиенÑ? зад firewall Ñ? Ñ?еÑ?Ñ?Ñ?икÑ?ивни полиÑ?ики</string>
-  <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пни поÑ?Ñ?ове</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?ове доÑ?Ñ?Ñ?пни зад firewall Ñ? Ñ?еÑ?Ñ?Ñ?икÑ?ивни полиÑ?ики</string>
-  <string name="enter_ports">Ð?Ñ?веди поÑ?Ñ?ове</string>
-  <string name="enable_hidden_services">Ð?клÑ?Ñ?и Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="run_servers_accessible_via_the_tor_network">Ñ?Ñ?аÑ?Ñ?иÑ?ай Ñ?Ñ?Ñ?вÑ?Ñ?и доÑ?Ñ?Ñ?пни пÑ?ез ТоÑ? мÑ?ежаÑ?а</string>
-  <string name="enter_localhost_ports_for_hidden_services">вÑ?веди локални поÑ?Ñ?ове за Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?ове на Ñ?кÑ?иÑ?и Ñ?Ñ?лÑ?ги</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ð?вÑ?омаÑ?иÑ?но генеÑ?иÑ?ан адÑ?еÑ? за Ñ?воÑ?Ñ?а Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га(hidden service)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">вклÑ?Ñ?и запиÑ? на дебÑ?г доклади (Ñ?Ñ?Ñ?бва да ползваÑ?е aLogCat или adb, за да ги Ñ?азглеждаÑ?)</string>
-  <string name="project_home">Ð?аÑ?ални СÑ?аниÑ?и на Ð?Ñ?оекÑ?иÑ?е:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">ТоÑ? лиÑ?енз</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">СоÑ?Ñ?Ñ?еÑ? на Ñ?Ñ?еÑ?и Ñ?Ñ?Ñ?ани: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Ð?Ñ?иложение иÑ?ка да оÑ?воÑ?и поÑ?Ñ? на Ñ?кÑ?иÑ? Ñ?Ñ?Ñ?вÑ?Ñ? %S кÑ?м ТоÑ? мÑ?ежаÑ?а. Ð?езопаÑ?но е да Ñ?е довеÑ?иÑ?е на пÑ?иложениеÑ?о.</string>
-  <string name="found_existing_tor_process">намеÑ?ил Ñ?и Ñ?Ñ?вмеÑ?Ñ?им Tor пÑ?оекÑ?...</string>
+    <string name="found_existing_tor_process">намеÑ?ил Ñ?и Ñ?Ñ?вмеÑ?Ñ?им Tor пÑ?оекÑ?...</string>
   <string name="something_bad_happened">Ð?еÑ?о лоÑ?о Ñ?е Ñ?лÑ?Ñ?и. Ð?Ñ?овеÑ?еÑ?е лога</string>
-  <string name="hidden_service_on">СкÑ?иÑ?а Ñ?Ñ?лÑ?га вклÑ?Ñ?ена:</string>
-  <string name="unable_to_read_hidden_service_name">не може да пÑ?оÑ?еÑ?е име на Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га</string>
+    <string name="unable_to_read_hidden_service_name">не може да пÑ?оÑ?еÑ?е име на Ñ?кÑ?иÑ?а Ñ?Ñ?лÑ?га</string>
   <string name="unable_to_start_tor">Ð?е може да Ñ?Ñ?аÑ?Ñ?иÑ?а ТоÑ?:</string>
-  <string name="unable_to_reset_tor">РеÑ?Ñ?аÑ?Ñ?иÑ?ай Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о Ñ?и, неÑ?Ñ?пеÑ?но Ñ?еÑ?Ñ?аÑ?иване на Tor!</string>
-  <string name="pref_use_sys_iptables_title">Ð?зползвай Iptables по подÑ?азбиÑ?ане</string>
-  <string name="pref_use_sys_iptables_summary">използвай вгÑ?адениÑ?е двÑ?иÑ?ни iptables вмеÑ?Ñ?о Ñ?ези идваÑ?и Ñ? Orbot</string>
-  <string name="error_installing_binares">Ð?вÑ?иÑ?ниÑ?е Ñ?айлове на ТоÑ? не бÑ?Ñ?а инÑ?Ñ?алиÑ?ани или обновени.</string>
-  <string name="pref_use_persistent_notifications">Ð?инаги показвай икона в Ñ?Ñ?лбаÑ?а когаÑ?о Ð?Ñ?боÑ? е Ñ?вÑ?Ñ?зан</string>
-  <string name="pref_use_persistent_notifications_title">УведомлениÑ? винаги вклÑ?Ñ?ени</string>
-  <string name="pref_use_expanded_notifications">Ð?окажи Ñ?азÑ?иÑ?ена инÑ?оÑ?маÑ?иÑ? за Tor изÑ?однаÑ?а дÑ?Ñ?жава и IP в ленÑ?аÑ?а за извеÑ?Ñ?иÑ?</string>
-  <string name="pref_use_expanded_notifications_title">РазÑ?иÑ?ени извеÑ?Ñ?иÑ?</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?ове вклÑ?Ñ?ени!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ð?зик</string>
-  <string name="set_locale_summary">Ð?збеÑ?и меÑ?Ñ?оположение и език за Ð?Ñ?боÑ?</string>
-  <string name="wizard_locale_title">Ð?збеÑ?и език</string>
-  <string name="wizard_locale_msg">Ð?Ñ?Ñ?ави по подÑ?азбиÑ?ане или Ñ?мени налиÑ?ниÑ? език</string>
-  <string name="powered_by">базиÑ?ан на Tor</string>
-  <string name="btn_save_settings">Ð?апази наÑ?Ñ?Ñ?ойки</string>
-  <string name="no_internet_connection_tor">Ð?Ñ?ма инÑ?еÑ?неÑ? вÑ?Ñ?зка; Tor е в Ñ?ежим на изÑ?акване...</string>
-  <string name="bandwidth_">СкоÑ?оÑ?Ñ?:</string>
-  <string name="down">Ñ?еглене</string>
-  <string name="up">изпÑ?аÑ?ане</string>
-  <string name="pref_disable_network_title">Ð?иÑ?пва Ð?вÑ?омаÑ?иÑ?ен Режим на Ð?зÑ?акване</string>
-  <string name="pref_disable_network_summary">Сложи Tor в Ñ?ежим на изÑ?акване, когаÑ?о нÑ?ма инÑ?еÑ?неÑ?</string>
-  <string name="newnym">СмениÑ?Ñ?е Ñ?воÑ?Ñ?а ТоÑ? иденÑ?иÑ?ноÑ?Ñ?!</string>
-  <string name="menu_verify_browser">Ð?Ñ?аÑ?зÑ?Ñ?</string>
-  <string name="menu_use_chatsecure">Ð?зползвай ChatSecure</string>
-  <string name="permission_manage_tor_label">Ð?аÑ?Ñ?Ñ?ой Tor</string>
-  <string name="permission_manage_tor_description">РазÑ?еÑ?и Ñ?ази пÑ?огÑ?ама да конÑ?Ñ?олиÑ?а Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ð?е изглежда да имаÑ?е Orfox инÑ?Ñ?алиÑ?ан. Ð?елаеÑ?е ли помоÑ? Ñ? Ñ?ова, или пÑ?оÑ?Ñ?о да оÑ?воÑ?им бÑ?аÑ?зÑ?Ñ?а?</string>
-  <string name="install_apps_">Ð?нÑ?Ñ?алиÑ?ай пÑ?огÑ?ами?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?Ñ?ма инÑ?еÑ?неÑ? вÑ?Ñ?зка. Ð?Ñ?еминаване в Ñ?ежим на изÑ?каване...</string>
+    <string name="no_internet_connection_tor">Ð?Ñ?ма инÑ?еÑ?неÑ? вÑ?Ñ?зка; 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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">ТвоиÑ?е пÑ?блиÑ?ни Tor IP-Ñ?а:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?олÑ?, забÑ?ани Ñ?ази пÑ?огÑ?ама в  Android-&gt;Ð?аÑ?Ñ?Ñ?ойки-&gt;Ð?Ñ?иложениÑ? ако имаÑ? пÑ?облеми Ñ? Orbot:</string>
-  <string name="app_conflict">Ð?онÑ?ликÑ? Ñ? дÑ?Ñ?го пÑ?иложение</string>
-  <string name="pref_transproxy_refresh_title">ТÑ?анÑ?пÑ?окÑ?и авÑ?омаÑ?иÑ?но оÑ?вежаване</string>
-  <string name="pref_transproxy_refresh_summary">Ð?Ñ?иложи повÑ?оÑ?но Ñ?Ñ?анÑ?пÑ?окÑ?и пÑ?авилаÑ?а пÑ?и пÑ?омÑ?на на Ñ?Ñ?Ñ?Ñ?оÑ?ниеÑ?о на мÑ?ежаÑ?а</string>
-  <string name="pref_transproxy_flush_title">ТÑ?анÑ?пÑ?оÑ?ки Ð?РÐ?Ð?УÐ?Ð?ТÐ?Ð?Ð?Ð? Ð?РÐ?Ð?Ð?Ð¥Ð?Ð?Ð?Ð?</string>
-  <string name="pref_transproxy_flush_summary">Ð?аÑ?иÑ?ни Ñ?Ñ?к, за да изÑ?Ñ?иеÑ? вÑ?иÑ?ки Ñ?Ñ?анÑ?пÑ?кÑ?и мÑ?ежови пÑ?авила Ð?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="transparent_proxy_rules_flushed_">ТÑ?анÑ?пÑ?окÑ?и пÑ?авилаÑ?а изÑ?Ñ?иÑ?и!</string>
-  <string name="you_do_not_have_root_access_enabled">Ð?Ñ?маÑ? ROOT доÑ?Ñ?Ñ?п до Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?воÑ?о</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?оже да Ñ?е наложи да Ñ?пÑ?еÑ? и Ñ?Ñ?аÑ?Ñ?иÑ?аÑ? Orbot, за да могаÑ? нÑ?кои наÑ?Ñ?Ñ?ойки да влÑ?заÑ? в дейÑ?Ñ?вие.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Ð?оÑ?Ñ?ове вклÑ?Ñ?ени!</string>
-  <string name="restart_orbot_to_use_this_bridge_">Ð?олÑ?, Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?ай Orbot, за да влÑ?заÑ? в дейÑ?Ñ?вие пÑ?омениÑ?е</string>
-  <string name="menu_qr">QR Ð?одове</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ð?ко ваÑ?аÑ?а мÑ?ежа Ñ?еленаÑ?оÑ?ено блиÑ?ва Tor, може да използваÑ?е Ð?оÑ?Ñ?, за да Ñ?е Ñ?вÑ?Ñ?жеÑ?е. Ð?Ð?Ð?Ð?РÐ?ТÐ? един оÑ? видовеÑ?е моÑ?Ñ?ове избÑ?оени по-гоÑ?е, за да вклÑ?Ñ?иÑ?е Ñ?ази Ñ?Ñ?нкÑ?ионалноÑ?Ñ?.</string>
-  <string name="bridge_mode">Режим моÑ?Ñ?</string>
-  <string name="get_bridges_email">Ð?мейл</string>
-  <string name="get_bridges_web">Уеб</string>
-  <string name="activate">Ð?кÑ?ивиÑ?ай</string>
-  <string name="apps_mode">Ð?Ñ?иложениÑ? вÑ?в VPN Ñ?ежим</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?ожеÑ? да наÑ?Ñ?Ñ?оиÑ? вÑ?иÑ?ки пÑ?иложениÑ? да минаваÑ? пÑ?ез Tor мÑ?ежаÑ?а използвайки VPN Ñ?Ñ?нкÑ?иÑ?Ñ?а на Ð?ндÑ?оид.\n\n*Ð?РÐ?Ð?УÐ?РÐ?Ð?Ð?Ð?Ð?Ð?Ð?* Това е нова, екÑ?пеÑ?именÑ?ална Ñ?Ñ?нкÑ?иÑ? и в нÑ?кои Ñ?лÑ?Ñ?аи може да не Ñ?Ñ?аÑ?Ñ?иÑ?а авÑ?омаÑ?иÑ?но, или да Ñ?пÑ?е. Ð?Ð? бива да Ñ?е използва за анонимноÑ?Ñ?, а СÐ?Ð?Ð? за пÑ?еминаване пÑ?ез Ñ?айÑ?Ñ?Ñ?оли и Ñ?илÑ?Ñ?и.</string>
-  <string name="send_email">Ð?зпÑ?аÑ?и имейл</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ð?ожеÑ? да полÑ?Ñ?иÑ? адÑ?еÑ?а на моÑ?Ñ? по имейл, инÑ?еÑ?неÑ? или каÑ?о Ñ?каниÑ?аÑ? QR kod. Ð?збеÑ?и \'Ð?мейл\' или \'Ð?нÑ?еÑ?неÑ?\' по-долÑ?, за да поиÑ?каÑ? адÑ?еÑ? на моÑ?Ñ?.\n\nÐ?еднÑ?ж Ñ?ом полÑ?Ñ?иÑ? адÑ?еÑ?а го копиÑ?ай в \"Ð?оÑ?Ñ?ове\", в наÑ?Ñ?Ñ?ойкиÑ?е на Orbot и Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?ай пÑ?иложениеÑ?о.</string>
-  <string name="install_orweb">Ð?нÑ?Ñ?алиÑ?ай Orfox</string>
-  <string name="standard_browser">Ð?оÑ?мален Ð?Ñ?аÑ?зÑ?Ñ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Само Ñ?Ñ?андаÑ?Ñ?ни Tor моÑ?Ñ?ове Ñ?абоÑ?Ñ? на Intel X86/ATOM Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва</string>
-  <string name="vpn_default_world">СвÑ?Ñ?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-bn-rBD/strings.xml b/orbotservice/src/main/res/values-bn-rBD/strings.xml
index d179a61e..c1cc6e6b 100644
--- a/orbotservice/src/main/res/values-bn-rBD/strings.xml
+++ b/orbotservice/src/main/res/values-bn-rBD/strings.xml
@@ -2,39 +2,17 @@
 <resources>
   <string name="app_name">�রব�</string>
   <string name="app_description">Orbot à¦?à¦?à¦?ি ফà§?রি পà§?রà¦?à§?সি à¦?à§?যাপà§?লিà¦?à§?শন যা à¦?নà§?যানà§?য Apps à¦?à§? à¦?রà¦? নিরাপদভাবà§? à¦?নà§?à¦?ারনà§?à¦? বà§?যবহার à¦?রার à¦?à§?ষমতাপà§?রদান à¦?রà§?।  Orbot à¦?পনার à¦?নà§?à¦?ারনà§?à¦? à¦?à§?রাফিà¦? à¦?নà¦?à§?রিপà§?à¦? à¦?রতà§? à¦?র বà§?যবহার à¦?বà¦? তারপর সারা বিশà§?বà§?র à¦?মà§?পিà¦?à¦?ারà§?র সিরিà¦?à§?র moddho diye porichalito kore gopon kore. à¦?র ফà§?রি সফà¦?à¦?য়à§?যার à¦?বà¦? à¦?পনি à¦?à§?রাফিà¦? বিশà§?লà§?ষণ হিসà§?বà§? পরিà¦?িত বà§?যà¦?à§?তিà¦?ত সà§?বাধà§?নতা à¦? à¦?à§?পনà§?য়তা, à¦?à§?পনà§?য় বাণিà¦?à§?যিà¦? à¦?ারà§?যà¦?à§?রম à¦?বà¦? সমà§?পরà§?à¦?, à¦?বà¦? রà¦
 ¾à¦·à§?à¦?à§?রà§?য় নিরাপতà§?তা হà§?মà¦?ির মà§?à¦?à§? পড়à§? নà§?à¦?à¦?য়ারà§?à¦? নà¦?রদারি à¦?à¦?à¦?ি ফরà§?ম বিরà§?দà§?ধà§? রà¦?à§?ষা à¦?রতà§? সাহাযà§?য à¦?রà§? যà§? à¦?à¦?à¦?ি à¦?à§?লা নà§?à¦?à¦?য়ারà§?à¦?.</string>
-  <string name="tor_proxy_service_process">�র প�র��সি সার�ভিস</string>
-  <string name="status_starting_up">�রব� �াল� হ���� . . . </string>
+    <string name="status_starting_up">�রব� �াল� হ���� . . . </string>
   <string name="status_activated">�র ন����ার���র সাথ� স�য���ত হ����</string>
   <string name="status_disabled">�রব� নিষ���রি� �রা হ����</string>
   <string name="tor_process_starting">�র ��লা��ন�� �াল� �রা হ����</string>
   <string name="tor_process_complete">সম�প�র�ণ</string>
-  <string name="tor_process_waiting">�প���ষা �রা হ����</string>
-  <string name="menu_home">হ�ম</string>
-  <string name="menu_settings">নি�ম বিন�যাস</string>
-  <string name="menu_info">সাহায�য</string>
-  <string name="menu_start">শ�র�</string>
-  <string name="menu_stop">শ�ষ</string>
-  <string name="button_help">সাহায�য</string>
-  <string name="button_close">বন�ধ</string>
-  <string name="press_to_start">�াল� �রার �ন�য ধর� থা��ন</string>
-  <string name="pref_transparent_all_title">সব �ি�� �র�র মাধ�যম� �র�ন </string>
-  <string name="wizard_title">�রব�</string>
-  <string name="btn_next">পরবর�ত�</string>
-  <string name="btn_back">প��ন�</string>
-  <string name="btn_finish">শ�ষ</string>
-  <string name="btn_okay">ঠি� ���</string>
-  <string name="btn_cancel">বাদ</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_permissions_stock">�রব� �র �ন�মতিসম�হ </string>
-  <string name="wizard_permissions_consent">�মি ব��ত� প�র��ি �ব� ��িয়� য�ত� �া� Superuser �া�া।</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">সাধারণ</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
-  <string name="wizard_permissions_title">�ন�মতিসম�হ</string>
-  <!--TipsAndTricks screen-->
+    <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-bn-rIN/strings.xml b/orbotservice/src/main/res/values-bn-rIN/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-bn-rIN/strings.xml
+++ b/orbotservice/src/main/res/values-bn-rIN/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-bn/strings.xml b/orbotservice/src/main/res/values-bn/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-bn/strings.xml
+++ b/orbotservice/src/main/res/values-bn/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-brx/strings.xml b/orbotservice/src/main/res/values-brx/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-brx/strings.xml
+++ b/orbotservice/src/main/res/values-brx/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-bs/strings.xml b/orbotservice/src/main/res/values-bs/strings.xml
index bcef3470..0fe1e9e1 100644
--- a/orbotservice/src/main/res/values-bs/strings.xml
+++ b/orbotservice/src/main/res/values-bs/strings.xml
@@ -1,18 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zatvori</string>
-  <string name="btn_back">Nazad</string>
-  <string name="btn_cancel">Otkaži</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proksi postavke</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ca/strings.xml b/orbotservice/src/main/res/values-ca/strings.xml
index c6632ded..007b5bbf 100644
--- a/orbotservice/src/main/res/values-ca/strings.xml
+++ b/orbotservice/src/main/res/values-ca/strings.xml
@@ -1,226 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">https://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Inicia i atura Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
+    <string name="status_starting_up">L\'Orbot s\'està iniciant...</string>
   <string name="status_activated">Esteu connectat a la xarxa Tor</string>
   <string name="status_disabled">L\'Orbot està desactivat</string>
   <string name="tor_process_starting">S\'està iniciant el client Tor...</string>
   <string name="tor_process_complete">fet.</string>
-  <string name="tor_process_waiting">s\'està esperant.</string>
-  <string name="not_anonymous_yet">ATENCI�: El trànsit de la vostra connexió encara no és anònim! Heu de configurar les vostres aplicacions per utilitzar un proxy HTTP a 127.0.0.1:8118, o un proxy SOCKS4A o SOCKS5 a 127.0.0.1:9050</string>
-  <string name="menu_home">Inici</string>
-  <string name="menu_browse">Navega</string>
-  <string name="menu_settings">Preferències</string>
-  <string name="menu_log">Registre</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_start">Inicia</string>
-  <string name="menu_stop">Atura</string>
-  <string name="menu_about">Quant a...</string>
-  <string name="main_layout_download">Baixada</string>
-  <string name="main_layout_upload">Pujada</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Tanca</string>
-  <string name="button_about">Quant a...</string>
-  <string name="button_clear_log">Esborra el registre</string>
-  <string name="menu_verify">Prova</string>
-  <string name="menu_exit">Surt</string>
-  <string name="press_to_start">- mantén-lo premut per iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxy transparent (requereix Root)</string>
-  <string name="pref_trans_proxy_title">Utilitza un proxy transparent</string>
-  <string name="pref_trans_proxy_summary">Torificació automàtica de les apps</string>
-  <string name="pref_transparent_all_title">Tor per a tot</string>
-  <string name="pref_transparent_all_summary">Canalitza el trànsit de totes les aplicacions a través de Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port alternatiu per al proxy </string>
-  <string name="pref_transparent_port_fallback_summary">ATENCI�: Això trampeja els ports habituals (80, 443, etc.) *UTILITZEU-HO NOM�S* si el mode «Totes» o «App» no funcionen.</string>
-  <string name="pref_transparent_port_title">Llista de ports</string>
-  <string name="pref_transparent_port_summary">Llista de ports a canalitzar per proxy. *UTILITZEU-HO NOM�S* si el mode «Totes» o «App» no funcionen.</string>
-  <string name="pref_transparent_port_dialog">Introduïu els ports a canalitzar per proxy</string>
-  <string name="pref_has_root">Demana l\'accés root</string>
-  <string name="pref_has_root_summary">Demana l\'accés root per a la canalització a través de proxy transparent</string>
-  <string name="status_install_success">Els binaris de Tor s\'han instal·lat correctament.</string>
-  <string name="status_install_fail">Els fitxers binaris de Tor no s\'han pogut instal·lar. Comproveu el registre i notifiqueu-ho a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de l\'aplicació</string>
-  <string name="wizard_title">Us donem la benvinguda a l\'Orbot</string>
-  <string name="wizard_btn_tell_me_more">Quant a Orbot...</string>
-  <string name="btn_next">Següent</string>
-  <string name="btn_back">Enrere</string>
-  <string name="btn_finish">Fi</string>
-  <string name="btn_okay">D\'acord</string>
-  <string name="btn_cancel">Cancel·la</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Alguns detalls de l\'Orbot...</string>
-  <string name="wizard_permissions_root">Permís concedit</string>
-  <string name="wizard_permissions_stock">Permisos de l\'Orbot</string>
-  <string name="wizard_premissions_msg_root">Perfecte! Hem detectat que teniu els permisos root activats per a l\'Orbot. Utilitzarem aquesta capacitat amb sensatesa.</string>
-  <string name="wizard_permissions_msg_stock">Encara que no és imprescindible, l\'Orbot pot esdevenir una eina molt més potent si el vostre terminal té accés root. Utilitzeu el botó d\'aquí sota per concedir superpoders a l\'Orbot!</string>
-  <string name="wizard_permissions_no_root">Si no teniu accés root, o no teniu ni idea del què us estem parlant, simplement assegureu-vos d\'utilitzar aplicacions dissenyades per funcionar amb l\'Orbot.</string>
-  <string name="wizard_permissions_consent">Ho entenc i vull continuar sense accés de superusuari</string>
-  <string name="wizard_permission_enable_root">Concedeix accés root a l\'Orbot</string>
-  <string name="wizard_configure">Configura la connexió a Tor</string>
-  <string name="wizard_configure_msg">L\'Orbot us ofereix l\'opció de canalitzar el trànsit de totes les aplicacions a través de Tor o bé escollir quines aplicacions voleu que utilitzin Tor.</string>
-  <string name="wizard_configure_all">Canalitza totes les aplicacions a través de Tor.</string>
-  <string name="wizard_configure_select_apps">Selecciona les aplicacions individualment</string>
-  <string name="wizard_tips_tricks">Aplicacions per utilitzar amb l\'Orbot</string>
-  <string name="wizard_tips_msg">Les aplicacions d\'aquí sota s\'han dissenyat per funcionar amb l\'Orbot. Feu clic a cada botó per instalar-les ara, o busqueu-les després a Google Play Store, al lloc web de GuardianProject.info o a F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client de missatgeria instantània segura per a Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Aprèn a configurar aplicacions per a què funcionin amb l\'Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo - Aplicació de cerca al web</string>
-  <string name="wizard_tips_twitter">Estableix el proxy de Twitter a l\'amfitrió «localhost» i port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ajustaments del proxy</string>
-  <string name="wizard_final">L\'Orbot és a punt!</string>
-  <string name="wizard_exit_at_first_screen_toast">Configureu l\'Orbot abans d\'utilitzar-lo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">S\'obrirà el vostre navegador web a https://check.torproject.org per tal de comprovar si l\'Orbot està ben configurat i estàs connectat a Tor.</string>
-  <string name="pref_hs_group">Serveis ocults</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Inicia l\'Obot a l\'arrencada</string>
-  <string name="pref_start_boot_summary">Inicia l\'Orbot i connecta a Tor automàticament quan el vostre dispositiu Android arrenca.</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Advertència</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalment podeu concedir accés «superusuari» a l\'Orbot per activar funcions avançades, com el servidor intermediari transparent.</string>
-  <string name="wizard_permissions_root_msg2">Si no voleu fer això assegureu-vos de fer servir aplicacions dissenyades per funcionar amb l\'Orbot.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicacions dissenyades per a l\'Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplicació de xat segur amb encriptació confidencial.</string>
-  <string name="wizard_tips_play">Trobareu totes les aplicacions de Guardian Project a Google Play Store</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Servidor intermediari transparent</string>
-  <string name="wizard_transproxy_msg">Això permet que les vostres aplicacions es connectin a través de la xarxa Tor sense haver de configurar res.</string>
-  <string name="wizard_transproxy_hint">(Marqueu aquesta casella si no teniu ni idea del que estem parlant)</string>
-  <string name="wizard_transproxy_none">Cap</string>
-  <string name="pref_transparent_tethering_title">Compartició de xarxa amb Tor</string>
-  <string name="pref_transparent_tethering_summary">Activa el servidor intermediari transparent de Tor pels dispositius connectats a través de la compartició de xarxa via Wi-Fi o USB (cal reiniciar)</string>
-  <string name="button_grant_superuser">Petició d\'accés de superusuari</string>
-  <string name="pref_select_apps">Selecciona les apps</string>
-  <string name="pref_select_apps_summary">Trieu quines apps s\'han de canalitzar a través de Tor</string>
-  <string name="pref_node_configuration">Configuració de node</string>
-  <string name="pref_node_configuration_summary">Aquests són paràmetres avançats que poden reduir el vostre anonimat</string>
-  <string name="pref_entrance_node">Node d\'entrada</string>
-  <string name="pref_entrance_node_summary">Empremtes, àlies, països i adreces pel primer salt</string>
-  <string name="pref_entrance_node_dialog">Introduïu els nodes d\'entrada</string>
-  <string name="button_proxy_all">Totes via proxy</string>
-  <string name="button_proxy_none">Cap via proxy</string>
-  <string name="button_invert_selection">Inverteix selecció</string>
-  <string name="pref_proxy_title">Servidor intermediari de sortida a la xarxa (opcional)</string>
-  <string name="pref_proxy_type_title">Tipus de servidor intermediari de sortida</string>
-  <string name="pref_proxy_type_summary">Protocol a utilitzar pel servidor intermediari: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Introduïu el tipus de servidor intermediari</string>
-  <string name="pref_proxy_host_title">Amfitrió del servidor intermediari de sortida</string>
-  <string name="pref_proxy_host_summary">Nom de l\'amfitrió del servidor intermediari</string>
-  <string name="pref_proxy_host_dialog">Introduïu l\'amfitrió del servidor intermediari</string>
-  <string name="pref_proxy_port_title">Port del servidor intermediari de sortida</string>
-  <string name="pref_proxy_port_summary">Port del servidor intermediari</string>
-  <string name="pref_proxy_port_dialog">Introduïu el port del servidor intermediari</string>
-  <string name="pref_proxy_username_title">Nom d\'usuari del servidor intermediari de sortida</string>
-  <string name="pref_proxy_username_summary">Nom d\'usuari del servidor intermediari (opcional)</string>
-  <string name="pref_proxy_username_dialog">Introduïu el nom d\'usuari del servidor intermediari</string>
-  <string name="pref_proxy_password_title">Contrasenya del servidor intermediari de sortida</string>
-  <string name="pref_proxy_password_summary">Contrasenya del servidor intermediari (opcional)</string>
-  <string name="pref_proxy_password_dialog">Introduïu la contrasenya del servidor intermediari</string>
-  <string name="status">Estat</string>
-  <string name="setting_up_full_transparent_proxying_">S\'està configurant el servidor intermediari transparent complet...</string>
-  <string name="setting_up_app_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per apps...</string>
-  <string name="transparent_proxying_enabled">S\'ha ACTIVAT el servidor intermediari transparent</string>
-  <string name="transproxy_enabled_for_tethering_">S\'ha activat el servidor intermediari per la compartició de xarxa</string>
-  <string name="warning_error_starting_transparent_proxying_">ATENCIÃ?: hi ha hagut un error en iniciar el servidor intermediari transparent</string>
-  <string name="transproxy_rules_cleared">S\'han esborrat les regles del servidor intermediari transparent</string>
-  <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">S\'està configurant el servidor intermediari transparent per ports...</string>
-  <string name="bridge_error">Hi ha hagut un error de pont</string>
-  <string name="bridge_requires_ip">Per poder utilitzar la funcionalitat de pont, cal que introduïu almenys una adreça IP de pont.</string>
-  <string name="send_email_for_bridges">Envieu un correu a bridges@xxxxxxxxxxxxxx amb la línia «get bridges» sola al cos del missatge des d\'un compte de gmail.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Els paràmetres d\'adreces accessibles han provocat una excepció.</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">No s\'ha pogut iniciar el procés Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Els paràmetres d\'adreces accessibles han provocat una excepció.</string>
   <string name="your_relay_settings_caused_an_exception_">Els paràmetres de reemissió han causat una excepció.</string>
-  <string name="exit_nodes">Nodes de sortida</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empremtes, àlies, països i adreces per l\'últim salt</string>
-  <string name="enter_exit_nodes">Introduïu els nodes de sortida</string>
-  <string name="exclude_nodes">Nodes per excloure</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empremtes, àlies, països i adreces per excloure</string>
-  <string name="enter_exclude_nodes">Introduïu nodes per excloure</string>
-  <string name="strict_nodes">Nodes estrictes</string>
-  <string name="use_only_these_specified_nodes">Utilitza *només* aquests nodes especificats</string>
-  <string name="bridges">Ponts</string>
-  <string name="use_bridges">Utilitza ponts</string>
-  <string name="bridges_obfuscated">Ponts ofuscats</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activa nodes alternatius d\'entrada a la xarxa Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeu-ho si els ponts configurats són ponts ofuscats</string>
-  <string name="ip_address_and_port_of_bridges">Adreça IP i port dels ponts</string>
-  <string name="enter_bridge_addresses">Introduïu les adreces del pont</string>
-  <string name="relays">Reemissors</string>
-  <string name="relaying">Reemissió</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Activa el vostre dispositiu per ser un reemissor sense sortida</string>
-  <string name="relay_port">Port de reemissió</string>
-  <string name="listening_port_for_your_tor_relay">Port d\'escolta per la vostra reemissió de Tor</string>
-  <string name="enter_or_port">Introduïu el port OR</string>
-  <string name="relay_nickname">Ã?lies del reemissor</string>
-  <string name="the_nickname_for_your_tor_relay">L\'àlies pel vostre reemissor de Tor</string>
-  <string name="enter_a_custom_relay_nickname">Introduïu un àlies personalitzat pel vostre reemissor</string>
-  <string name="reachable_addresses">Adreces accessibles</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">S\'executa com a client darrera d\'un tallafocs amb normes restrictives</string>
-  <string name="reachable_ports">Ports accessibles</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports que es poden accedir darrera d\'un tallafocs restrictiu</string>
-  <string name="enter_ports">Introduïu els ports</string>
-  <string name="enable_hidden_services">Allotjament de servei ocult</string>
-  <string name="run_servers_accessible_via_the_tor_network">Permet que un servidor al dispositiu sigui accessible des de la xarxa Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">introduïu els ports de l\'amfitrió local pels serveis ocults</string>
-  <string name="hidden_service_ports">Ports del servei coult</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">el nom adreçable pel vostre servei ocult (generat automàticament)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activa la sortida del registre de depuració (cal utilitzar l\'adb o l\'aLogCat per veure\'l)</string>
-  <string name="project_home">Lloc(s) web del projecte:</string>
-  <string name="the_tor_license">La llicència Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Programari de terceres parts:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Una aplicació vol obrir el port %S de servei ocult a la xarxa Tor. Això és segur si confieu en l\'aplicació.</string>
-  <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
+    <string name="found_existing_tor_process">s\'ha trobat un procés Tor existent...</string>
   <string name="something_bad_happened">Ha fallat alguna cosa. Comproveu el registre</string>
-  <string name="hidden_service_on">servei ocult a:</string>
-  <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
+    <string name="unable_to_read_hidden_service_name">ha estat impossible llegir el nom del servei ocult</string>
   <string name="unable_to_start_tor">Ha estat impossible iniciar Tor:</string>
-  <string name="pref_use_sys_iptables_title">Utilitza les Iptables per defecte</string>
-  <string name="pref_use_sys_iptables_summary">utilitza el binari incorporat amb l\'Iptables enlloc del que porta l\'Orbot</string>
-  <string name="error_installing_binares">Els binaris de Tor no s\'han pogut instal·lar o actualitzar.</string>
-  <string name="pref_use_persistent_notifications">Manté la icona sempre a la barra d\'eines mentre l\'Orbot està connectat</string>
-  <string name="pref_use_persistent_notifications_title">Notificacions sempre activades</string>
-  <string name="notification_using_bridges">Ponts activats.</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Trieu la localització i la llengua per l\'Orbot</string>
-  <string name="wizard_locale_title">Tria la llengua</string>
-  <string name="wizard_locale_msg">Deixa-ho per defecte o canvia la llengua actual</string>
-  <string name="powered_by">funciona amb Tor</string>
-  <string name="btn_save_settings">Desa els paràmetres</string>
-  <string name="bandwidth_">Ample de banda:</string>
-  <string name="down">baixada</string>
-  <string name="up">pujada</string>
-  <string name="pref_disable_network_title">No hi ha autodesconnexió de xarxa</string>
-  <string name="pref_disable_network_summary">Posa el Tor en pausa mentre no hi ha connexió a internet</string>
-  <string name="newnym">Heu canviat a una nova identitat Tor.</string>
-  <string name="menu_use_chatsecure">Utilitza ChatSecure</string>
-  <string name="permission_manage_tor_label">Gestiona Tor</string>
-  <string name="permission_manage_tor_description">Activa aquesta app per controlar el servei Tor</string>
-  <string name="install_apps_">Voleu instal·lar les apps?</string>
-  <string name="your_tor_public_ips_">Les vostres IP públiques de Tor:</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="get_bridges_email">Correu-e</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Activa</string>
-  <string name="standard_browser">Navegador estàndard</string>
+    <string name="newnym">Heu canviat a una nova identitat Tor.</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-cs-rCZ/strings.xml b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
index 066b230a..4ee8d8e6 100644
--- a/orbotservice/src/main/res/values-cs-rCZ/strings.xml
+++ b/orbotservice/src/main/res/values-cs-rCZ/strings.xml
@@ -1,223 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">spustit a vypnout Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se spouští...</string>
+    <string name="status_starting_up">Orbot se spouští...</string>
   <string name="status_activated">PÅ?ipojen k síti Tor</string>
   <string name="status_disabled">Orbot je deaktivován</string>
   <string name="tor_process_starting">Startuji Tor klienta...</string>
   <string name="tor_process_complete">hotovo.</string>
-  <string name="tor_process_waiting">Ä?ekám.</string>
-  <string name="not_anonymous_yet">VAROVÃ?NÃ?: VaÅ¡e komunikace jeÅ¡tÄ? není anonymní! Prosím nastavte vaÅ¡im aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A Ä?i SOCKS5 proxy 172.0.0.1:9050</string>
-  <string name="menu_home">Domů</string>
-  <string name="menu_browse">Prohlížet</string>
-  <string name="menu_settings">Nastavení</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Pomoc</string>
-  <string name="menu_start">Zapnout</string>
-  <string name="menu_stop">Vypnout</string>
-  <string name="menu_about">O aplikaci</string>
-  <string name="main_layout_download">Stáhnout</string>
-  <string name="main_layout_upload">Nahrát</string>
-  <string name="button_help">NápovÄ?da</string>
-  <string name="button_close">ZavÅ?ít</string>
-  <string name="button_about">O aplikaci</string>
-  <string name="button_clear_log">VyÄ?istit log</string>
-  <string name="menu_verify">OvÄ?Å?it</string>
-  <string name="menu_exit">Konec</string>
-  <string name="press_to_start">- podržte pro spuÅ¡tÄ?ní -</string>
-  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
-  <string name="pref_trans_proxy_title">Transparentní proxy</string>
-  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
-  <string name="pref_transparent_all_title">Torovat všechno</string>
-  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
-  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
-  <string name="pref_transparent_port_fallback_summary">VAROVÃ?NÃ?: Obchází bÄ?žné porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
-  <string name="pref_transparent_port_title">Seznam portů</string>
-  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
-  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
-  <string name="pref_has_root">Vyžaduje root pÅ?ístup</string>
-  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
-  <string name="status_install_success">Binárky toru byly úspÄ?Å¡nÄ? nainstalovány!</string>
-  <string name="status_install_fail">Nebylo možno nainstalovat binárky Toru. Prosím zkontrolujte log a upozornÄ?te tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Chyba aplikace</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
-  <string name="btn_next">Další</string>
-  <string name="btn_back">ZpÄ?t</string>
-  <string name="btn_finish">DokonÄ?it</string>
-  <string name="btn_okay">Budiž</string>
-  <string name="btn_cancel">Zrušit</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Pár detailů o Orbot</string>
-  <string name="wizard_permissions_root">Práva udÄ?lena</string>
-  <string name="wizard_permissions_stock">OprávnÄ?ní Orbota</string>
-  <string name="wizard_premissions_msg_root">VýbornÄ?! Bylo detekováno, že root oprávnÄ?ní bylo Orbotu udÄ?leno. Budeme tuto sílu užívat moudÅ?e.</string>
-  <string name="wizard_permissions_msg_stock">I když to není nutné, Orbot může pracovat lépe, pokud má vaÅ¡e zaÅ?ízení root. Použijte tlaÄ?ítko dole pro udÄ?lení supersíly Orbotovi. </string>
-  <string name="wizard_permissions_no_root">Pokud nemáte pÅ?ístup roota, nebo nevíte, o co se jedná, ujistÄ?te se, že používáte aplikace, které s Orbotem spolupracují.</string>
-  <string name="wizard_permissions_consent">Rozumín a pÅ?eji si pokraÄ?ovat bez roota (superuživatelských oprávnÄ?ní)</string>
-  <string name="wizard_permission_enable_root">UdÄ?lit Orbotovi root oprávnÄ?ní</string>
-  <string name="wizard_configure">Nastavení Torování</string>
-  <string name="wizard_configure_msg">Orbot umožÅ?uje smÄ?rovat datový provoz vÅ¡ech aplikací pÅ?es Tor NEBO zvolit aplikace individuálnÄ?.</string>
-  <string name="wizard_configure_all">Tor Proxy pro všechny aplikace</string>
-  <string name="wizard_configure_select_apps">Zvolit aplikace pro Tor individuálnÄ?</string>
-  <string name="wizard_tips_tricks">Aplikace povolené pro Orbota</string>
-  <string name="wizard_tips_msg">Aplikace níže byly vyvinuty tak, aby spolupracovaly s Orbotem. KliknÄ?te na každé tlaÄ?ítko pro instalaci, aplikace můžete najít i v Obchodu Play nebo na webu GuardianProject.info Ä?i F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - BezpeÄ?ný instant messaging klient pro Android</string>
-  <string name="wizard_tips_proxy">Proxy Nastavení - NauÄ?te se, jak nastavit aplikace, aby pracovaly s Orbotem</string>
-  <string name="wizard_tips_duckgo">Aplikace DuckDuckGo pro vyhledávací engine</string>
-  <string name="wizard_tips_twitter">Nastavit Twitter proxy na host \"localhost\" a port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Nastavení Proxy</string>
-  <string name="wizard_final">Orbot je pÅ?ipraven!</string>
-  <string name="wizard_exit_at_first_screen_toast">Orbot musíte nejdÅ?íve nastavit, než ho zaÄ?nete používat!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Tato volba otevÅ?e ve webovém prohlížeÄ?i stránku https://check.torproject.org pro kontrolu, jestli je Orbot správnÄ? nastaven a jste pÅ?ipojen k Tor.</string>
-  <string name="pref_hs_group">Skrytý hosting služby</string>
-  <string name="pref_general_group">Obecné</string>
-  <string name="pref_start_boot_title">Spustit Orbot pÅ?i startu systému</string>
-  <string name="pref_start_boot_summary">Automaticky spustit Orbot a pÅ?ipojit se k Tor po startu zaÅ?ízení</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Varování</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">OprávnÄ?ní</string>
-  <string name="wizard_permissions_root_msg1">VolitelnÄ? můžete Orbotu udÄ?lit \'siperuýivatelský\' (root) pÅ?ístup pto povolení rozšíÅ?ených funkcí, napÅ?íklad transparentní proxy.</string>
-  <string name="wizard_permissions_root_msg2">Pokud si to nepÅ?ejete, používejte prosím aplikace napsané tak, aby spolupracovaly s Orbotem</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-povolené aplikace</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: BezpeÄ?ná chatovací aplikace s technologií Off-the-Record Encryption</string>
-  <string name="wizard_tips_play">NajdÄ?te vÅ¡echny aplikace Guardian Projektu na Obchodu Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentní proxy</string>
-  <string name="wizard_transproxy_msg">Toto povolí aplikacím automaticky bÄ?žet pÅ?es Tor síť bez jakéhokoliv nastavování.</string>
-  <string name="wizard_transproxy_hint">(Povolte tuto volbu, pokud nemáte ponÄ?tí, o co se jedná)</string>
-  <string name="wizard_transproxy_none">Žádné</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Povolit Tor transparentní proxy pro zaÅ?ízení pÅ?ipojená pÅ?es Wi-Fi a USB tethering (vyžaduje restart)</string>
-  <string name="button_grant_superuser">Požadavek na Superuživatelský pÅ?ístup</string>
-  <string name="pref_select_apps">Vybrat aplikace</string>
-  <string name="pref_select_apps_summary">Zvolte aplikace používající smÄ?rováni pÅ?es Tor</string>
-  <string name="pref_node_configuration">Konfigurace uzlu (nodu)</string>
-  <string name="pref_node_configuration_summary">Tato rozšíÅ?ená nastavení mohou snížit vaÅ¡i anonymitu</string>
-  <string name="pref_entrance_node">Vstupní nody</string>
-  <string name="pref_entrance_node_summary">Otisky (fingerprints), pÅ?ezdívky serveru (nicks), státy a adresy pro první skok (hop)</string>
-  <string name="pref_entrance_node_dialog">Zadejte vstupní nody</string>
-  <string name="button_invert_selection">PÅ?evrátit výbÄ?r</string>
-  <string name="pref_proxy_title">Odchozí síťová proxy (volitelné)</string>
-  <string name="pref_proxy_type_title">Typ odchozí proxy</string>
-  <string name="pref_proxy_type_summary">Protokol pro proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Zadejte typ proxy</string>
-  <string name="pref_proxy_host_title">Hostitel odchozí proxy</string>
-  <string name="pref_proxy_host_summary">Jméno hostitele proxy serveru</string>
-  <string name="pref_proxy_host_dialog">Zadejte hostitele proxy</string>
-  <string name="pref_proxy_port_title">Port odchozí proxy</string>
-  <string name="pref_proxy_port_summary">Port proxy serveru</string>
-  <string name="pref_proxy_port_dialog">Zadejte proxy port</string>
-  <string name="pref_proxy_username_title">Uživatelské jméno odchozí proxy</string>
-  <string name="pref_proxy_username_summary">Proxy uživatelské jméno (volitelné)</string>
-  <string name="pref_proxy_username_dialog">Zadejte Proxy uživatelské jméno</string>
-  <string name="pref_proxy_password_title">Heslo odchozí proxy</string>
-  <string name="pref_proxy_password_summary">Proxy heslo (volitelné)</string>
-  <string name="pref_proxy_password_dialog">Zadejte Proxy heslo</string>
-  <string name="status">Stav</string>
-  <string name="setting_up_full_transparent_proxying_">Nastavuji transparentní proxy�</string>
-  <string name="setting_up_app_based_transparent_proxying_">Nastavení na aplikacích založené transparentní proxy...</string>
-  <string name="transparent_proxying_enabled">Transparentní proxy POVOLENA</string>
-  <string name="transproxy_enabled_for_tethering_">Transparentní proxy povolena pro Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">VAROVÃ?NÃ?: chyba pÅ?i startu transparentní proxy!</string>
-  <string name="transproxy_rules_cleared">Pravidla TransProxy vymazána</string>
-  <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Nastavení na portu založené transparentní proxy...</string>
-  <string name="bridge_error">Chyba bridge</string>
-  <string name="bridge_requires_ip">Pro použití bridge musíte zadat minimálné jednu IP adresu bridge.</string>
-  <string name="send_email_for_bridges">ZaÅ¡lete email pouze s Å?ádkem \"get bridges\" v obsahu zprávy z vaÅ¡eho gmail úÄ?tu na adresu bridges@xxxxxxxxxxxxxx</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>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Nelze spustit Tor proces:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše nastavení dostupných adres (ReachableAddresses) způsobilo chybu!</string>
   <string name="your_relay_settings_caused_an_exception_">Vaše nastavení relace způsobilo výjimku!</string>
-  <string name="exit_nodes">Výstupní nody</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otisky (fingerprints), pÅ?ezdívky serveru (nicks), státy a adresy pro poslední skok (hop)</string>
-  <string name="enter_exit_nodes">Zadejte výstupní nody</string>
-  <string name="exclude_nodes">VylouÄ?ené nody</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otisky (fingerprints), pÅ?ezdívky serveru (nicks), státy a adresy pro vylouÄ?ené nody</string>
-  <string name="enter_exclude_nodes">Zadejte nody k vylouÄ?ení</string>
-  <string name="strict_nodes">Striktní nody</string>
-  <string name="use_only_these_specified_nodes">Použít *pouze* tyto specifické nody</string>
-  <string name="bridges">Bridge</string>
-  <string name="use_bridges">Použít bridge</string>
-  <string name="bridges_obfuscated">Matoucí bridge (Obfuscated Bridges)</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Povolit alternativní vstupní nody do sítÄ? Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Povolte, pokud jsou nastavené bridge matoucí bridge</string>
-  <string name="ip_address_and_port_of_bridges">IP adresy a porty bridgů</string>
-  <string name="enter_bridge_addresses">Zadejte adresy bridgů</string>
-  <string name="relays">Relé</string>
-  <string name="relaying">Používání relé</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">SpuÅ¡tÄ?ní zaÅ?ízení jako neodchozího relé</string>
-  <string name="relay_port">Port relé</string>
-  <string name="listening_port_for_your_tor_relay">Naslouchání Vašeho Tor relé</string>
-  <string name="enter_or_port">Zadejte OR port</string>
-  <string name="relay_nickname">PÅ?ezdívka relé</string>
-  <string name="the_nickname_for_your_tor_relay">PÅ?ezdívka VaÅ¡eho Tor relé</string>
-  <string name="enter_a_custom_relay_nickname">Zadejte klientskou pÅ?ezdívku relé</string>
-  <string name="reachable_addresses">Dostupné adresy</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">BÄ?žet jako klient za firewallem s restriktivní politikou</string>
-  <string name="reachable_ports">Dostupné porty</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostupné za restriktivním firewallem</string>
-  <string name="enter_ports">Zadejte porty</string>
-  <string name="enable_hidden_services">Skrytý hosting služby</string>
-  <string name="run_servers_accessible_via_the_tor_network">umožnit serveru na zaÅ?ízení být pÅ?ístupné skrze síť Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">vložte porty localhostu pro skryté služby</string>
-  <string name="hidden_service_ports">Skryté porty služby</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresovatelné jméno pro vaši skrytou službu (generováno automaticky)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">umožnit ladicí informace na výstup (musí používat adb nebo aLogCat k prohlížení)</string>
-  <string name="project_home">Domovské(á) umístÄ?ní projektu</string>
-  <string name="the_tor_license">Tor Licence</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software tÅ?etích stran:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Aplikace požaduje otevÅ?ení skrytého portu serveru %S k síti Tor. Toto je bezpeÄ?nÄ?, pokud aplikaci důvÄ?Å?ujete.</string>
-  <string name="found_existing_tor_process">nalezev existující Tor proces�</string>
+    <string name="found_existing_tor_process">nalezev existující Tor proces�</string>
   <string name="something_bad_happened">Stalo se nÄ?co Å¡patného. Zkontrolujte log</string>
-  <string name="hidden_service_on">skrytá služba na:</string>
-  <string name="unable_to_read_hidden_service_name">nelze Ä?íst název skryté služby</string>
+    <string name="unable_to_read_hidden_service_name">nelze Ä?íst název skryté služby</string>
   <string name="unable_to_start_tor">Nelze spustit Tor:</string>
-  <string name="unable_to_reset_tor">Restartujte vaÅ¡e zaÅ?ízení, nejsme schopni resetovat Tor!</string>
-  <string name="pref_use_sys_iptables_title">Použít defaultní Iptables</string>
-  <string name="pref_use_sys_iptables_summary">použít vestavÄ?né iptables binárky místo tÄ?ch dodávaných s Orbotem</string>
-  <string name="error_installing_binares">Nelze nainstalovat nebo aktualizovat Tor binárky.</string>
-  <string name="pref_use_persistent_notifications">Vždy zobrazit ikonu ve stavovém Å?ádku, pokud je Orbot pÅ?ipojen.</string>
-  <string name="pref_use_persistent_notifications_title">Notifikace vždy zapnuté</string>
-  <string name="notification_using_bridges">Bridge povoleny!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jazyk</string>
-  <string name="set_locale_summary">Zvolte jazyk pro Orbot</string>
-  <string name="wizard_locale_title">Zvolte jazyk</string>
-  <string name="wizard_locale_msg">Ponechat standartní, nebo pÅ?epnout stávající jazyk</string>
-  <string name="btn_save_settings">Uložit nastavení</string>
-  <string name="bandwidth_">ŠíÅ?ka pásma:</string>
-  <string name="down">stahování</string>
-  <string name="up">nahrávání</string>
-  <string name="pref_disable_network_title">Vypnout uspávání sítÄ?</string>
-  <string name="pref_disable_network_summary">Uspat Tor když není k dispozici pÅ?ístup k Internetu</string>
-  <string name="newnym">VaÅ¡e identita na Toru byla zmÄ?nÄ?na!</string>
-  <string name="menu_use_chatsecure">Použít ChatSecure</string>
-  <string name="permission_manage_tor_label">Spravovat Tor</string>
-  <string name="permission_manage_tor_description">Umožnit této aplikaci ovládat službu Tor</string>
-  <string name="install_apps_">Nainstalovat aplikace?</string>
-  <string name="restart_orbot_to_use_this_bridge_">Pro projevení zmÄ?n restartujte Orbot</string>
-  <string name="menu_qr">QR kódy</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Aktivovat</string>
-  <string name="send_email">Pošli email</string>
-  <string name="standard_browser">Standartní prohlížeÄ?</string>
+    <string name="newnym">VaÅ¡e identita na Toru byla zmÄ?nÄ?na!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-cs/colors.xml b/orbotservice/src/main/res/values-cs/colors.xml
deleted file mode 100644
index af92426f..00000000
--- a/orbotservice/src/main/res/values-cs/colors.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-    <resources>
-        <color name="panel_background">#ffffff</color>
-        <color name="panel_background_dark">#efefef</color>
-        <color name="panel_background_main">#efefef</color>
-        <color name="bright_green">#ccff2a</color>
-        <color name="dark_green">#669901</color>
-        <color name="dark_purple">#3f2b4f</color>
-    </resources>
diff --git a/orbotservice/src/main/res/values-cs/strings.xml b/orbotservice/src/main/res/values-cs/strings.xml
index 65e386fa..6e108c0d 100644
--- a/orbotservice/src/main/res/values-cs/strings.xml
+++ b/orbotservice/src/main/res/values-cs/strings.xml
@@ -1,74 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">spustit a vypnout Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se spouští�</string>
+    <string name="status_starting_up">Orbot se spouští�</string>
   <string name="status_activated">PÅ?ipojen k síti Tor</string>
   <string name="status_disabled">\"Orbot je deaktivován</string>
   <string name="status_shutting_down">Orbot se vypíná</string>
   <string name="tor_process_starting">Startuji Tor klientaâ?¦</string>
   <string name="tor_process_complete">hotovo.</string>
-  <string name="tor_process_waiting">Ä?ekám.</string>
-  <string name="not_anonymous_yet">VAROVÃ?NÃ?: VaÅ¡e komunikace jeÅ¡tÄ? není anonymní! Prosím nastavte vaÅ¡im aplikacím HTTP proxy 127.0.0.1:8118 nebo SOCKS4A Ä?i SOCKS5 proxy 172.0.0.1:9050</string>
-  <string name="menu_home">Domů</string>
-  <string name="menu_browse">Prohlížet</string>
-  <string name="menu_settings">Nastavení</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Pomoc</string>
-  <string name="menu_apps">Aplikace</string>
-  <string name="menu_start">Zapnout</string>
-  <string name="menu_stop">Vypnout</string>
-  <string name="menu_about">O aplikaci</string>
-  <string name="button_help">Pomoc</string>
-  <string name="button_close">ZavÅ?ít</string>
-  <string name="button_about">O aplikaci</string>
-  <string name="button_clear_log">VyÄ?istit log</string>
-  <string name="menu_verify">OvÄ?Å?it</string>
-  <string name="menu_exit">Konec</string>
-  <string name="press_to_start">- podržte pro spuÅ¡tÄ?ní -</string>
-  <string name="pref_trans_proxy_group">Transparentní proxy (vyžaduje roota)</string>
-  <string name="pref_trans_proxy_title">Transparentní proxy</string>
-  <string name="pref_trans_proxy_summary">Automatické Torování aplikací</string>
-  <string name="pref_transparent_all_title">Torovat všechno</string>
-  <string name="pref_transparent_all_summary">Proxynovat všechny aplikace skrz Tor</string>
-  <string name="pref_transparent_port_fallback_title">Záložní port pro proxy</string>
-  <string name="pref_transparent_port_fallback_summary">VAROVÃ?NÃ?: Obchází Ä?asté porty (80, 443, etc). *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují.</string>
-  <string name="pref_transparent_port_title">Seznam portů</string>
-  <string name="pref_transparent_port_summary">Seznam portů co proxynovat. *POUŽIJTE JEN* pokud módy \'All\' nebo \'App\' nefungují</string>
-  <string name="pref_transparent_port_dialog">Zadejte porty pro proxynování</string>
-  <string name="pref_has_root">Vyžaduje root pÅ?ístup</string>
-  <string name="pref_has_root_summary">Požádat o práva roota kvůli transparentnímu proxy</string>
-  <string name="status_install_success">Binárky toru byly úspÄ?Å¡nÄ? nainstalovány!</string>
-  <string name="title_error">Chyba aplikace</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O Orbotovi</string>
-  <string name="btn_next">Další</string>
-  <string name="btn_back">ZpÄ?t</string>
-  <string name="btn_finish">DokonÄ?it</string>
-  <string name="btn_cancel">Zrušit</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_permissions_root">Práva udÄ?lena</string>
-  <string name="wizard_proxy_help_info">Nastavení Proxy</string>
-  <string name="wizard_final">Orbot je pÅ?ipraven!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Hlavní</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Varování</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentní proxy</string>
-  <string name="wizard_transproxy_none">Není</string>
-  <string name="status">Status</string>
-  <string name="error">Chyba</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Uloz nastaveni</string>
-  <string name="menu_vpn">Aplikace</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-cy/strings.xml b/orbotservice/src/main/res/values-cy/strings.xml
index a48a10a4..2885b44d 100644
--- a/orbotservice/src/main/res/values-cy/strings.xml
+++ b/orbotservice/src/main/res/values-cy/strings.xml
@@ -1,81 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">cychwyn a stopio Tor</string>
-  <string name="tor_proxy_service_process">gwasanaethdirpwrytor</string>
-  <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
+    <string name="status_starting_up">Mae Orbot yn cychwyn...</string>
   <string name="status_activated">Wedi cysylltu â rhwydwaith Tor</string>
   <string name="tor_process_starting">Yn cychwyn cleient Tor</string>
   <string name="tor_process_complete">Wedi ei gwblhau.</string>
-  <string name="tor_process_waiting">yn aros.</string>
-  <string name="not_anonymous_yet">RHYBUDD: Nid yw eich traffig yn ddienw eto! Os gwelwch yn dda ffurfweddu eich ceisiadau at arfer HTTP proxy 127.0.0.1:8118 neu SOCKS4A neu ddirprwy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Hafan</string>
-  <string name="menu_browse">Pori</string>
-  <string name="menu_settings">Gosodiadau</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_start">Cychwyn</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">Amdanom ni</string>
-  <string name="main_layout_download">Llwytho i lawr</string>
-  <string name="main_layout_upload">Llwytho i fyny</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Cau</string>
-  <string name="button_about">Amdanom ni</string>
-  <string name="button_clear_log">Clirio log</string>
-  <string name="menu_verify">Gwirio</string>
-  <string name="menu_exit">Gadael</string>
-  <string name="press_to_start">- pwyswch yn hir i gychwyn -</string>
-  <string name="pref_trans_proxy_group">Dirprwyo tryloyw (angen Gwreiddyn)</string>
-  <string name="pref_trans_proxy_title">Dirprwyo tryloyw</string>
-  <string name="pref_trans_proxy_summary">\'Torifying\' o Apps yn awtomatig</string>
-  <string name="pref_transparent_all_title">Popeth Tor</string>
-  <string name="pref_transparent_all_summary">Traffig dirprwy i\'r holl apps drwy Tor</string>
-  <string name="pref_transparent_port_title">Rhestr Porthau</string>
-  <string name="pref_transparent_port_summary">Rhestr o borthau i\'w dirprwyo. *DEFNYDDIER YN UNIG* os nad yw modd \'Popeth\' neu \'App\' yn gweithio</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Am Orbot</string>
-  <string name="btn_next">Nesaf</string>
-  <string name="btn_back">Yn ôl</string>
-  <string name="btn_finish">Gorffen</string>
-  <string name="btn_okay">Iawn</string>
-  <string name="btn_cancel">Diddymu</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Rhai manylion am Orbot</string>
-  <string name="wizard_permissions_root">Caniatâd wedi\'i roi</string>
-  <string name="wizard_proxy_help_info">Gosodiadau Dirprwy</string>
-  <string name="wizard_final">Mae Orbot yn barod!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Cyffredinol</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Rhybudd</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Dirprwyo\'n dryloyw</string>
-  <string name="wizard_transproxy_none">Dim</string>
-  <string name="pref_select_apps">Dewiswch Apps</string>
-  <string name="pref_select_apps_summary">Dewiswch Apps i\'w llwybro drwy Tor</string>
-  <string name="pref_node_configuration">Ffurfweddiad nod</string>
-  <string name="pref_entrance_node">Nodau mynediad</string>
-  <string name="pref_entrance_node_dialog">I mewn i nodau mynediad</string>
-  <string name="pref_proxy_password_summary">Cyfrinair y Dirprwy (Dewisol)</string>
-  <string name="status">Statws</string>
-  <string name="error">Gwall</string>
-  <string name="exit_nodes">Nodau Gadael</string>
-  <string name="enter_exit_nodes">I mewn i Nodau Gadael</string>
-  <string name="exclude_nodes">Yn eithrio Nodau</string>
-  <string name="enter_exclude_nodes">I mewn i Nodau Eithrio</string>
-  <string name="the_tor_license">Trwydded Tor</string>
-  <string name="third_party_software">Meddalwedd 3ydd-parti</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Dewiswch locale ac iaith i Orbot</string>
-  <string name="wizard_locale_title">Dewiswch iaith</string>
-  <string name="btn_save_settings">Cadw\'r gosodiadau</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-da/strings.xml b/orbotservice/src/main/res/values-da/strings.xml
index 54b5004d..ddbe9829 100644
--- a/orbotservice/src/main/res/values-da/strings.xml
+++ b/orbotservice/src/main/res/values-da/strings.xml
@@ -2,202 +2,25 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot er en gratis og åben proxy-applikation, der gør det muligt at anvende internettet mere sikkert fra andre programmer. Orbot bruger Tor til at kryptere internettrafikken, og skjuler den ved at sende den gennem serverere, lokaliseret i hele verden. Tor er gratis og åben software, der kan hjælpe dig mod netværksovervågning kaldet trafikanalyse, der kan true din personlige frihed, dit privatliv, handelsaktivitet og forhold.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start og stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot starter op ...</string>
+    <string name="status_starting_up">Orbot starter op ...</string>
   <string name="status_activated">Der er forbindelse til Tor-netværket</string>
   <string name="status_disabled">Orbot er slået fra</string>
   <string name="tor_process_starting">Starter Tor klienten...</string>
   <string name="tor_process_complete">udført.</string>
-  <string name="tor_process_waiting">afventer.</string>
-  <string name="not_anonymous_yet">ADVARSEL: Din trafik er ikke endnu ikke anonym! Konfigurér venligst dine programmer, så de bruger HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5-proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Hjem</string>
-  <string name="menu_browse">Brows</string>
-  <string name="menu_settings">Indstillinger</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Hjælp</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">Om</string>
-  <string name="main_layout_download">Henter</string>
-  <string name="main_layout_upload">Sender</string>
-  <string name="button_help">Hjælp</string>
-  <string name="button_close">Luk</string>
-  <string name="button_about">Om</string>
-  <string name="button_clear_log">Ryd log</string>
-  <string name="menu_verify">Tjek</string>
-  <string name="menu_exit">Afslut</string>
-  <string name="press_to_start">- hold nede for start -</string>
-  <string name="pref_trans_proxy_group">Transparent proxy (kræver Root)</string>
-  <string name="pref_trans_proxy_title">Transparent proxy</string>
-  <string name="pref_trans_proxy_summary">Anvend automatisk Tor på programmer</string>
-  <string name="pref_transparent_all_title">Brug Tor til alt</string>
-  <string name="pref_transparent_all_summary">Proxy-trafik for alle programmer gennem Tor</string>
-  <string name="pref_transparent_port_fallback_title">Tilbagefaldsport for proxy</string>
-  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår almindelige porte (80, 443, osv). Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
-  <string name="pref_transparent_port_title">Portliste</string>
-  <string name="pref_transparent_port_summary">Liste af porte der skal filtreres gennem proxyen. Bør *KUN* anvendes hvis \'All\' eller \'App\' tilstande ikke virker.</string>
-  <string name="pref_transparent_port_dialog">Indtast porte der skal filtreres gennem proxyen.</string>
-  <string name="pref_has_root">Forespørg om Root-adgang</string>
-  <string name="pref_has_root_summary">Kræver root privilegier for gennemsigtig proxy.</string>
-  <string name="status_install_success">Tor\'s binære filer succesfuldt installeret!</string>
-  <string name="status_install_fail">Tor\'s binære filer kunne ikke installeres. Læs venligst loggen og underret tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Programfejl</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Om Orbot</string>
-  <string name="btn_next">Næste</string>
-  <string name="btn_back">Tilbage</string>
-  <string name="btn_finish">Afslut</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Fortryd</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Nogle Orbot detaljer</string>
-  <string name="wizard_permissions_root">Tilladelse givet</string>
-  <string name="wizard_permissions_stock">Orbot tilladelser</string>
-  <string name="wizard_premissions_msg_root">Fremragende! Vi kan se at du har givet root tilladelser til Orbot . Vi vil bruge denne magt med omtanke.</string>
-  <string name="wizard_permissions_msg_stock">Selvom det ikke er påkrævet, kan Orbot blive et mere nyttigt værktøj, hvis din enhed har root adgang. Benyt knappen herunder for at tildele Orbot superkræfter!</string>
-  <string name="wizard_permissions_no_root">Hvis du ikke har root adgang eller ikke aner hvad vi snakker om, skal du være sikker på at du benytter dig af apps som kan fungere med Orbot.</string>
-  <string name="wizard_permissions_consent">Jeg forstår og vil gerne fortsætte uden Superuser</string>
-  <string name="wizard_permission_enable_root">Tillad root for Orbot</string>
-  <string name="wizard_configure">Indstil Torifikation</string>
-  <string name="wizard_configure_msg">Orbot giver dig mulighed for at føre al app-trafik igennem Tor ELLER vælge individuelt imellem apps.</string>
-  <string name="wizard_configure_all">Kør alle programmers trafik gennem Tor proxyen</string>
-  <string name="wizard_configure_select_apps">Vælg individuelle apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-aktiverede apps</string>
-  <string name="wizard_tips_msg">De nedenstående programmer er udviklet for at fungere med Orbot. Klik hver knap for at installere nu. Ellers kan de senere findes på Google play, på hjemmesiden GuardianProject.info eller via F-Droid.org.</string>
-  <string name="wizard_tips_proxy">Proxy indstillinger - Lær hvordan du konfigurerer apps til at fungere med Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo søgemaskine-programmet</string>
-  <string name="wizard_tips_twitter">Indstil Twitter proxyen til værten \"localhost\" og port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-indstillinger</string>
-  <string name="wizard_final">Orbot er klar!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Dette vil åbne din browser på https://check.torproject.org for at se om Orbot er korrekt konfigureret og at du er forbundet til Tor.</string>
-  <string name="pref_hs_group">Udbyd en skjult service</string>
-  <string name="pref_general_group">Generelt</string>
-  <string name="pref_start_boot_title">Start Orbot ved opstart</string>
-  <string name="pref_start_boot_summary">Start automatisk Orbot og forbind til Tor når din android enhed starter</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Advarsel</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Tilladelser</string>
-  <string name="wizard_permissions_root_msg1">Du kan eventuelt give Orbot \'Superuser\' adgang for at aktivere funktioner som f.eks. Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Hvis du ikke vil dette, så vær sikker på at du bruger apps som fungerer med Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-aktiverede apps</string>
-  <string name="wizard_tips_play">Find alle Guardian Project programmer på Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transperant Proxying</string>
-  <string name="wizard_transproxy_msg">Dette tillader at dine apps automatisk kører gennem Tor netværket uden nogen konfiguration.</string>
-  <string name="wizard_transproxy_hint">(Check denne boks hvis du ikke aner hvad vi snakker om)</string>
-  <string name="wizard_transproxy_none">Ingen</string>
-  <string name="pref_transparent_tethering_title">Tor internet-hotspot</string>
-  <string name="pref_transparent_tethering_summary">Start Tor gennemsigtig proxy for Wi-Fi og internetdeling over USB (kræver genstart)</string>
-  <string name="button_grant_superuser">Anmod om Superuser adgang</string>
-  <string name="pref_select_apps">Vælg apps</string>
-  <string name="pref_select_apps_summary">Vælg apps som føres gennem Tor</string>
-  <string name="pref_node_configuration">Konfiguration af Tor node</string>
-  <string name="pref_node_configuration_summary">Avancerede indstillinger, der kan reducere anonymiteten</string>
-  <string name="pref_entrance_node">Indgangspunkter til Tor netværket</string>
-  <string name="pref_entrance_node_summary">Fingeraftryk, servernavne, lande og adresser for første hop</string>
-  <string name="pref_entrance_node_dialog">Indtast indgangspunkter</string>
-  <string name="pref_proxy_title">Udgående netværksproxy (Valgfri)</string>
-  <string name="pref_proxy_type_title">Udgående proxy-type</string>
-  <string name="pref_proxy_type_summary">Protokol til proxy serveren: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Indtast proxy type</string>
-  <string name="pref_proxy_host_title">Udgående proxy-vært</string>
-  <string name="pref_proxy_host_summary">Værtsnavn for proxyserver</string>
-  <string name="pref_proxy_host_dialog">Indtast proxy vært</string>
-  <string name="pref_proxy_port_title">Udgående proxy-port</string>
-  <string name="pref_proxy_port_summary">Proxyserverens port</string>
-  <string name="pref_proxy_port_dialog">Indtast proxy port</string>
-  <string name="pref_proxy_username_title">Brugernavn for udgående proxy</string>
-  <string name="pref_proxy_username_summary">Proxy brugernavn (Valgfri)</string>
-  <string name="pref_proxy_username_dialog">Indtast proxy-brugernavnet</string>
-  <string name="pref_proxy_password_title">Kodeord for udgående proxy</string>
-  <string name="pref_proxy_password_summary">Adgangskode for udgående proxy (Valgfri)</string>
-  <string name="pref_proxy_password_dialog">Indtast proxy-kodeordet</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Opsætter total, gennemsigtig proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Opsætter program-afhængig transparent proxy...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERET</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy slået til for internetdeling!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: fejl under start af den gennemsigtige proxy!</string>
-  <string name="transproxy_rules_cleared">Indstillinger for TransProxy er nulstillet</string>
-  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Opsætter port-baseret gennemsigtig proxy...</string>
-  <string name="bridge_error">Fejl ved Bro</string>
-  <string name="bridge_requires_ip">For at kunne bruge bro-komponenten, skal du indaste mindst én IP-adresse på en bro.</string>
-  <string name="send_email_for_bridges">Send en e-mail til bridges@xxxxxxxxxxxxxx med teksten \"get bridges\" alene i mailens tekstfelt fra en gmail-konto.</string>
-  <string name="error">Fejl</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Din ReachableAdresses indstilling forudsagede en fejl!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor processen:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Din ReachableAdresses indstilling forudsagede en fejl!</string>
   <string name="your_relay_settings_caused_an_exception_">Dine relæindstillinger forårsagede en fejl!</string>
-  <string name="exit_nodes">Udgangspunkter</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeraftryk, servernavne, lande og adresser for det sidste hop</string>
-  <string name="enter_exit_nodes">Indtast udgangspunkter</string>
-  <string name="exclude_nodes">Ekskluder punkter</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeraftryk, servernavne, lande og adresser der skal ekskluderes</string>
-  <string name="enter_exclude_nodes">Indtast noder at ekskludere</string>
-  <string name="strict_nodes">Strikte punkter</string>
-  <string name="use_only_these_specified_nodes">Brug *kun* disse specificerede punkter</string>
-  <string name="bridges">Broer</string>
-  <string name="use_bridges">Brug broer</string>
-  <string name="bridges_obfuscated">Skjulte broer</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Slå alternative indgangspunkter til Tor netværket til</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de indstillede broer er skjulte broer</string>
-  <string name="ip_address_and_port_of_bridges">IP adresser og porte på broer</string>
-  <string name="enter_bridge_addresses">Indtast bro-adresser</string>
-  <string name="relays">Relæer</string>
-  <string name="relaying">Relæfunktion</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Lad denne enhed være et ikke-udgangs relæ</string>
-  <string name="relay_port">Relæets port</string>
-  <string name="listening_port_for_your_tor_relay">Port at dette Tor relæ lytter på</string>
-  <string name="enter_or_port">Indtast OR port</string>
-  <string name="relay_nickname">Relænavn</string>
-  <string name="the_nickname_for_your_tor_relay">Kaldenavnet for dit Tor-relæ</string>
-  <string name="enter_a_custom_relay_nickname">Indtast et valgfrit navn for relæet</string>
-  <string name="reachable_addresses">Opnåelige adresser</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kør som en klient bag en firewall med restrektive regler</string>
-  <string name="reachable_ports">Porte hvor forbindelse kan dannes</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Porte bag en restriktiv firewall hvor en forbindelse kan oprettes</string>
-  <string name="enter_ports">Indtast porte</string>
-  <string name="enable_hidden_services">Udbyd en service</string>
-  <string name="run_servers_accessible_via_the_tor_network">tillad at en server på enheden er tilgængelig via Tor-netværket</string>
-  <string name="enter_localhost_ports_for_hidden_services">indtast lokale adresser for skjulte services</string>
-  <string name="hidden_service_ports">Skjulte service porte</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">den absolutte sti til din skjulte service (genereres automatisk)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver fejlfindings-log til output (der skal anvendes adb eller aLogCat for at se dette)</string>
-  <string name="project_home">Projekt hjemmeside(r):</string>
-  <string name="the_tor_license">Tor licensen</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Tredjeparts-software:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="hidden_service_request">Et program vil åbne den skjulte server-port %S til Tor netværket. Dette er sikkert hvis du stoler på programmet.</string>
-  <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
+    <string name="found_existing_tor_process">fandt eksisterende Tor process...</string>
   <string name="something_bad_happened">Noget slemt er sket. Check loggen</string>
-  <string name="hidden_service_on">skjult service på:</string>
-  <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
+    <string name="unable_to_read_hidden_service_name">ikke i stand til at læse navnet på den skjulte service</string>
   <string name="unable_to_start_tor">Kunne ikke starte Tor:</string>
-  <string name="unable_to_reset_tor">Genstart din enhed. Ude af stand til at nulstille tor!</string>
-  <string name="pref_use_sys_iptables_title">Anvend standardindstillinger for Iptables</string>
-  <string name="pref_use_sys_iptables_summary">anvend det indbyggede iptables-program i stedet for versionen der følger med Orbot</string>
-  <string name="error_installing_binares">Kunne ikke installere eller opgradere Tor programmerne.</string>
-  <string name="pref_use_persistent_notifications">Vis altid ikonet i statuslinien når Orbot er forbundet til netværket</string>
-  <string name="pref_use_persistent_notifications_title">Vis altid notifikationer</string>
-  <string name="notification_using_bridges">Broer er aktiverede!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Sprog</string>
-  <string name="set_locale_summary">Vælg sproginstillinger og sprog for Orbot</string>
-  <string name="wizard_locale_title">Vælg sprog</string>
-  <string name="wizard_locale_msg">Behold standardindstilling eller skift det nuværende sprog</string>
-  <string name="powered_by">drevet af Tor</string>
-  <string name="btn_save_settings">Gem Indstillinger</string>
-  <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
-  <string name="bandwidth_">BÃ¥ndbredde:</string>
+    <string name="no_internet_connection_tor">Ingen internetforbindelse; Tor er på standby...</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-de-rAT/strings.xml b/orbotservice/src/main/res/values-de-rAT/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-de-rAT/strings.xml
+++ b/orbotservice/src/main/res/values-de-rAT/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-de/strings.xml b/orbotservice/src/main/res/values-de/strings.xml
index acf26626..e316a463 100644
--- a/orbotservice/src/main/res/values-de/strings.xml
+++ b/orbotservice/src/main/res/values-de/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ist eine kostenlose Proxy-Anwendung, mit deren Hilfe andere Anwendungen das Internet sicherer nutzen können. Orbot verwendet Tor, um Ihren Internetverkehr zu verschlüsseln und ihn dann zu verbergen, indem er über eine Reihe weltweit verteilter Computer geleitet wird. Tor ist ein freies Programm und ein offenes Netzwerk, das Ihnen hilft, sich gegen Angriffe auf die persönliche Freiheit und die Privatsphäre oder auf vertrauliche Geschäftsbeziehungen sowie gegen die Datenüberwachung aus Staatssicherheitsgründen zu wehren.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor starten und beenden</string>
-  <string name="tor_proxy_service_process">Tor-Vermittlungsdienst</string>
-  <string name="status_starting_up">Orbot startet â?¦</string>
+    <string name="status_starting_up">Orbot startet â?¦</string>
   <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string>
   <string name="status_disabled">Orbot ist deaktiviert</string>
   <string name="status_shutting_down">TorService wird heruntergefahren</string>
   <string name="tor_process_starting">Tor-Programm wird gestartet â?¦</string>
   <string name="tor_process_complete">abgeschlossen.</string>
-  <string name="tor_process_waiting">warten.</string>
-  <string name="not_anonymous_yet">WARNUNG: Ihr Datenverkehr ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass Sie entweder den HTTP-Proxy 127.0.0.1:8118 oder den SOCKS4A bzw. SOCKS5-Proxy 127.0.0.1:9050 verwenden.</string>
-  <string name="menu_home">Start</string>
-  <string name="menu_browse">Durchsuchen</string>
-  <string name="menu_settings">Einstellungen</string>
-  <string name="menu_log">Protokoll</string>
-  <string name="menu_info">Hilfe</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stopp</string>
-  <string name="menu_about">Ã?ber</string>
-  <string name="menu_promo_apps">Weitere Apps â?¦</string>
-  <string name="main_layout_download">Heruntergeladen</string>
-  <string name="main_layout_upload">Hochgeladen</string>
-  <string name="button_help">Hilfe</string>
-  <string name="button_close">SchlieÃ?en</string>
-  <string name="button_about">Ã?ber</string>
-  <string name="button_clear_log">Protokoll löschen</string>
-  <string name="menu_verify">�berprüfen</string>
-  <string name="menu_exit">Beenden</string>
-  <string name="menu_scan">BrückenQR scannen</string>
-  <string name="menu_share_bridge">BrückenQR teilen</string>
-  <string name="press_to_start">- Zum Starten gedrückt halten -</string>
-  <string name="pref_trans_proxy_group">Transparente Vermittlung (benötigt Root-Rechte)</string>
-  <string name="pref_trans_proxy_title">Transparente Vermittlung</string>
-  <string name="pref_trans_proxy_summary">Anwendungen automatisch durch Tor leiten</string>
-  <string name="pref_transparent_all_title">Alles durch Tor leiten</string>
-  <string name="pref_transparent_all_summary">Verbindungen aller Anwendungen durch Tor leiten</string>
-  <string name="pref_transparent_port_fallback_title">Rückfallportvermittlung</string>
-  <string name="pref_transparent_port_fallback_summary">WARNUNG: Umgeht öffentliche Ports (80, 443, usw.). *NUR BENUTZEN*, wenn »All« oder »App«-Modus nicht funktioniert.</string>
-  <string name="pref_transparent_port_title">Portliste</string>
-  <string name="pref_transparent_port_summary">Liste von Anschlüssen zur Vermittlung. *NUR BENUTZEN* wenn »All« oder »App«-Modus nicht funktioniert</string>
-  <string name="pref_transparent_port_dialog">Ports zur Vermittlung eingeben</string>
-  <string name="pref_has_root">Anfrage auf Root-Zugriff</string>
-  <string name="pref_has_root_summary">Anfrage auf Root-Zugriff für transparente Vermittlung</string>
-  <string name="status_install_success">Die Tor-Programmdateien wurden erfolgreich installiert!</string>
-  <string name="status_install_fail">Die Tor-Programmdateien konnten nicht erfolgreich installiert werden. Bitte prüfen Sie das Protokoll und wenden Sie sich an tor-assistants@xxxxxxxxxxxxxx.</string>
-  <string name="title_error">Anwendungsfehler</string>
-  <string name="wizard_title">Willkommen bei Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ã?ber Orbot</string>
-  <string name="btn_next">Weiter</string>
-  <string name="btn_back">Zurück</string>
-  <string name="btn_finish">Fertigstellen</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Abbrechen</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Nähere Informationen zu Orbot</string>
-  <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, LibEvent und Polipo enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>
-  <string name="wizard_permissions_root">Berechtigung erteilt</string>
-  <string name="wizard_permissions_stock">Orbot-Berechtigungen</string>
-  <string name="wizard_premissions_msg_root">Ausgezeichnet! Sie haben Orbot Root-Rechte eingeräumt. Orbot wird diese Berechtigung sinnvoll verwenden.</string>
-  <string name="wizard_permissions_msg_stock">Es ist nicht zwingend erforderlich, aber Orbot kann ein leistungsfähigeres Werkzeug werden, wenn Ihr Gerät gerootet ist. Drücken Sie unten auf den Schalter, um Orbot Superuser-Rechte zu gewähren.</string>
-  <string name="wizard_permissions_no_root">Falls Sie keinen Root-Zugriff haben oder nicht wissen, was das ist, achten Sie darauf, dass Sie Anwendungen verwenden, die Orbot nutzen können.</string>
-  <string name="wizard_permissions_consent">Ich habe verstanden und möchte ohne Systemverwalterzugriff weitermachen</string>
-  <string name="wizard_permission_enable_root">Orbot Root-Rechte einräumen</string>
-  <string name="wizard_configure">Torification konfigurieren</string>
-  <string name="wizard_configure_msg">Orbot lässt Ihnen die Wahl, den Datenverkehr aller Anwendungen durch Tor zu leiten ODER einzelne Anwendungen auszuwählen.</string>
-  <string name="wizard_configure_all">Den Verkehr aller Anwendungen durch Tor leiten</string>
-  <string name="wizard_configure_select_apps">Anwendungen einzeln für Tor auswählen</string>
-  <string name="wizard_tips_tricks">Orbot aktivierte Anwendungen</string>
-  <string name="wizard_tips_msg">Die unten aufgeführten Anwendungen wurden für die Zusammenarbeit mit Orbot entwickelt. Wählen Sie diese durch anklicken zum Installieren aus oder laden Sie diese später bei Google Play,  GuardianProject.info oder F-Droid.org herunter.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ein sicheres Sofortnachrichtenprogramm für Android</string>
-  <string name="wizard_tips_proxy">Vermittlungseinstellungen - Lernen, wie Sie Anwendungen so konfigurieren, dass sie mit Orbot zusammenarbeiten.</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo-Suchmaschinen-App</string>
-  <string name="wizard_tips_twitter">Twitter-Proxy auf den Rechner »localhost« und Port 8118 einstellen</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Schreiben Sie eine Geschichte und überlassen Sie Tor das Sicherheitsmanagement!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Vermittlungseinstellungen</string>
-  <string name="wizard_proxy_help_msg">Wenn die verwendete Android-App die Nutzung eines HTTP- oder SOCKS-Proxys unterstützt, kann sie mit Orbot verknüpft werden und Tor nutzen.\n\n\nDie Einstellung für \'Host\' ist 127.0.0.1 oder \'localhost\'. Für HTTP wird der Port 8118 eingetragen. Für SOCKS der Port 9050. Sie sollten möglichst SOCKS4A oder SOCKS5 verwenden.\n\n\n\n Mehr Informationen zur Verwendung von Proxys unter Android finden Sie in den FAQ auf http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot ist bereit!</string>
-  <string name="wizard_final_msg">Millionen Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen..\n\nJournalisten und Blogger, Verteidiger für Menschenrechte, Polizeibeamte, Soldaten, Firmen, Bürger repressiver Regime und ganz normale Menschen � und jetzt können Sie das auch!</string>
-  <string name="wizard_exit_at_first_screen_toast">Bitte konfigurieren Sie Orbot, bevor Sie es verwenden können!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - was aber NICHT bedeutet, dass Ihr Gerät sicher ist. Sie können den Knopf »Browser« verwenden, um Ihre Verbindung zu überprüfen. \n\nBesuchen Sie uns auf https://guardianproject.info/apps/orbot oder senden Sie uns eine E-Mail an help@xxxxxxxxxxxxxxxxxxxx, um mehr zu erfahren.</string>
-  <string name="tor_check">Durch das Bestätigen mit »OK« wird die Seite https://check.torproject.org in Ihrem Webbrowser geöffnet, sodass Sie überprüfen können, ob Orbot richtig konfiguriert ist und Sie mit Tor verbunden sind.</string>
-  <string name="pref_hs_group">Versteckte Dienste</string>
-  <string name="pref_general_group">Allgemein</string>
-  <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string>
-  <string name="pref_start_boot_summary">Automatisches Starten von Orbot und Verbinden mit Tor beim Start des Android-Gerätes</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot bringt Tor zu Android!\n\nTor unterstützt Sie, sich gegen Zensur, Datenrückverfolgung und die �berwachung des Netzes zu wehren, die Ihre Privatsphäre, vertraulichen Informationen und persönlichen Beziehungen bedrohen.\n\nDieser Assistent hilft Ihnen dabei, Orbot und Tor einzurichten.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Warnung</string>
-  <string name="wizard_warning_msg">Orbot nur zu installieren, anonymisiert nicht automatisch den mobilen Netzwerkverkehr.\n\nSie müssen Orbot, das Gerät und die Apps konfigurieren, um Tor erfolgreich zu verwenden.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Zugriffsrechte</string>
-  <string name="wizard_permissions_root_msg1">Sie können Orbot wahlweise Systemverwalterzugriff geben, um erweiterte Funktionen zu aktivieren, wie z.B. transparente Vermittlung.</string>
-  <string name="wizard_permissions_root_msg2">Wenn Sie dies nicht möchten, stellen Sie bitte sicher, Anwendungen zu verwenden, die für die Zusammenarbeit mit Orbot geschrieben wurden.</string>
-  <string name="wizard_permissions_no_root_msg">Ihr Gerät scheint nicht gerootet zu sein oder stellt keinen Root oder \'Systemverwalterzugriff bereit.\n\nBitte nutzen Sie den \'Apps\' Modus auf dem Hauptbildschirm.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot aktivierte Anwendungen</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Sichere Unterhaltungsanwendung mit vertraulicher Verschlüsselung</string>
-  <string name="wizard_tips_orweb">Orfox: Datenschutz optimierter Browser der Tor verwendet</string>
-  <string name="wizard_tips_play">Alle Guardian Project-Anwendungen im Google Play Store finden</string>
-  <string name="wizard_tips_fdroid">Alle Guardian Project-Anwendungen bei F-Droid finden</string>
-  <string name="wizard_tips_fdroid_org">Alle Guardian Project-Anwendungen unter https://f-droid.org finden</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparente Vermittlung</string>
-  <string name="wizard_transproxy_msg">Dies ermöglicht Ihren Anwendungen automatisch das Tor-Netzwerk zu verwenden, ohne dieses konfigurieren zu müssen.</string>
-  <string name="wizard_transproxy_hint">(Dieses Feld auswählen, wenn Sie nicht wissen wovon wir reden)</string>
-  <string name="wizard_transproxy_none">Nichts</string>
-  <string name="pref_transparent_tethering_title">Tor-Anbindung</string>
-  <string name="pref_transparent_tethering_summary">Transparente Tor-Vermittlung für WLAN und angebundene USB-Geräte aktivieren (benötigt einen Neustart)</string>
-  <string name="button_grant_superuser">Systemverwalterzugriff anfordern</string>
-  <string name="pref_select_apps">Anwendungen auswählen</string>
-  <string name="pref_select_apps_summary">Die Anwendungen auswählen, welche durch Tor geleitet werden sollen</string>
-  <string name="pref_node_configuration">Netzknotenkonfiguration</string>
-  <string name="pref_node_configuration_summary">Dies sind erweiterte Einstellungen, die Ihre Anonymität beeinträchtigen können</string>
-  <string name="pref_entrance_node">Eingangsnetzknoten</string>
-  <string name="pref_entrance_node_summary">Fingerabdrücke, Spitznamen, Länder und Adressen für den ersten Knotenpunkt</string>
-  <string name="pref_entrance_node_dialog">Eingangsnetzknoten eingeben</string>
-  <string name="pref_allow_background_starts_title">Hintergrundstatistiken erlauben</string>
-  <string name="pref_allow_background_starts_summary">Erlauben Sie jeder Anwendung, Orbot zu beauftragen, Tor und zugehörige Dienste zu starten</string>
-  <string name="button_proxy_all">Alles über Proxy</string>
-  <string name="button_proxy_none">Nichts über Proxy</string>
-  <string name="button_invert_selection">Auswahl umkehren</string>
-  <string name="pref_proxy_title">Ausgehender Netzwerk-Proxy (optional)</string>
-  <string name="pref_proxy_type_title">Ausgehender Vermittlungstyp</string>
-  <string name="pref_proxy_type_summary">Protokoll zur Verwendung des Proxy Servers: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Vermittlungstyp eingeben</string>
-  <string name="pref_proxy_host_title">Ausgehender Vermittlungsrechner</string>
-  <string name="pref_proxy_host_summary">Rechnername des Vermittlungsservers</string>
-  <string name="pref_proxy_host_dialog">Vermittlungsrechner eingeben</string>
-  <string name="pref_proxy_port_title">Ausgehender Proxy-Anschluss</string>
-  <string name="pref_proxy_port_summary">Anschluss des Vermittlungsservers</string>
-  <string name="pref_proxy_port_dialog">Vermittlungsanschluss eingeben</string>
-  <string name="pref_proxy_username_title">Ausgehender Proxy-Benutzername</string>
-  <string name="pref_proxy_username_summary">Proxy-Benutzername (optional)</string>
-  <string name="pref_proxy_username_dialog">Proxy-Benutzernamen eingeben</string>
-  <string name="pref_proxy_password_title">Ausgehendes Proxy-Passwort</string>
-  <string name="pref_proxy_password_summary">Proxy-Passwort (optional)</string>
-  <string name="pref_proxy_password_dialog">Proxy-Passwort eingeben</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Voll transparente Vermittlung wird eingestellt â?¦</string>
-  <string name="setting_up_app_based_transparent_proxying_">Anwendungsbasierte transparente Vermittlung wird eingestellt â?¦</string>
-  <string name="transparent_proxying_enabled">Transparente Vermittlung AKTIVIERT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy für Anbindung aktiviert!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten der transparenten Vermittlung!</string>
-  <string name="transproxy_rules_cleared">TransProxy-Regeln gelöscht</string>
-  <string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
-  <string name="privoxy_is_running_on_port_">Polipo läuft auf Port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Anschlussbasierte transparente Vermittlung wird eingestellt â?¦</string>
-  <string name="bridge_error">Brückenfehler</string>
-  <string name="bridge_requires_ip">Um die Brückenfunktion nutzen zu können, müssen Sie mindestens eine Brücken-IP-Adresse eingeben.</string>
-  <string name="send_email_for_bridges">Von Ihrem Gmail-Konto eine E-Mail an bridges@xxxxxxxxxxxxxx mit dem Text »get bridges« im Nachrichtenfeld senden.</string>
-  <string name="error">Fehler</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellten erreichbaren Adressen haben einen Ausnahmefehler verursacht!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor-Prozess konnte nicht gestartet werden:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellten erreichbaren Adressen haben einen Ausnahmefehler verursacht!</string>
   <string name="your_relay_settings_caused_an_exception_">Ihre Relaiseinstellungen haben einen Ausnahmefehler verursacht!</string>
-  <string name="exit_nodes">Ausgangsnetzknoten</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitznamen, Länder und Adressen für den letzten Knotenpunkt.</string>
-  <string name="enter_exit_nodes">Ausgangsnetzknoten eingeben</string>
-  <string name="exclude_nodes">Netzknoten ausschlieÃ?en</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitznamen, Länder und Adressen, die ausgeschlossen werden sollen</string>
-  <string name="enter_exclude_nodes">AuszuschlieÃ?ende Netzknoten eingeben</string>
-  <string name="strict_nodes">Absolute Netzknoten</string>
-  <string name="use_only_these_specified_nodes">*AusschlieÃ?lich* diese angegebenen Netzknoten verwenden</string>
-  <string name="bridges">Brücken</string>
-  <string name="use_bridges">Brücken benutzen</string>
-  <string name="bridges_obfuscated">Verschleierte Brücken</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternative Eingangsnetzknoten in das Tor-Netzwerk aktivieren</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivieren, falls Brücken verschleierte Brücken sind</string>
-  <string name="ip_address_and_port_of_bridges">IP-Adresse und Port der Brücken</string>
-  <string name="enter_bridge_addresses">Brückenadressen eingeben</string>
-  <string name="relays">Relais</string>
-  <string name="relaying">Weiterleitung</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Ihr Gerät als Nichtausgangsrelais aktivieren</string>
-  <string name="relay_port">Relaisanschluss</string>
-  <string name="listening_port_for_your_tor_relay">Anschluss, auf dem bei Ihrem Tor-Relais gehört werden soll</string>
-  <string name="enter_or_port">OR-Port eingeben</string>
-  <string name="relay_nickname">Relaisspitzname</string>
-  <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihr Tor-Relais</string>
-  <string name="enter_a_custom_relay_nickname">Einen selbsterstellten Relaisspitznamen eingeben</string>
-  <string name="reachable_addresses">Erreichbare Adressen</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Als Programm hinter einer Firewall mit restriktiven Regeln betreiben</string>
-  <string name="reachable_ports">Erreichbare Ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Die Anschlüsse sind hinter einer restriktiven Firewall erreichbar</string>
-  <string name="enter_ports">Ports eingeben</string>
-  <string name="enable_hidden_services">Versteckte Dienste</string>
-  <string name="run_servers_accessible_via_the_tor_network">Auf dem Gerät einen Server betreiben, auf den das Tor-Netzwerk zugreifen kann</string>
-  <string name="enter_localhost_ports_for_hidden_services">Lokale Ports für versteckte Dienste eingeben</string>
-  <string name="hidden_service_ports">Ports der versteckten Dienste</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihren versteckten Dienst (wird automatisch generiert)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ausgabe des Fehlerdiagnoseprotokolls aktivieren (benötigt adb oder aLogCat zur Ansicht)</string>
-  <string name="project_home">Internetseite(n) des Projektes:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Die Tor-Lizenz</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Drittanbieteranwendungen:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Eine Anwendung möchte den versteckten Server-Anschluss %S öffnen. Das ist sicher, wenn Sie der Anwendung vertrauen.</string>
-  <string name="found_existing_tor_process">bestehender Tor-Prozess gefunden â?¦</string>
+    <string name="found_existing_tor_process">bestehender Tor-Prozess gefunden â?¦</string>
   <string name="something_bad_happened">Etwas ist schief gelaufen. Bitte Protokoll prüfen</string>
-  <string name="hidden_service_on">Versteckte Dienste auf:</string>
-  <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
+    <string name="unable_to_read_hidden_service_name">Name des versteckten Dienstes kann nicht gelesen werden</string>
   <string name="unable_to_start_tor">Tor kann nicht gestartet werden:</string>
-  <string name="unable_to_reset_tor">Starten Sie Ihr Gerät neu, Tor konnte nicht zurückgesetzt werden!</string>
-  <string name="pref_use_sys_iptables_title">Vorgegebene IPtables verwenden</string>
-  <string name="pref_use_sys_iptables_summary">Die vorhandene IPtables-Datei verwenden, anstatt der von Orbot mitgelieferten.</string>
-  <string name="error_installing_binares">Die Tor-Programmdateien konnten nicht installiert oder aktualisiert werden.</string>
-  <string name="pref_use_persistent_notifications">Wenn Orbot verbunden ist immer das Orbot-Symbol in der Statusleiste anzeigen</string>
-  <string name="pref_use_persistent_notifications_title">Aktivitätsanzeige</string>
-  <string name="pref_use_expanded_notifications">Erweiterte Benachrichtigung mit Tor-Austrittsland und IP anzeigen</string>
-  <string name="pref_use_expanded_notifications_title">Erweiterte Benachrichtigungen</string>
-  <string name="notification_using_bridges">Brücken aktiviert!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Sprache</string>
-  <string name="set_locale_summary">Gebietsschema und Sprache für Orbot auswählen</string>
-  <string name="wizard_locale_title">Sprache auswählen</string>
-  <string name="wizard_locale_msg">Voreinstellung beibehalten oder Sprache ändern</string>
-  <string name="powered_by">betrieben mit Tor</string>
-  <string name="btn_save_settings">Einstellungen speichern</string>
-  <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft â?¦</string>
-  <string name="bandwidth_">Bandbreite:</string>
-  <string name="down">runter</string>
-  <string name="up">hoch</string>
-  <string name="pref_disable_network_title">Bereitschaft wenn kein Netz</string>
-  <string name="pref_disable_network_summary">Tor in Bereitschaft versetzen, wenn kein Internet verfügbar ist</string>
-  <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
-  <string name="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">ChatSecure benutzen</string>
-  <string name="permission_manage_tor_label">Tor verwalten</string>
-  <string name="permission_manage_tor_description">Diese Anwendung aktivieren, um den Tor-Dienst zu kontrollieren</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Es sieht nicht so aus, dass Sie Orfox installiert haben. Wollen Sie dabei Hilfe oder sollen wir einfach den Browser öffnen?</string>
-  <string name="install_apps_">Anwendungen installieren?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Keine Netzwerkverbindung. Tor wird in Bereitschaft versetzt â?¦</string>
+    <string name="no_internet_connection_tor">Keine Internetverbindung; Tor ist in Bereitschaft â?¦</string>
+    <string name="newnym">Sie haben zu einer neuen Tor-Identität gewechselt!</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">Keine Netzwerkverbindung. Tor wird in Bereitschaft versetzt â?¦</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Netzwerkverbindung ist vorhanden. Tor wird aktiviert â?¦</string>
   <string name="updating_settings_in_tor_service">Einstellungen im Tor-Dienst werden aktualisiert</string>
-  <string name="pref_socks_title">Tor SOCKS</string>
-  <string name="pref_socks_summary">Port auf dem der SOCKS-Proxy bereitgestellt wird (Standard: 9050 oder 0 zum deaktivieren)</string>
-  <string name="pref_socks_dialog">SOCKS-Portkonfiguration</string>
-  <string name="pref_transport_title">Tor TransProxy-Port</string>
-  <string name="pref_transport_summary">Port auf dem der Transparente Proxy bereitgestellt wird (Standard: 9040 oder 0 zum deaktivieren)</string>
-  <string name="pref_transport_dialog">TransProxy-Portkonfiguration</string>
-  <string name="pref_dnsport_title">Tor DNS-Port</string>
-  <string name="pref_dnsport_summary">Port auf dem DNS bereitgestellt wird (Standard: 5400 oder 0 zum deaktivieren)</string>
-  <string name="pref_dnsport_dialog">DNS-Portkonfiguration</string>
-  <string name="pref_torrc_title">Benutzerdefinierte Torrc-Konfiguration</string>
-  <string name="pref_torrc_summary">NUR FÃ?R EXPERTEN: torrc-Konfigurationszeilen direkt eingeben</string>
-  <string name="pref_torrc_dialog">Benutzerdefinierte Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech-Anwendung zur Menschenrechtsdokumentierung</string>
-  <string name="your_tor_public_ips_">Ihre öffentlichen IPs für Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Bitte deaktivieren Sie diese Anwendung unter Android-&gt;Einstellungen-&gt;Anwendungen, falls Sie Probleme mit Orbot haben:</string>
-  <string name="app_conflict">Anwendungskonflikt</string>
-  <string name="pref_transproxy_refresh_title">Automatische Transproxy-Aktualisierung</string>
-  <string name="pref_transproxy_refresh_summary">Transproxy-Regeln erneut anwenden, wenn sich der Netzwerkstatus ändert</string>
-  <string name="pref_transproxy_flush_title">Transproxy ENTFERNEN ERZWINGEN</string>
-  <string name="pref_transproxy_flush_summary">Hier Tippen, um JETZT alle Transparent-Proxy Netzwerkregeln zu löschen</string>
-  <string name="transparent_proxy_rules_flushed_">Transparente Proxy-Regeln geleert!</string>
-  <string name="you_do_not_have_root_access_enabled">Sie haben keinen aktivierten Root-Zugang</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Sie müssen Tor stoppen und wieder Starten, um die neuen Einstellungen zu übernehmen.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbit/s</string>
-  <string name="mbps">Mbit/s</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Brücken aktualisiert</string>
-  <string name="restart_orbot_to_use_this_bridge_">Bitte Orbot zum Aktivieren der Ã?nderungen neustarten</string>
-  <string name="menu_qr">QR-Codes</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Wenn Ihr mobiles Netzwerk aktiv Tor sperrt, können Sie mit einer Brücke auf das Netzwerk zugreifen. Wählen Sie einen der oben genannten Brückentypen aus, um Brücken zu aktivieren.</string>
-  <string name="bridge_mode">Brückemodus</string>
-  <string name="get_bridges_email">E-Mail</string>
-  <string name="get_bridges_web">Netz</string>
-  <string name="activate">Aktivieren</string>
-  <string name="apps_mode">VPN-Modus der Anwendungen</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Mit Hilfe von VPN kann man alle Anwendungen über Tor umleiten.\n\n*WARNUNG* Das ist eine neue, experimentelle Funktion und sie startet in einigen fällen nicht automatisch oder stoppt einfach. Die Funktion sollte NICHT für das anonyme Surfen genutzt werden, sondern NUR um Firewalls und Filter zu umgehen.</string>
-  <string name="send_email">E-Mail senden</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Sie können eine Brücken-Adresse per E-Mail, im Web oder per Scan eines BrückenQR-Codes erhalten. Wählen Sie unten \'E-Mail\' oder \'Web\', um eine Brückenadresse anzufordern.\n\nSobald Sie eine Adresse haben, fügen Sie diese bei den Einstellungen für Brücken ein und starten Sie Orbot neu.</string>
-  <string name="install_orweb">Orfox installieren</string>
-  <string name="standard_browser">Standard-Browser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HINWEIS: Nur die Standard Tor-Brücken funktionieren mit Intel X86/Atom Geräten</string>
-  <string name="vpn_default_world">Welt</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-el/strings.xml b/orbotservice/src/main/res/values-el/strings.xml
index 675c6877..42d71e19 100644
--- a/orbotservice/src/main/res/values-el/strings.xml
+++ b/orbotservice/src/main/res/values-el/strings.xml
@@ -1,208 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">εκκίνηÏ?η και διακοÏ?ή Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Το Orbot ξεκινά</string>
+    <string name="status_starting_up">Το Orbot ξεκινά</string>
   <string name="status_activated">ΣÏ?νδέθηκε Ï?Ï?ο δίκÏ?Ï?ο Tor</string>
   <string name="status_disabled">\"Το Orbot είναι Î?Ï?ενεÏ?γοÏ?οιημένο</string>
   <string name="tor_process_starting">Î?κκίνηÏ?η Ï?οÏ? Ï?ελάÏ?η Tor...</string>
   <string name="tor_process_complete">ολοκληÏ?Ï?θηκε...</string>
-  <string name="tor_process_waiting">αναμονή</string>
-  <string name="not_anonymous_yet">ΠΡÎ?Î?Î?Î?Î?ΠÎ?Î?Î?ΣÎ?: Î? κÏ?κλοÏ?οÏ?ία Ï?αÏ? δεν είναι ακÏ?μη ανÏ?νÏ?μη! ΡÏ?θμίÏ?Ï?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? Ï?Ï?Ï?ε να Ï?Ï?ηÏ?ιμοÏ?οιοÏ?ν Ï?Ï? Ï?ληÏ?εξοÏ?Ï?ιο HTTP 127.0.0.1:8118 ή SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Î?Ï?Ï?ική</string>
-  <string name="menu_browse">ΠεÏ?ιήγηÏ?η</string>
-  <string name="menu_settings">ΡÏ?θμίÏ?ειÏ?</string>
-  <string name="menu_log">Î?αÏ?αγÏ?αÏ?ή</string>
-  <string name="menu_info">Î?οήθεια</string>
-  <string name="menu_start">Î?κκίνηÏ?η</string>
-  <string name="menu_stop">Î?ιακοÏ?ή</string>
-  <string name="menu_about">ΣÏ?εÏ?ικά</string>
-  <string name="main_layout_download">Î?ήÏ?η (Ï?αÏ?Ï?Ï?ηÏ?α/Ï?Ï?νολο)</string>
-  <string name="main_layout_upload">Î?Ï?οÏ?Ï?ολή (Ï?αÏ?Ï?Ï?ηÏ?α/Ï?Ï?νολο)</string>
-  <string name="button_help">Î?οήθεια</string>
-  <string name="button_close">Î?λείÏ?ιμο</string>
-  <string name="button_about">ΣÏ?εÏ?ικά</string>
-  <string name="button_clear_log">Î?ιαγÏ?αÏ?ή Î?αÏ?αγÏ?αÏ?ήÏ?</string>
-  <string name="menu_verify">Î?λεγÏ?οÏ?</string>
-  <string name="menu_exit">Î?ξοδοÏ?</string>
-  <string name="press_to_start">-για να εκκινήÏ?ει κÏ?αÏ?ήÏ?Ï?ε Ï?ο Ï?αÏ?ημένο-</string>
-  <string name="pref_trans_proxy_group">Î?ιαÏ?ανήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομηÏ?Ï?ήÏ? (Î?Ï?αιÏ?εί διαÏ?είÏ?ιÏ?η root)</string>
-  <string name="pref_trans_proxy_title">Î?ιαÏ?ανήÏ? ΠληÏ?εξοÏ?Ï?ιοÏ? Î?ιακομηÏ?Ï?ήÏ?</string>
-  <string name="pref_trans_proxy_summary">Î?Ï?Ï?Ï?μαÏ?η ΠÏ?οÏ?αÏ?μογή Î?Ï?αÏ?μογÏ?ν Ï?Ï?ο Tor</string>
-  <string name="pref_transparent_all_title">Î?νÏ?νÏ?μοÏ?οίηÏ?η Î?λÏ?ν</string>
-  <string name="pref_transparent_all_summary">Î?α γίνεÏ?αι η μεÏ?αβίβαÏ?η Ï?ηÏ? κÏ?κλοÏ?οÏ?ίαÏ? Ï?λÏ?ν Ï?Ï?ν εÏ?αÏ?μογÏ?ν μέÏ?Ï? Ï?οÏ? Tor</string>
-  <string name="pref_transparent_port_fallback_title">Î?Ï?Ï?α αναδίÏ?λÏ?Ï?ηÏ? Ï?οÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή</string>
-  <string name="pref_transparent_port_fallback_summary">ΠΡÎ?Î?Î?Î?Î?ΠÎ?Î?Î?ΣÎ?: ΠαÏ?ακάμÏ?Ï?ει Ï?ιÏ? κοινέÏ? θÏ?Ï?εÏ? (80, 443, κλÏ?). *Î?Î? ΧΡÎ?ΣÎ?Î?Î?ΠÎ?Î?Î?Î?ΤÎ?Î? Î?Î?Î?Î?Î?* Ï?Ï?αν οι λειÏ?οÏ?Ï?γίεÏ? \'All\' ή \'App\' δεν αÏ?οδίδοÏ?ν.</string>
-  <string name="pref_transparent_port_title">Î?ίÏ?Ï?α θÏ?Ï?Ï?ν</string>
-  <string name="pref_transparent_port_summary">Î?ίÏ?Ï?α θÏ?Ï?Ï?ν Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή. *Î?Î? ΧΡÎ?ΣÎ?Î?Î?ΠÎ?Î?Î?Î?ΤÎ?Î? Î?Î?Î?Î?Î?* Ï?Ï?αν οι λειÏ?οÏ?Ï?γίεÏ? \'All\' ή \'App\' δεν αÏ?οδίδοÏ?ν.</string>
-  <string name="pref_transparent_port_dialog">Î?ιÏ?άγεÏ?ε θÏ?Ï?εÏ? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή</string>
-  <string name="pref_has_root">Î?ιÏ?ημα Ï?Ï?Ï?Ï?βαÏ?ηÏ? με δικαιÏ?μαÏ?α Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η</string>
-  <string name="pref_has_root_summary">Î?ιÏ?ημα Ï?Ï?Ï?Ï?βαÏ?ηÏ? με δικαιÏ?μαÏ?α Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η για διαÏ?ανή μεÏ?αβίβαÏ?η δεδομένÏ?ν μέÏ?Ï? Ï?ληÏ?εξοÏ?Ï?ιοÏ? διακομιÏ?Ï?ή</string>
-  <string name="status_install_success">Τα δÏ?αδικά αÏ?Ï?εία Ï?οÏ? Tor εγκαÏ?αÏ?Ï?άθηκαν με εÏ?ιÏ?Ï?Ï?ία!</string>
-  <string name="status_install_fail">Τα δÏ?αδικά αÏ?Ï?εία Ï?οÏ? Tor δεν εγκαÏ?αÏ?Ï?άθηκαν. Î?λέγξÏ?ε Ï?ιÏ? καÏ?αγÏ?αÏ?έÏ? και ειδοÏ?οιείÏ?Ï?ε Ï?Ï?ην διεÏ?θÏ?νÏ?η tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ΣÏ?άλμα εÏ?αÏ?μογήÏ?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">ΣÏ?εÏ?ικά με Ï?ο Orbot</string>
-  <string name="btn_next">Î?Ï?Ï?μενο</string>
-  <string name="btn_back">ΠίÏ?Ï?</string>
-  <string name="btn_finish">ΤέλοÏ?</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Î?κÏ?Ï?ο</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Î?εÏ?ικέÏ? λεÏ?Ï?ομέÏ?ειεÏ? για Ï?ο Orbot</string>
-  <string name="wizard_permissions_root">Î? άδεια Ï?αÏ?αÏ?Ï?Ï?ήθηκε</string>
-  <string name="wizard_permissions_stock">Î?δειεÏ? Orbot</string>
-  <string name="wizard_premissions_msg_root">Î?αλÏ?Ï?! Î?ιαÏ?ιÏ?Ï?Ï?νοÏ?με Ï?Ï?ι έÏ?εÏ?ε ενεÏ?γοÏ?οιημένο Ï?ον Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η για Ï?ο Orbot. Î?α Ï?Ï?ηÏ?ιμοÏ?οιήÏ?οÏ?με Ï?ο Ï?Ï?ονÏ?μιο αÏ?Ï?Ï? με Ï?Ï?νεÏ?η.</string>
-  <string name="wizard_permissions_msg_stock"> Î?ν και δεν είναι αÏ?αÏ?αίÏ?ηÏ?ο, Ï?ο Orbot μÏ?οÏ?εί να γίνει ιÏ?Ï?Ï?Ï?Ï?Ï?εÏ?ο Ï?Ï?αν η Ï?Ï?Ï?κεÏ?ή Ï?αÏ? έÏ?ει διαμοÏ?Ï?Ï?θεί για Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?εÏ?Ï?Ï?ήÏ?Ï?η. ΠαÏ?ήÏ?Ï?ε Ï?ο Ï?ιο κάÏ?Ï? κοÏ?μÏ?ί για να δÏ?Ï?εÏ?ε αÏ?ξημένα δικαιÏ?μαÏ?α Ï?Ï?ο Orbot! </string>
-  <string name="wizard_permissions_no_root">Î?ν δεν διαθέÏ?εÏ?ε Ï?Ï?Ï?Ï?βαÏ?η Ï?Ï?εÏ?Ï?ήÏ?Ï?η ή δεν καÏ?αλαβαίνεÏ?ε Ï?ι εννοοÏ?με, αÏ?λÏ?Ï? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?ιάÏ?Ï?ηκαν για να Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot.</string>
-  <string name="wizard_permissions_consent">Î?αÏ?αλαβαίνÏ? και θέλÏ? να Ï?Ï?νεÏ?ίÏ?Ï? Ï?Ï? Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?ηÏ?</string>
-  <string name="wizard_permission_enable_root">Î?Ï?Ï?δοÏ?η Î?ιαÏ?ειÏ?ιÏ?ηÏ? Ï?Ï?ο Orbot</string>
-  <string name="wizard_configure">ΡÏ?θμιÏ?η Torification</string>
-  <string name="wizard_configure_msg">Το Orbot Ï?αÏ? εÏ?ιÏ?Ï?έÏ?ει να καÏ?εÏ?θÏ?νεÏ?ε Ï?λη Ï?ην κÏ?κλοÏ?οÏ?ία κάÏ?οιαÏ? εÏ?αÏ?μογήÏ? Ï?Ï?οÏ? Ï?ο Tor ή να εÏ?ιλέξεÏ?ε κάθε μια εÏ?αÏ?μογή ξεÏ?Ï?Ï?ιÏ?Ï?ά.</string>
-  <string name="wizard_configure_all">Το Tor να γίνει ενδιάμεÏ?οÏ? διακομιÏ?Ï?ήÏ? Proxy για Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ?</string>
-  <string name="wizard_configure_select_apps">Î?Ï?ιλογή μεμονÏ?μένÏ?ν εÏ?αÏ?μογÏ?ν για Ï?ο Tor</string>
-  <string name="wizard_tips_tricks">Î?Ï?αÏ?μογέÏ? Ï?Ï?μβαÏ?έÏ? για Orbont</string>
-  <string name="wizard_tips_msg">Î?ι Ï?αÏ?ακάÏ?Ï? εÏ?αÏ?μογέÏ? αναÏ?Ï?Ï?Ï?θηκαν Ï?Ï?Ï?ε να λειÏ?οÏ?Ï?γοÏ?ν με Ï?ο Orbot. ΠαÏ?ήÏ?Ï?ε Ï?ε κάθε κοÏ?μÏ?ί για να εγκαÏ?αÏ?Ï?αθεί Ï?Ï?Ï?α ή μÏ?οÏ?είÏ?ε να Ï?ιÏ? βÏ?είÏ?ε αÏ?γÏ?Ï?εÏ?α Ï?Ï?ο Android Market</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Î?Ï?αÏ?μογή αÏ?Ï?αλοÏ?Ï? ανÏ?αλλαγήÏ? άμεÏ?Ï?ν μηνÏ?μάÏ?Ï?ν για Android</string>
-  <string name="wizard_tips_proxy">ΡÏ?θμίÏ?ειÏ? proxy: Î?άθεÏ?ε Ï?Ï?Ï? θα Ï?Ï?θμίÏ?εÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?Ï?Ï?ε να λειÏ?οÏ?Ï?γοÏ?ν με Ï?ο Orbot</string>
-  <string name="wizard_tips_duckgo">Î?Ï?αÏ?μογή Î?ηÏ?ανήÏ? Î?ναζήÏ?ηÏ?ηÏ? Duckduckgo</string>
-  <string name="wizard_tips_twitter">Το Twitter Ï?Ï?οÏ?Ï?ηÏ?ίζει http proxy localhost:8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">ΡÏ?θμίÏ?ειÏ? proxy</string>
-  <string name="wizard_final">Το Orbot είναι έÏ?οιμο!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Î?α ανοίξει ο Ï?εÏ?ιηγηÏ?ήÏ? δικÏ?Ï?οÏ? Ï?Ï?ην Ï?ελίδα https://check.torproject.org για να διαÏ?ιÏ?Ï?Ï?Ï?εÏ?ε αν Ï?ο Orbot είναι Ï?Ï?Ï?Ï?ά Ï?Ï?θμιÏ?μένο και Ï?Ï?ι είÏ?Ï?ε Ï?Ï?νδεδεμένοÏ?/η Ï?Ï?ο Tor.</string>
-  <string name="pref_hs_group">Φιλοξενία κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
-  <string name="pref_general_group">Î?ενικά</string>
-  <string name="pref_start_boot_title">Î?ναÏ?ξη Ï?οÏ? Orbot καÏ?ά Ï?ην εκκίνηÏ?η</string>
-  <string name="pref_start_boot_summary">Î?Ï?Ï?Ï?μαÏ?η έναÏ?ξη Ï?οÏ? Orbot και Ï?Ï?νδεÏ?η Ï?Ï?ο Tor Ï?Ï?αν ξεκινά η Android Ï?Ï?Ï?κεÏ?ή Ï?αÏ?</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">ΠÏ?οειδοÏ?οίηÏ?η</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Î?δειεÏ?</string>
-  <string name="wizard_permissions_root_msg1">Î?ν θέλεÏ?ε, μÏ?οÏ?εί να δÏ?Ï?εÏ?ε Ï?Ï?ο Orbot Ï?Ï?Ï?Ï?βαÏ?η \'Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η\' Ï?Ï?Ï?ε να ενεÏ?γοÏ?οιήÏ?εÏ?ε Ï?α Ï?Ï?οÏ?Ï?Ï?ημένα Ï?αÏ?ακÏ?ηÏ?ιÏ?Ï?ικά, Ï?Ï?Ï?Ï? Ï?ο Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Î?ν δεν θέλεÏ?ε κάÏ?ι Ï?έÏ?οιο, βεβαιÏ?θείÏ?ε Ï?Ï?ι Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε εÏ?αÏ?μογέÏ? Ï?οÏ? Ï?Ï?νεÏ?γάζονÏ?αι με Ï?ο Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Î?Ï?αÏ?μογέÏ? Ï?Ï?μβαÏ?έÏ? με Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Î?Ï?Ï?αλέÏ? chat app με Off-the-Record κÏ?Ï?Ï?Ï?ογÏ?άÏ?ηÏ?η</string>
-  <string name="wizard_tips_play">Î?Ï?εÏ? Ï?λεÏ? Ï?ιÏ? εÏ?αÏ?μογέÏ? Guardian Project Ï?Ï?ο Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Î?ιαÏ?ανήÏ? μεÏ?ολάβηÏ?η διακομιÏ?Ï?ή</string>
-  <string name="wizard_transproxy_msg">Το Ï?Ï?οιÏ?είο αÏ?Ï?Ï? εÏ?ιÏ?Ï?έÏ?ει Ï?Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?αÏ? να λειÏ?οÏ?Ï?γοÏ?ν μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor Ï?Ï?Ï?ίÏ? κάÏ?οια Ï?Ï?θμιÏ?η.</string>
-  <string name="wizard_transproxy_hint">(Î?Ï?ιλέξÏ?ε αÏ?Ï?Ï? Ï?ο Ï?εÏ?Ï?άγÏ?νο αν δεν καÏ?αλαβαίνεÏ?ε για Ï?ι Ï?Ï?άγμα μιλάμε)</string>
-  <string name="wizard_transproxy_none">Î?αμία</string>
-  <string name="pref_transparent_tethering_title">Î?ιαÏ?Ï?νδεÏ?η Tor</string>
-  <string name="pref_transparent_tethering_summary">Î?νεÏ?γοÏ?οίηÏ?η Ï?ηÏ? Î?ιαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή για Ï?Ï?Ï?κεÏ?έÏ? με Wi-Fi και διαÏ?Ï?νδεÏ?η USB (αÏ?αιÏ?εί εÏ?ανεκκίνηÏ?η)</string>
-  <string name="button_grant_superuser">Î?ίÏ?ημα ΠÏ?Ï?Ï?βαÏ?ηÏ? Î¥Ï?εÏ?Ï?Ï?ήÏ?Ï?η</string>
-  <string name="pref_select_apps">Î?Ï?ιλογή εÏ?αÏ?μογÏ?ν</string>
-  <string name="pref_select_apps_summary">Î?Ï?ιλέξÏ?ε Ï?ιÏ? εÏ?αÏ?μογέÏ? Ï?οÏ? θα διέλθοÏ?ν μέÏ?Ï? Tor</string>
-  <string name="pref_node_configuration">ΡÏ?θμιÏ?η κÏ?μβοÏ?</string>
-  <string name="pref_node_configuration_summary">Î?ι Ï?Ï?θμίÏ?ειÏ? αÏ?Ï?έÏ? είναι Ï?Ï?οÏ?Ï?Ï?ημένεÏ? και μÏ?οÏ?οÏ?ν να μειÏ?Ï?οÏ?ν Ï?ην ανÏ?νÏ?μία Ï?αÏ?.</string>
-  <string name="pref_entrance_node">Î?Ï?μβοι ειÏ?Ï?δοÏ?</string>
-  <string name="pref_entrance_node_summary">Î?Ï?οÏ?Ï?Ï?Ï?μαÏ?α, Ï?εÏ?δÏ?νÏ?μα, Ï?Ï?Ï?εÏ? και διεÏ?θÏ?νÏ?ειÏ? για Ï?ην Ï?Ï?Ï?Ï?η Ï?Ï?νδεÏ?η</string>
-  <string name="pref_entrance_node_dialog">Î?ιÏ?άγεÏ?ε κÏ?μβοÏ?Ï? ειÏ?αγÏ?γήÏ?</string>
-  <string name="pref_proxy_title">Î?ιακομιÏ?Ï?ήÏ? μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?ομένÏ?ν δεδομένÏ?ν</string>
-  <string name="pref_proxy_type_title">ΤÏ?Ï?οÏ? Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?ομένÏ?ν δεδομένÏ?ν</string>
-  <string name="pref_proxy_type_summary">ΠÏ?Ï?Ï?Ï?κολλο Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Î?ιÏ?άγεÏ?ε Ï?Ï?Ï?ο διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_host_title">Î?ιακομιÏ?Ï?ήÏ? μεÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?Ï?μενÏ?ν δεδομένÏ?ν</string>
-  <string name="pref_proxy_host_summary">Hostname Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_host_dialog">Î?ιÏ?άγεÏ?ε Ï?ον Ï?Ï?ολογιÏ?Ï?ή για Ï?ον διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_port_title">Î?Ï?Ï?α εξεÏ?Ï?ομένÏ?ν Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_port_summary">Î?Ï?Ï?α Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_port_dialog">Î?ιÏ?άγεÏ?ε Ï?ην θÏ?Ï?α Ï?οÏ? διακομιÏ?Ï?ή μεÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_username_title">Î?νομα Ï?Ï?ήÏ?Ï?η για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?Ï?μενÏ?ν δεδομένÏ?ν</string>
-  <string name="pref_proxy_username_summary">Î?νομα Ï?Ï?ήÏ?Ï?η για Ï?ο Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? (ΠÏ?οαιÏ?εÏ?ικÏ?)</string>
-  <string name="pref_proxy_username_dialog">Î?ιÏ?άγεÏ?ε Ï?ο Î?νομα ΧÏ?ήÏ?Ï?η για Ï?ο Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ?</string>
-  <string name="pref_proxy_password_title">Î?Ï?δικÏ?Ï? για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? εξεÏ?Ï?Ï?μενÏ?ν δεδομένÏ?ν</string>
-  <string name="pref_proxy_password_summary">Î?Ï?δικÏ?Ï? για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ? (ΠÏ?οαιÏ?εÏ?ικÏ?)</string>
-  <string name="pref_proxy_password_dialog">Î?ιÏ?άγεÏ?ε Ï?ον Î?Ï?δικÏ? για Ï?ον Î?ιακομιÏ?Ï?ή Î?εÏ?ολάβηÏ?ηÏ?</string>
-  <string name="status">Î?αÏ?άÏ?Ï?αÏ?η</string>
-  <string name="setting_up_full_transparent_proxying_">ΡÏ?θμιÏ?η </string>
-  <string name="setting_up_app_based_transparent_proxying_">ΡÏ?θμιÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή</string>
-  <string name="transparent_proxying_enabled">Î? διαÏ?ανήÏ? μεÏ?ολάβηÏ?η διακομιÏ?Ï?ή Î?Î?Î?ΡÎ?Î?ΠÎ?Î?Î?Î?Î?Î?Î?</string>
-  <string name="transproxy_enabled_for_tethering_">Το TransProxy ενεÏ?γοÏ?οιήθηκε για Ï?ην διαÏ?Ï?νδεÏ?η - Tethering</string>
-  <string name="warning_error_starting_transparent_proxying_">ΠΡÎ?Î?Î?Î?Î?ΠÎ?Î?Î?ΣÎ?: Ï?Ï?άλμα καÏ?ά Ï?ην εκκίνηÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή!</string>
-  <string name="transproxy_rules_cleared">Î?ι Ï?Ï?θμίÏ?ειÏ? Ï?οÏ? TransProxy αÏ?ομακÏ?Ï?νθηκαν</string>
-  <string name="couldn_t_start_tor_process_">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?ηÏ? διεÏ?γαÏ?ίαÏ? Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">ΡÏ?θμιÏ?η Ï?ηÏ? διαÏ?ανοÏ?Ï? μεÏ?ολάβηÏ?ηÏ? διακομιÏ?Ï?ή καÏ?ά θÏ?Ï?α...</string>
-  <string name="bridge_error">ΣÏ?άλμα γέÏ?Ï?Ï?αÏ?</string>
-  <string name="bridge_requires_ip">Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε Ï?ο Ï?Ï?οιÏ?είο γέÏ?Ï?Ï?αÏ?, Ï?Ï?έÏ?ει να ειÏ?άγεÏ?ε Ï?ην διεÏ?θÏ?νÏ?η Î?Ρ Ï?οÏ?λάÏ?ιÏ?Ï?ον μιαÏ? γέÏ?Ï?Ï?αÏ?.</string>
-  <string name="send_email_for_bridges">Î?έÏ?Ï? ενÏ?Ï? λογαÏ?ιαÏ?μοÏ? gmai Ï?Ï?είλÏ?ε ένα μήνÏ?μα Ï?Ï?ην διεÏ?θÏ?νÏ?η bridges@xxxxxxxxxxxxxx με Ï?ην Ï?αÏ?η \"get bridges\" μÏ?νη Ï?ηÏ? Ï?Ï?ο Ï?Ï?μα Ï?ο μηνÏ?μαÏ?οÏ?.</string>
-  <string name="error">ΣÏ?άλμα</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Î?ι Ï?Ï?θμίÏ?ειÏ? ReachableAddresses Ï?Ï?οκάλεÏ?αν μια εξαίÏ?εÏ?η!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?ηÏ? διεÏ?γαÏ?ίαÏ? Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Î?ι Ï?Ï?θμίÏ?ειÏ? ReachableAddresses Ï?Ï?οκάλεÏ?αν μια εξαίÏ?εÏ?η!</string>
   <string name="your_relay_settings_caused_an_exception_">Î?ι Ï?Ï?θμίÏ?ειÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? Ï?Ï?οκάλεÏ?αν μια εξαίÏ?εÏ?η!</string>
-  <string name="exit_nodes">Î?Ï?μβοι εξÏ?δοÏ?</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Î?Ï?οÏ?Ï?Ï?Ï?μαÏ?α, Ï?εÏ?δÏ?νÏ?μα, Ï?Ï?Ï?εÏ? και διεÏ?θÏ?νÏ?ειÏ? Ï?ηÏ? Ï?ελεÏ?Ï?αίαÏ? Ï?Ï?νδεÏ?ηÏ?</string>
-  <string name="enter_exit_nodes">Î?ιÏ?άγεÏ?ε κÏ?μβοÏ?Ï? εξÏ?δοÏ?</string>
-  <string name="exclude_nodes">Î?ξαιÏ?εÏ?έοι κÏ?μβοι</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Î?Ï?οÏ?Ï?Ï?Ï?μαÏ?α, Ï?εÏ?δÏ?νÏ?μα, Ï?Ï?Ï?εÏ? και διεÏ?θÏ?νÏ?ειÏ? Ï?Ï?οÏ? εξαίÏ?εÏ?η</string>
-  <string name="enter_exclude_nodes">Î?ιÏ?άγεÏ?ε Î?ξαιÏ?εÏ?έοÏ?Ï? κÏ?μβοÏ?Ï?</string>
-  <string name="strict_nodes">Î?Ï?οκλειÏ?Ï?ικοί κÏ?μβοι</string>
-  <string name="use_only_these_specified_nodes">ΧÏ?ήÏ?η *μÏ?νον* αÏ?Ï?Ï?ν Ï?Ï?ν Ï?Ï?γκεκÏ?ιμένÏ?ν κÏ?μβÏ?ν</string>
-  <string name="bridges">Î?έÏ?Ï?Ï?εÏ?</string>
-  <string name="use_bridges">ΧÏ?ήÏ?η γεÏ?Ï?Ï?Ï?ν</string>
-  <string name="bridges_obfuscated">Î?Ï?Ï?Ï?έÏ? γέÏ?Ï?Ï?εÏ?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Î?νεÏ?γοÏ?οίηÏ?η εναλλακÏ?ικÏ?ν κÏ?μβÏ?ν ειÏ?Ï?δοÏ? Ï?Ï?ο δίκÏ?Ï?ο Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Î?νεÏ?γοÏ?οιήÏ?Ï?ε Ï?ο αν οι Ï?Ï?θμιÏ?μένεÏ? γέÏ?Ï?Ï?εÏ? είναι κÏ?Ï?Ï?έÏ?</string>
-  <string name="ip_address_and_port_of_bridges">Î?ιεÏ?θÏ?νÏ?η Î?Ρ και θÏ?Ï?α Ï?Ï?ν γεÏ?Ï?Ï?Ï?ν</string>
-  <string name="enter_bridge_addresses">Î?ιÏ?άγεÏ?ε Ï?ην διεÏ?θÏ?νÏ?η Ï?ηÏ? γέÏ?Ï?Ï?αÏ?</string>
-  <string name="relays">Î?ναμεÏ?αδÏ?Ï?εÏ?</string>
-  <string name="relaying">Î?ίνεÏ?αι αναμεÏ?άδοÏ?η</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Î?εÏ?αÏ?Ï?έÏ?Ï?ε Ï?ην Ï?Ï?Ï?κεÏ?ή Ï?αÏ? Ï?ε ένα αναμεÏ?αδÏ?Ï?η μη-εξÏ?δοÏ?</string>
-  <string name="relay_port">Î?Ï?Ï?α αναμεÏ?άδοÏ?ηÏ?</string>
-  <string name="listening_port_for_your_tor_relay">Î?Ï?Ï?α ακÏ?Ï?αÏ?ηÏ? για Ï?ον αναμεÏ?αδÏ?Ï?η Ï?αÏ?</string>
-  <string name="enter_or_port">Î?ιÏ?άγεÏ?ε Ï?ην θÏ?Ï?α OR</string>
-  <string name="relay_nickname">ΨεÏ?δÏ?νÏ?μο Ï?οÏ? αναμεÏ?αδÏ?Ï?η</string>
-  <string name="the_nickname_for_your_tor_relay">Το Ï?εÏ?δÏ?νÏ?μο Ï?οÏ? αναμεÏ?αδÏ?Ï?η Ï?αÏ? Tor</string>
-  <string name="enter_a_custom_relay_nickname">Î?ιÏ?άγεÏ?ε ένα Ï?Ï?οÏ?ιμÏ?μενο Ï?εÏ?δÏ?νÏ?μο αναμεÏ?αδÏ?Ï?η</string>
-  <string name="reachable_addresses">ΠÏ?οÏ?ιÏ?έÏ? διεÏ?θÏ?νÏ?ειÏ?</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Î?κÏ?έλεÏ?η Ï?Ï? Ï?ελάÏ?η Ï?ίÏ?Ï? αÏ?Ï? Ï?οίÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ? με Ï?εÏ?ιοÏ?ιÏ?Ï?ικέÏ? Ï?ολιÏ?ικέÏ?</string>
-  <string name="reachable_ports">ΠÏ?οÏ?ιÏ?έÏ? θÏ?Ï?εÏ?</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">ΠÏ?οÏ?ιÏ?έÏ? θÏ?Ï?εÏ? Ï?ίÏ?Ï? αÏ?Ï? Ï?εÏ?ιοÏ?ιÏ?Ï?ικÏ? Ï?οίÏ?οÏ? Ï?Ï?οÏ?Ï?αÏ?ίαÏ?</string>
-  <string name="enter_ports">Î?ιÏ?άγεÏ?ε θÏ?Ï?εÏ?</string>
-  <string name="enable_hidden_services">Φιλοξενία κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
-  <string name="run_servers_accessible_via_the_tor_network">να εÏ?ιÏ?Ï?έÏ?εÏ?ε Ï?Ï?ον διακομιÏ?Ï?ή Ï?ηÏ? Ï?Ï?Ï?κεÏ?ήÏ? να είναι Ï?Ï?οÏ?βάÏ?ιμοÏ? μέÏ?Ï? Ï?οÏ? δικÏ?Ï?οÏ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">ειÏ?άγεÏ?ε Ï?ιÏ? θÏ?Ï?εÏ? κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν Ï?οÏ? localhost</string>
-  <string name="hidden_service_ports">Î?Ï?Ï?εÏ? κÏ?Ï?Ï?Ï?ν Ï?Ï?ηÏ?εÏ?ιÏ?ν</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ï?ο Ï?νομα Ï?Ï?οÏ?Ï?έλαÏ?ηÏ? για Ï?ιÏ? κÏ?Ï?Ï?έÏ? Ï?Ï?ηÏ?εÏ?ίεÏ? Ï?αÏ? (Ï?αÏ?άγεÏ?αι αÏ?Ï?Ï?μαÏ?α)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ενεÏ?γοÏ?οίηÏ?η καÏ?αγÏ?αÏ?Ï?ν αÏ?οÏ?Ï?αλμάÏ?Ï?Ï?ηÏ? (για Ï?ην Ï?Ï?οβολή Ï?οÏ?Ï? αÏ?αιÏ?είÏ?αι Ï?Ï?ήÏ?η adb ή aLogCat)</string>
-  <string name="project_home">Î?Ï?Ï?οÏ?ελίδεÏ? Ï?οÏ? έÏ?γοÏ?:</string>
-  <string name="the_tor_license">Î? Î?δεια Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Î?ογιÏ?μικÏ? Ï?Ï?ίÏ?Ï?ν:</string>
-  <string name="hidden_service_request">Î?άÏ?οια εÏ?αÏ?μογή Ï?Ï?οÏ?Ï?αθεί να ανοίξει Ï?ην κÏ?Ï?Ï?ή θÏ?Ï?α διακομιÏ?Ï?ή %S Ï?Ï?ο δίκÏ?Ï?ο Tor. ΠÏ?Ï?κειÏ?αι για αÏ?Ï?αλή ενέÏ?γεια, εÏ?Ï?Ï?ον γνÏ?Ï?ίζεÏ?ε Ï?ην εÏ?αÏ?μογή.</string>
-  <string name="found_existing_tor_process">αναζήÏ?ηÏ?η διεÏ?γαÏ?ιÏ?ν Tor...</string>
+    <string name="found_existing_tor_process">αναζήÏ?ηÏ?η διεÏ?γαÏ?ιÏ?ν Tor...</string>
   <string name="something_bad_happened">Î?άÏ?ι κακÏ? Ï?Ï?νέβη. Î?λέγξÏ?ε Ï?ιÏ? καÏ?αγÏ?αÏ?έÏ?</string>
-  <string name="hidden_service_on">ενεÏ?γοÏ?οιημένη κÏ?Ï?Ï?ή Ï?Ï?ηÏ?εÏ?ία:</string>
-  <string name="unable_to_read_hidden_service_name">αδÏ?ναμία ανάγνÏ?Ï?ηÏ? Ï?οÏ? ονÏ?μαÏ?οÏ? Ï?ηÏ? κÏ?Ï?Ï?ήÏ? Ï?Ï?ηÏ?εÏ?ίαÏ?</string>
+    <string name="unable_to_read_hidden_service_name">αδÏ?ναμία ανάγνÏ?Ï?ηÏ? Ï?οÏ? ονÏ?μαÏ?οÏ? Ï?ηÏ? κÏ?Ï?Ï?ήÏ? Ï?Ï?ηÏ?εÏ?ίαÏ?</string>
   <string name="unable_to_start_tor">Î?δÏ?ναμία εκκίνηÏ?ηÏ? Ï?οÏ? Tor:</string>
-  <string name="pref_use_sys_iptables_title">ΧÏ?ήÏ?η αÏ?Ï?ικοÏ? iptables</string>
-  <string name="pref_use_sys_iptables_summary">Ï?Ï?ήÏ?η Ï?οÏ? ενÏ?Ï?μαÏ?Ï?μένοÏ? iptables ανÏ?ί για εκείνÏ?ν Ï?οÏ? Ï?ακέÏ?οÏ? Orbot</string>
-  <string name="error_installing_binares">Τα αÏ?Ï?εία Tor δεν μÏ?Ï?Ï?εÏ?αν να εγκαÏ?αÏ?Ï?αθοÏ?ν ή να αναβαθμιÏ?Ï?οÏ?ν.</string>
-  <string name="pref_use_persistent_notifications">Î?α διαÏ?ηÏ?είÏ?αι Ï?άνÏ?οÏ?ε Ï?ο εικονίδιο Ï?Ï?ην γÏ?αμμή εÏ?γαλείÏ?ν Ï?Ï?αν Ï?ο Orbot Ï?Ï?νδέεÏ?αι</string>
-  <string name="pref_use_persistent_notifications_title">Î?ιδοÏ?οιήÏ?ειÏ? διαÏ?κοÏ?Ï? Ï?Ï?νδεÏ?ηÏ?</string>
-  <string name="notification_using_bridges">Î?ι γέÏ?Ï?Ï?εÏ? ενεÏ?γοÏ?οιήθηκαν!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Î?Ï?ιλέξÏ?ε Ï?Ï?θμίÏ?ειÏ? Ï?οÏ?ικÏ?Ï?ηÏ?αÏ? και γλÏ?Ï?Ï?αÏ? για Ï?ο Orbot</string>
-  <string name="wizard_locale_title">Î?Ï?ιλέξÏ?ε γλÏ?Ï?Ï?α</string>
-  <string name="wizard_locale_msg">ΠαÏ?αμείνεÏ?ε Ï?Ï?ην αÏ?Ï?ική ή αλλάξÏ?ε Ï?ην Ï?Ï?έÏ?οÏ?Ï?α γλÏ?Ï?Ï?α</string>
-  <string name="btn_save_settings">Î?Ï?οθήκεÏ?Ï?η Ï?Ï?θμίÏ?εÏ?ν</string>
-  <string name="bandwidth_">Î?Ï?Ï?οÏ? ζÏ?νηÏ?:</string>
-  <string name="down">καÏ?έβαÏ?μα</string>
-  <string name="up">ανέβαÏ?μα</string>
-  <string name="pref_disable_network_title">ΧÏ?Ï?ίÏ? Î?Ï?Ï?Ï?μαÏ?η Î?ναÏ?Ï?ολή Î?ικÏ?Ï?οÏ?</string>
-  <string name="pref_disable_network_summary">Î?έÏ?ε Ï?ο Tor Ï?ε λειÏ?οÏ?Ï?γία sleep Ï?Ï?αν δεν Ï?Ï?άÏ?Ï?ει διαθέÏ?ιμη Ï?Ï?νδεÏ?η Î?nternet</string>
-  <string name="newnym">Î?Ï?εÏ?ε αλλάξει εÏ?ιÏ?Ï?Ï?Ï?Ï? Ï?ην Ï?αÏ?Ï?Ï?Ï?ηÏ?α Ï?αÏ? Ï?Ï?ο Tor! </string>
-  <string name="menu_use_chatsecure">ΧÏ?ήÏ?η Ï?οÏ? ChatSecure</string>
-  <string name="permission_manage_tor_label">Î?ιαÏ?είÏ?ιÏ?η Tor</string>
-  <string name="permission_manage_tor_description">Î?ξοÏ?Ï?ιοδοÏ?ήÏ?Ï?ε Ï?ην εÏ?αÏ?μογή να ελέγÏ?ει Ï?ην Ï?Ï?ηÏ?εÏ?ία Ï?οÏ? Tor</string>
-  <string name="install_apps_">Î?γκαÏ?άÏ?Ï?αÏ?η εÏ?αÏ?μογÏ?ν?</string>
+    <string name="newnym">Î?Ï?εÏ?ε αλλάξει εÏ?ιÏ?Ï?Ï?Ï?Ï? Ï?ην Ï?αÏ?Ï?Ï?Ï?ηÏ?α Ï?αÏ? Ï?Ï?ο Tor! </string>
 </resources>
diff --git a/orbotservice/src/main/res/values-en-rGB/strings.xml b/orbotservice/src/main/res/values-en-rGB/strings.xml
index 4ddc60d8..05e2b960 100644
--- a/orbotservice/src/main/res/values-en-rGB/strings.xml
+++ b/orbotservice/src/main/res/values-en-rGB/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="btn_next">Next</string>
-  <!--Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -9,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-eo/strings.xml b/orbotservice/src/main/res/values-eo/strings.xml
index 3c103de7..fc385eb1 100644
--- a/orbotservice/src/main/res/values-eo/strings.xml
+++ b/orbotservice/src/main/res/values-eo/strings.xml
@@ -1,146 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Å?alti kaj malÅ?alti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot Å?altiÄ?as...</string>
+    <string name="status_starting_up">Orbot Å?altiÄ?as...</string>
   <string name="status_activated">Konektita al Tor-reto</string>
   <string name="status_disabled">Orbot estas malaktivigita</string>
   <string name="tor_process_starting">Å?altiÄ?as Tor-kliento...</string>
   <string name="tor_process_complete">kompleta.</string>
-  <string name="tor_process_waiting">atendas.</string>
-  <string name="not_anonymous_yet">ATENTIGO: Via trafiko ankoraŭ ne estas anonima! Bonvolu agordi viajn aplikaĵojn por uzi HTTP-prokurilon 127.0.0.1:8118 aŭ SOCKS4A- aŭ SOCKS5-prokurilo 127.0.0.1:9050</string>
-  <string name="menu_home">Hejma tasto</string>
-  <string name="menu_browse">Foliumi</string>
-  <string name="menu_settings">Agordoj</string>
-  <string name="menu_log">Protokolo</string>
-  <string name="menu_info">Helpo</string>
-  <string name="menu_start">Starti</string>
-  <string name="menu_stop">Halti</string>
-  <string name="menu_about">Pri</string>
-  <string name="main_layout_download">ElÅ?utado</string>
-  <string name="main_layout_upload">AlÅ?utado</string>
-  <string name="button_help">Helpo</string>
-  <string name="button_close">Fermi</string>
-  <string name="button_about">Pri</string>
-  <string name="button_clear_log">ForviÅ?i protokolon</string>
-  <string name="menu_verify">Kontroli</string>
-  <string name="menu_exit">Eliri</string>
-  <string name="press_to_start">- longe puÅ?i por Å?alti -</string>
-  <string name="pref_trans_proxy_summary">Aŭtomata Tor-igo de Aplikaĵoj</string>
-  <string name="pref_transparent_all_title">Tor-igu Ä?ion</string>
-  <string name="pref_transparent_port_title">Listo de Pordoj</string>
-  <string name="pref_has_root">Peti Administrajn Rajtojn</string>
-  <string name="status_install_success">Binara kodo de Tor estas sukcese instalita!</string>
-  <string name="status_install_fail">Binaraj dosieroj de Tor ne povis esti instalitaj. Kontrolu protokolon kaj sciigu nin per tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Eraro de Aplikaĵo</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Pri Orbot</string>
-  <string name="btn_next">Sekva</string>
-  <string name="btn_back">MalantaÅ­e</string>
-  <string name="btn_finish">Fini</string>
-  <string name="btn_cancel">Rezigni</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Kelkaj Detaloj pri Orbot</string>
-  <string name="wizard_permissions_root">Permeso estas AluÄ?ita</string>
-  <string name="wizard_permissions_stock">Permesoj de Orbot</string>
-  <string name="wizard_permissions_consent">Mi komprenas kaj volas daÅ­ri sen administraj rajtoj</string>
-  <string name="wizard_configure">Agordi Tor-igon</string>
-  <string name="wizard_configure_select_apps">Elekti Individualajn Aplikaĵojn por Tor</string>
-  <string name="wizard_tips_tricks">Aplikaĵoj permesitaj por Orbot</string>
-  <string name="wizard_tips_otrchat">ChatSecutre - Sekura tujmesaÄ?ilo por Android</string>
-  <string name="wizard_tips_proxy">Agordoj de prokurilo - Lernu kiel agordi aplikaĵojn por kunlabori kun Orbot</string>
-  <string name="wizard_tips_twitter">Agordi prokurilon por Twitter je adreso \"localhost\" kaj pordo 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Retperantâ??agordoj</string>
-  <string name="wizard_final">Orbot estas preparita!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_hs_group">Gastigado de kaÅ?ita servo</string>
-  <string name="pref_general_group">Ä?enerala</string>
-  <string name="pref_start_boot_title">Å?alti Orbot dum praÅ?argado</string>
-  <string name="pref_start_boot_summary">AÅ­tomate startigi Orbot kaj konekti al Tor dum praÅ?argado de via Androida ilo</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Averto</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permesoj</string>
-  <string name="wizard_permissions_root_msg2">Se vi ne volas fari tion, bonvolu certiÄ?i ke eblas agordi aplikaĵojn por kunlabori kun Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplikaĵoj permesitaj por Orbot</string>
-  <string name="wizard_tips_play">Trovu Ä?iujn aplikaĵojn de Guardian Project Ä?e Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_hint">(Marku Ä?i tiun butonon se vi ne scias pri kio ni parolas)</string>
-  <string name="wizard_transproxy_none">Neniom</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="button_grant_superuser">Peti Administrajn Rajtojn</string>
-  <string name="pref_select_apps">Elekti aplikaĵojn</string>
-  <string name="pref_node_configuration">Agordo de Nodoj</string>
-  <string name="pref_node_configuration_summary">Tie troviÄ?as progresintaj agordoj kiuj povas limigi vian anonimecon</string>
-  <string name="pref_entrance_node">Eniraj nodoj</string>
-  <string name="pref_entrance_node_summary">Fingrospuroj, kaÅ?nomoj, landoj kaj adresoj por la unua hopo</string>
-  <string name="pref_entrance_node_dialog">Entajpu enirajn nodojn</string>
-  <string name="pref_proxy_title">Elira prokurilo (Malnepra)</string>
-  <string name="pref_proxy_type_title">Tipo de elira prokurilo</string>
-  <string name="pref_proxy_type_summary">Protokolo uzata de la prokurilo: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Entajpu tipon de la prokurilo</string>
-  <string name="pref_proxy_host_title">Adreso de la elira prokurilo</string>
-  <string name="pref_proxy_host_summary">Adresnomo de la prokurilo</string>
-  <string name="pref_proxy_host_dialog">Entajpu adreson</string>
-  <string name="pref_proxy_port_title">Pordo de la elira prokurilo</string>
-  <string name="pref_proxy_port_summary">Pordo de la Prokurservilo</string>
-  <string name="pref_proxy_port_dialog">Entajpu la pordon</string>
-  <string name="pref_proxy_username_title">Uzantnomo de la elira prokurilo</string>
-  <string name="pref_proxy_username_summary">Uzantnomo de la prokurilo (Malnepra)</string>
-  <string name="pref_proxy_username_dialog">Entajpu uzantnomon</string>
-  <string name="pref_proxy_password_title">Pasvorto de la elira prokurilo</string>
-  <string name="pref_proxy_password_summary">Pasvorto de la prokurilo (Malnepra)</string>
-  <string name="pref_proxy_password_dialog">Entajpu pasvorton</string>
-  <string name="status">Stato</string>
-  <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariÄ?i:</string>
-  <string name="bridge_error">Eraro de Ponto</string>
-  <string name="error">Eraro</string>
-  <string name="your_relay_settings_caused_an_exception_">Via agordo de relajso kaÅ­zis escepton!</string>
-  <string name="exit_nodes">Finnodoj</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingrospuroj, kaÅ?nomoj, landoj kaj adresoj por la lasta hopo</string>
-  <string name="enter_exit_nodes">Entajpu finnofojn</string>
-  <string name="use_only_these_specified_nodes">Uzi *nur* tiujn Ä?i nodojn</string>
-  <string name="bridges">Pontoj</string>
-  <string name="use_bridges">Uzi Pontojn</string>
-  <string name="ip_address_and_port_of_bridges">IP-adresoj kaj pordoj de pontoj</string>
-  <string name="enter_or_port">Entajpu OR-pordon</string>
-  <string name="relay_nickname">KaÅ?nomo de la relajso</string>
-  <string name="the_nickname_for_your_tor_relay">KaÅ?nomo por via Tor-relajso</string>
-  <string name="enter_a_custom_relay_nickname">Entajpu propran kaÅ?nomon de la relajso</string>
-  <string name="reachable_addresses">Atingeblaj adresoj</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Startigi kiel kliento malantaÅ­ fajromuro kun restriktaj reguloj</string>
-  <string name="reachable_ports">Atingeblaj pordoj</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Pordoj, kiuj atingeblas tra la restrikta fajromuro</string>
-  <string name="enter_ports">Entajpu pordojn</string>
-  <string name="enable_hidden_services">Gastigado de KaÅ?itaj Servoj</string>
-  <string name="run_servers_accessible_via_the_tor_network">permesi al servilo sur Ä?i tiu aparato esti atingebla per Tor-reto</string>
-  <string name="enter_localhost_ports_for_hidden_services">entajpi localhost-pordojn de kaÅ?itaj servoj</string>
-  <string name="hidden_service_ports">Pordoj de KaÅ?itaj Servoj</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adreso de via kaÅ?ita servo (aÅ­tomate generata)</string>
-  <string name="project_home">RetpaÄ?aro(j) de la Projekto:</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="found_existing_tor_process">trovi ekzistantan Tor-procedon...</string>
-  <string name="hidden_service_on">kaÅ?itaj servoj je:</string>
-  <string name="unable_to_read_hidden_service_name">ne eblas legi nomon de la kaÅ?ita servo</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor-procedo ne sukcesis stariÄ?i:</string>
+    <string name="your_relay_settings_caused_an_exception_">Via agordo de relajso kaÅ­zis escepton!</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="pref_use_sys_iptables_title">Uzi defaÅ­ltajn Iptables</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Elekti lokaĵaron kaj lingvon por Orbot</string>
-  <string name="wizard_locale_title">Elekti lingvon</string>
-  <string name="btn_save_settings">Konservi Agordojn</string>
-  <string name="bandwidth_">Kapacito:</string>
-  <string name="down">el</string>
-  <string name="up">al</string>
-  <string name="menu_use_chatsecure">Uzi ChatSecure</string>
-  <string name="install_apps_">Instali aplikaĵojn?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-es-rAR/strings.xml b/orbotservice/src/main/res/values-es-rAR/strings.xml
index b921a402..66672aa0 100644
--- a/orbotservice/src/main/res/values-es-rAR/strings.xml
+++ b/orbotservice/src/main/res/values-es-rAR/strings.xml
@@ -1,69 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">reiniciar Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciándose...</string>
+    <string name="status_starting_up">Orbot está iniciándose...</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">\"Orbot está Desactivado</string>
   <string name="tor_process_starting">Iniciando el cliente Tor...</string>
   <string name="tor_process_complete">Completar</string>
-  <string name="tor_process_waiting">esperando...</string>
-  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Inicio</string>
-  <string name="menu_browse">Navegar</string>
-  <string name="menu_settings">Configuración</string>
-  <string name="menu_log">Registro</string>
-  <string name="menu_info">Ayuda</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Detener</string>
-  <string name="menu_about">Acerca de</string>
-  <string name="main_layout_download">Descargar</string>
-  <string name="main_layout_upload">Subir</string>
-  <string name="button_help">Ayuda</string>
-  <string name="button_close">Cerrar</string>
-  <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Borrar Registros</string>
-  <string name="menu_verify">Chequear</string>
-  <string name="menu_exit">Salir</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
-  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
-  <string name="pref_transparent_all_title">Torear Todo</string>
-  <string name="status_install_fail">Los archivos binarios Tor no pudieron ser instalado. Compruebe el registro y notificar a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de la aplicación</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Finalizar</string>
-  <string name="btn_okay">Ok</string>
-  <string name="btn_cancel">Cancelar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Algunos detalles de Orbot</string>
-  <string name="wizard_final">Orbot está listo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">General</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxying Transparente</string>
-  <string name="pref_proxy_password_dialog">Ingrese contraseña Proxy</string>
-  <string name="enter_ports">Ingresar puertos</string>
-  <string name="the_tor_license">La Licencia de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
-  <string name="default_bridges"></string>
-  <string name="wizard_locale_title">Elegir el lenguaje</string>
-  <string name="btn_save_settings">Guardar configuración</string>
-  <string name="bandwidth_">Ancho de banda:</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="install_apps_">Instalar apps?</string>
+    <string name="unable_to_start_tor">No se puede iniciar Tor:</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-es/strings.xml b/orbotservice/src/main/res/values-es/strings.xml
index 76c8fa0b..c34ac188 100644
--- a/orbotservice/src/main/res/values-es/strings.xml
+++ b/orbotservice/src/main/res/values-es/strings.xml
@@ -2,293 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot es una aplicación libre de proxy (interpuesto) que faculta a otras aplicaciones para usar Internet de forma más segura. Orbot utiliza Tor para cifrar su tráfico de Internet, y luego lo oculta rebotándolo a través de una serie de computadoras por todo el mundo. Tor es software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia de red conocida como análisis de tráfico que amenaza la libertad y la privacidad personales, las actividades y relaciones comerciales confidenciales, y la seguridad de estado.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">https://check.torproject.org/?lang=es</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=es</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar y detener Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciandose...</string>
+    <string name="status_starting_up">Orbot está iniciandose...</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">Orbot está desactivado</string>
   <string name="status_shutting_down">TorService se está cerrando</string>
   <string name="tor_process_starting">Iniciando cliente Tor...</string>
   <string name="tor_process_complete">completado.</string>
-  <string name="tor_process_waiting">en espera.</string>
-  <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Configure sus aplicaciones para utilizar proxy HTTP 127.0.0.1:8118, o proxy SOCKS4A o SOCKS5 127.0.0.1:9050 (o podría habilitar la proxyficación transparente si su dispositivo está rooteado)</string>
-  <string name="menu_home">Principal</string>
-  <string name="menu_browse">Examinar</string>
-  <string name="menu_settings">Configuración</string>
-  <string name="menu_log">Registro (log)</string>
-  <string name="menu_info">Ayuda</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Detener</string>
-  <string name="menu_about">Acerca de</string>
-  <string name="menu_promo_apps">Obtener aplicaciones...</string>
-  <string name="main_layout_download">Descarga</string>
-  <string name="main_layout_upload">Subida</string>
-  <string name="button_help">Ayuda</string>
-  <string name="button_close">Cerrar</string>
-  <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Limpiar registro (log)</string>
-  <string name="menu_verify">Verificar</string>
-  <string name="menu_exit">Salir</string>
-  <string name="menu_scan">Escanear QR de bridge</string>
-  <string name="menu_share_bridge">Compartir QR de bridge</string>
-  <string name="press_to_start">- mantega pulsado para iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxyficación transparente (requiere root)</string>
-  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
-  <string name="pref_trans_proxy_summary">Torificado automático de aplicaciones</string>
-  <string name="pref_transparent_all_title">Torificar todo</string>
-  <string name="pref_transparent_all_summary">Proxyfica vía Tor el tráfico de todas las aplicaciones sin configurarlas</string>
-  <string name="pref_transparent_port_fallback_title">Puertos a proxyficar para contingencias</string>
-  <string name="pref_transparent_port_fallback_summary">ADVERTENCIA: Evita puertos comunes (80, 443, etc). *USAR SÃ?LO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan.</string>
-  <string name="pref_transparent_port_title">Lista de puertos</string>
-  <string name="pref_transparent_port_summary">Lista de puertos a proxyficar. *USAR SÃ?LO* si los modos \'Todo\' o \'Aplicaciones\' no funcionan</string>
-  <string name="pref_transparent_port_dialog">Introduzca los puertos a proxyficar</string>
-  <string name="pref_has_root">Solicitar permisos de root</string>
-  <string name="pref_has_root_summary">Solicita permisos de root para usar proxyficación transparente</string>
-  <string name="status_install_success">¡Los binarios de Tor se instalaron con éxito!</string>
-  <string name="status_install_fail">Los archivos binarios de Tor no pudieron ser instalados. Revise el registro (log) y notifique a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Error de la aplicación</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Finalizar</string>
-  <string name="btn_okay">Aceptar</string>
-  <string name="btn_cancel">Cancelar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Algunos detalles de Orbot</string>
-  <string name="wizard_details_msg">Orbot es una aplicación de código-abierto que contiene Tor, LibEvent y Polipo. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) locales hacia la red Tor. Orbot también tiene la capacidad, en un dispositivo rooteado, de enviar todo el tráfico de Internet a través de Tor.</string>
-  <string name="wizard_permissions_root">Permiso concedido</string>
-  <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">¡Excelente! Hemos detectado que ha concedido a Orbot permisos de root. Utilizaremos estos poderes sabiamente.</string>
-  <string name="wizard_permissions_msg_stock"> Aunque no es un requisito, Orbot puede convertirse en una herramienta más potente si accede a su dispositivo con permisos de root. ¡Utilice el botón inferior para conceder superpoderes a Orbot!</string>
-  <string name="wizard_permissions_no_root">Si no tiene acceso como root o no tiene idea de qué estamos hablando, tan solo asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o que permitan conexión por proxy HTTP o SOCKS).</string>
-  <string name="wizard_permissions_consent">Comprendo, y quiero continuar sin poderes administrativos</string>
-  <string name="wizard_permission_enable_root">Conceder permisos de root a Orbot</string>
-  <string name="wizard_configure">Configurar torificación</string>
-  <string name="wizard_configure_msg">Orbot le da la opción de dirigir el tráfico de todas las aplicaciones a través de Tor - o - de seleccionar sus aplicaciones a torificar individualmente.</string>
-  <string name="wizard_configure_all">Proxyficar todas la aplicaciones a través de Tor</string>
-  <string name="wizard_configure_select_apps">Seleccionar aplicaciones individuales para Tor</string>
-  <string name="wizard_tips_tricks">Aplicaciones habilitadas para Orbot</string>
-  <string name="wizard_tips_msg">Las siguientes aplicaciones fueron desarrolladas para trabajar con Orbot. Haga clic en cada botón para instalarlas ahora, o puede encontrarlas más tarde en Google Play, en la web guardianproject.info o vía f-droid.org </string>
-  <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensajería instantánea segura para Android</string>
-  <string name="wizard_tips_proxy">Preferencias para proxy - aprenda cómo configurar aplicaciones para que trabajen con Orbot</string>
-  <string name="wizard_tips_duckgo">Aplicación del motor de búsqueda DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Configure por proxy la aplicación de Twitter en localhost:8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ¡Elabore una historia y déjesela a Tor por seguridad!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Preferencias para proxy</string>
-  <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un proxy (interpuesto) HTTP o SOCKS, entonces puede configurarla para que conecte a Orbot y use Tor.\n\n\nLa configuración del servidor es 127.0.0.1 o \"localhost\". Para HTTP, la configuración del puerto es 8118. Para SOCKS, el proxy está en el 9050. Debe utilizar la configuración para SOCKS4A o SOCKS5 si es posible.\n\n\n\nPuede aprender más acerca de proxyficación en Android a través de las preguntas frecuentes (FAQ) en: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">¡Orbot está listo!</string>
-  <string name="wizard_final_msg">Millones de personas por todo el mundo usan Tor por una amplia variedad de razones.\n\nPeriodistas y blogueros, defensores de los derechos humanos, funcionarios judiciales, corporaciones, ciudadanos bajo regímenes represivos, y simples ciudadanos corrientes... ¡y ahora usted también está listo!</string>
-  <string name="wizard_exit_at_first_screen_toast">¡Por favor, configure Orbot antes para poder comenzar a usarlo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ha conectado con éxito a la red Tor - pero esto no significa que su dispositivo sea seguro. Puede usar el botón \'Navegador\' para probar su conexión. \n\nVisítenos en https://guardianproject.info/apps/orbot o envíe un correo electrónico a help@xxxxxxxxxxxxxxxxxxxx para conocer más.</string>
-  <string name="tor_check">Esto abrirá https://check.torproject.org/?lang=es en su navegador predeterminado para comprobar que Orbot esté configurado y que esté conectado a Tor.</string>
-  <string name="pref_hs_group">Alojamiento de servicios ocultos (dentro de la red Tor)</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Iniciar Orbot en el arranque</string>
-  <string name="pref_start_boot_summary">Inicia Orbot y conecta a Tor automáticamente cuando arranca su dispositivo Android</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">¡Orbot trae Tor a Android!\n\nTor le ayuda a defenderse contra el filtrado de contenido, el análisis de tráfico y la vigilancia de la red, que amenazan la privacidad, la información confidencial y las relaciones personales.\n\nEste asistente le ayudará a configurar Orbot y Tor en su dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Advertencia</string>
-  <string name="wizard_warning_msg">Simplemente instalando Orbot no anonimizará automáticamente su tráfico móvil/celular.\n\nPara usar Tor con éxito tiene que configurar adecuadamente Orbot, su dispositivo, y otras aplicaciones.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente puede conceder permisos de \'Superusuario\' a Orbot para habilitar las características avanzadas, como la proxyficación transparente.</string>
-  <string name="wizard_permissions_root_msg2">Si no desea hacer esto, asegúrese de utilizar aplicaciones específicamente preparadas para trabajar con Orbot (o configurables para ello)</string>
-  <string name="wizard_permissions_no_root_msg">Su dispositivo no parece estar rooteado o proporcionar root o acceso de \"Superusuario\".\n\nEn su lugar, por favor, pruebe con el modo \'Aplicaciones\' en la pantalla principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicaciones habilitadas para Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplicación de chat segura con cifrado Off-The-Record (OTR)</string>
-  <string name="wizard_tips_orweb">Orfox: Navegador con privacidad mejorada que funciona a través de Tor</string>
-  <string name="wizard_tips_play">Descubre todas las aplicaciones de Guardian Project en Google Play</string>
-  <string name="wizard_tips_fdroid">Encontrará todas las aplicaciones del Guardian Project en F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Encontrará todas las aplicaciones del Guardian Project en https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxyficación transparente</string>
-  <string name="wizard_transproxy_msg">Permite que sus aplicaciones se ejecuten automáticamente a través de la red Tor sin realizar configuración alguna.</string>
-  <string name="wizard_transproxy_hint">(Marque esta casilla si no tiene idea de qué estamos hablando)</string>
-  <string name="wizard_transproxy_none">Ninguno</string>
-  <string name="pref_transparent_tethering_title">Tor tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilita la proxyficación transparente de Tor para dispositivos tethered (dispositivos móviles \"amarrados\", pasarela a Internet para otros dispositivos conectados a ellos mediante Wi-Fi, USB o Bluetooth) -- (requiere reinicio)</string>
-  <string name="button_grant_superuser">Solicitar permisos de superusuario</string>
-  <string name="pref_select_apps">Seleccionar aplicaciones</string>
-  <string name="pref_select_apps_summary">Escoja las aplicaciones a redirigir través de Tor</string>
-  <string name="pref_node_configuration">Configuración de nodos</string>
-  <string name="pref_node_configuration_summary">¡Estas son configuraciones avanzadas que pueden reducir su anonimato! Afectan a los circuitos (túneles) que se establezcan para su propio tráfico a través de Tor; si repite tráfico ajeno estas configuraciones no afectan a esos circuitos.</string>
-  <string name="pref_entrance_node">Nodos de entrada</string>
-  <string name="pref_entrance_node_summary">Reglas de identificación de repetidores de entrada a la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y 
-direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de nodos, y las configuraciones de bridges.</string>
-  <string name="pref_entrance_node_dialog">Introduzca nodos de entrada</string>
-  <string name="pref_allow_background_starts_title">Permitir inicios en segundo plano</string>
-  <string name="pref_allow_background_starts_summary">Deja que cualquier aplicación le diga a Orbot que inicie Tor y servicios relacionados</string>
-  <string name="button_proxy_all">Proxyficar todo</string>
-  <string name="button_proxy_none">No proxyficar nada</string>
-  <string name="button_invert_selection">Invertir selección</string>
-  <string name="pref_proxy_title">Proxy de salida a la red (opcional)</string>
-  <string name="pref_proxy_type_title">Tipo de proxy saliente</string>
-  <string name="pref_proxy_type_summary">Protocolo a usar para el servidor proxy saliente: HTTP, HTTPS, Socks4, Socks5.</string>
-  <string name="pref_proxy_type_dialog">Introduzca tipo de proxy</string>
-  <string name="pref_proxy_host_title">Servidor proxy saliente</string>
-  <string name="pref_proxy_host_summary">Nombre del servidor proxy </string>
-  <string name="pref_proxy_host_dialog">Introduzca el servidor proxy</string>
-  <string name="pref_proxy_port_title">Puerto del proxy saliente </string>
-  <string name="pref_proxy_port_summary">Puerto del servidor proxy</string>
-  <string name="pref_proxy_port_dialog">Introduzca el puerto del proxy</string>
-  <string name="pref_proxy_username_title">Nombre de usuario en el proxy de salida</string>
-  <string name="pref_proxy_username_summary">Nombre de usuario en el proxy (opcional)</string>
-  <string name="pref_proxy_username_dialog">Introduzca nombre de usuario en el proxy</string>
-  <string name="pref_proxy_password_title">Contraseña en el proxy de salida</string>
-  <string name="pref_proxy_password_summary">Contraseña en el proxy (opcional)</string>
-  <string name="pref_proxy_password_dialog">Introduzca contraseña en el proxy</string>
-  <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Estableciendo proxyficación transparente completa... </string>
-  <string name="setting_up_app_based_transparent_proxying_">Estableciendo proxyficación transparente por aplicaciones... </string>
-  <string name="transparent_proxying_enabled">Proxyficación transparente ACTIVADA</string>
-  <string name="transproxy_enabled_for_tethering_">¡TransProxy (proxyficación transparente) habilitado para tethering (pasarela)!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVERTENCIA: ¡Error al iniciar la proxyficación transparente!</string>
-  <string name="transproxy_rules_cleared">Reglas de TransProxy (proxyficación transparente) borradas</string>
-  <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo se está ejecutando en el puerto:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Estableciendo proxyficación transparente por puertos... </string>
-  <string name="bridge_error">Error de bridge (repetidor puente)</string>
-  <string name="bridge_requires_ip">Para utilizar la función bridge (repetidor puente, acceso a Tor de publicitación restringida), debe introducir al menos una dirección IP de bridge.</string>
-  <string name="send_email_for_bridges">Envíe un correo a bridges@xxxxxxxxxxxxxx incluyendo en el cuerpo del mensaje una línea sólo con \"get bridges\", desde una cuenta con dominio gmail.com, yahoo.com o yahoo.cn (que soportan DKIM)</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">No se pudo iniciar el proceso de Tor: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">¡Sus \'Reglas de direcciones accesibles\' han producido una excepción!</string>
   <string name="your_relay_settings_caused_an_exception_">¡La configuración de su repetidor ha producido una excepción!</string>
-  <string name="exit_nodes">Nodos de salida</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Reglas de identificación de repetidores de salida de la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
-  <string name="enter_exit_nodes">Introduzca repetidores de salida</string>
-  <string name="exclude_nodes">Excluír nodos</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Reglas de identificación de repetidores a evitar en la red Tor, mediante huellas de validación de claves (fingerprints), alias (nicks), códigos de país y direcciones (o rangos)</string>
-  <string name="enter_exclude_nodes">Introduzca repetidores a evitar</string>
-  <string name="strict_nodes">Hacer estricta la exclusión de nodos (incluso si falla la comunicación)</string>
-  <string name="use_only_these_specified_nodes">Usar *sólo* estos nodos especificados</string>
-  <string name="bridges">Bridges (repetidores puente) </string>
-  <string name="use_bridges">Usar bridges</string>
-  <string name="bridges_obfuscated">Bridges ofuscados (contra análisis DPI del tráfico) </string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilita nodos alternativos de entrada a la red Tor, de publicitación restringida. Prevalece sobre \'Nodos de entrada\'</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilítelo si los bridges (repetidores puente) de su lista de configuración están ofuscados (encapsulando el tráfico SSL para evitar ser detectados) </string>
-  <string name="ip_address_and_port_of_bridges">Direcciones IP y puertos de los bridges</string>
-  <string name="enter_bridge_addresses">Introduzca direcciones de bridge</string>
-  <string name="relays">Repetidores</string>
-  <string name="relaying">Repetición de tráfico</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar que su dispositivo no sea repetidor de salida (de la red Tor) </string>
-  <string name="relay_port">Puerto de repetidor</string>
-  <string name="listening_port_for_your_tor_relay">Puerto de escucha para su repetidor Tor</string>
-  <string name="enter_or_port">Introduzca puerto OR (Onion Routing, repositorio de repetidores)</string>
-  <string name="relay_nickname">Alias del repetidor</string>
-  <string name="the_nickname_for_your_tor_relay">El apodo que identificará a su repetidor en la red Tor</string>
-  <string name="enter_a_custom_relay_nickname">Introduzca un alias personalizado para su repetidor</string>
-  <string name="reachable_addresses">Reglas de direcciones accesibles ([accept(*)|reject] IP:port, etc.)</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ejecutar Tor como sólo cliente detrás de un cortafuegos (firewall) con políticas restrictivas</string>
-  <string name="reachable_ports">Puertos accesibles</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Puertos accesibles detrás de un firewall restrictivo (80 y 443 por defecto)</string>
-  <string name="enter_ports">Introduzca puertos</string>
-  <string name="enable_hidden_services">Activar alojamiento de servicios ocultos (en la red Tor)</string>
-  <string name="run_servers_accessible_via_the_tor_network">Permite el acceso a servidores ocultos por dispositivo (IP oculta al usuario) accesibles a través de la red Tor (dominio .onion, sin DNS)</string>
-  <string name="enter_localhost_ports_for_hidden_services">Introduzca los puertos locales de sus servicios ocultos</string>
-  <string name="hidden_service_ports">Puertos de los servicios ocultos</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">El nombre direccionable (sin DNS, .onion generado automáticamente) para su servicio oculto</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Habilitar el registro de depuración (debug log) a la salida (debe utilizar adb o aLogCat para verlo)</string>
-  <string name="project_home">Página(s) principal(es) del proyecto:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Licencia de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de terceras partes</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Una aplicación está intentando abrir el puerto %S de servicio oculto hacia la red Tor. Esto es seguro si su aplicación es de su confianza.</string>
-  <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
+    <string name="found_existing_tor_process">Se encontró un proceso de Tor ya existente...</string>
   <string name="something_bad_happened">Hubo algún tipo de problema. Compruebe el registro (log)</string>
-  <string name="hidden_service_on">Servicio oculto en:</string>
-  <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
+    <string name="unable_to_read_hidden_service_name">No fue posible leer el nombre del servicio oculto</string>
   <string name="unable_to_start_tor">No fue posible iniciar Tor: </string>
-  <string name="unable_to_reset_tor">¡Reinicie su dispositivo, no se pudo reiniciar Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar el Iptables por defecto</string>
-  <string name="pref_use_sys_iptables_summary">Usa el binario de Iptables del sistema en lugar del incluído en el paquete de Orbot</string>
-  <string name="error_installing_binares">No fue posible instalar o actualizar los binarios de Tor.</string>
-  <string name="pref_use_persistent_notifications">Mantener siempre el icono de Orbot en la barra de tareas cuando esté conectado</string>
-  <string name="pref_use_persistent_notifications_title">Notificaciones siempre activadas</string>
-  <string name="pref_use_expanded_notifications">Mostrar notificación expandida con el país de salida de Tor y la IP</string>
-  <string name="pref_use_expanded_notifications_title">Notificaciones expandidas</string>
-  <string name="notification_using_bridges">¡Bridges habilitados! </string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Elija la configuración regional y el idioma para Orbot</string>
-  <string name="wizard_locale_title">Escoja idioma</string>
-  <string name="wizard_locale_msg">Deje el predeterminado o cambie de idioma</string>
-  <string name="powered_by">impulsado por Tor</string>
-  <string name="btn_save_settings">Guardar configuración</string>
-  <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</string>
-  <string name="bandwidth_">Ancho de banda:</string>
-  <string name="down">bajada</string>
-  <string name="up">subida</string>
-  <string name="pref_disable_network_title">Sin suspensión-automática de la red</string>
-  <string name="pref_disable_network_summary">Ponga Tor en suspensión cuando no haya Internet disponible</string>
-  <string name="newnym">¡Ha cambiado a una nueva identidad de Tor!</string>
-  <string name="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Administrar Tor</string>
-  <string name="permission_manage_tor_description">Habilita esta aplicación para controlar el servicio Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">No parece que tenga Orfox instalado. ¿Quiere ayuda con eso, o simplemente debemos abrir el navegador?</string>
-  <string name="install_apps_">¿Instalar aplicaciones?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">No hay conectividad de red. Poniendo a Tor a dormir...</string>
+    <string name="no_internet_connection_tor">Sin conexión a Internet; Tor está en suspensión...</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="wizard_tips_martus">Martus Móvil - Aplicación de documentación de derechos humanos de Benetech</string>
-  <string name="your_tor_public_ips_">Las IPs públicas de su Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Por favor, deshabilite esta aplicación en Android-&gt;Configuración-&gt;Aplicaciones si está teniendo problemas con Orbot:</string>
-  <string name="app_conflict">Conflicto de la aplicación</string>
-  <string name="pref_transproxy_refresh_title">Auto-refresco de transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Reaplica las reglas de transproxy cuando el estado de la red cambia</string>
-  <string name="pref_transproxy_flush_title">Transproxy FORZAR ELIMINACIÃ?N</string>
-  <string name="pref_transproxy_flush_summary">Pulse aquí para desechar AHORA todas las reglas de red de transproxy </string>
-  <string name="transparent_proxy_rules_flushed_">¡Reglas de proxy transparente desechadas!</string>
-  <string name="you_do_not_have_root_access_enabled">No tiene habilitado el acceso como ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Puede que tenga que detener e iniciar Orbot para que el cambio de configuración se habilite.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridges actualizados</string>
-  <string name="restart_orbot_to_use_this_bridge_">Por favor, reinicie Orbot para habilitar los cambios</string>
-  <string name="menu_qr">Códigos QR</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si su red móvil/celular bloquea activamente Tor, puede usar un Puente (bridge) para acceder a la red. SELECCIONE uno de los tipos de repetidor puente arriba para hablitar los puentes.</string>
-  <string name="bridge_mode">Modo bridge</string>
-  <string name="get_bridges_email">Correo electrónico</string>
-  <string name="get_bridges_web">Página web</string>
-  <string name="activate">Activar</string>
-  <string name="apps_mode">Aplicaciones en modo VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puede habilitar que todas las aplicaciones de su dispositivo transiten a través de la red Tor usando la función VPN de Android.\n\n*ADVERTENCIA* Esta es una característica experimental nueva, y en algunos casos puede que no se inicie automáticamente, o puede que se detenga. NO debe usarse para anonimato, S�LO para atravesar cortafuegos (firewalls) y filtros.</string>
-  <string name="send_email">Enviar correo</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Puede obtener una dirección de bridge (repetidor puente) a través de correo electrónico, la web, o escaneando un código QR de bridge. Seleccione \'Correo\' o \'Web\' debajo para solicitar una dirección de bridge.\n\nUna vez tenga una dirección, copie y péguela en la opción \"Bridges\" de la configuración de Orbot, y reinicie.</string>
-  <string name="install_orweb">Instalar Orfox</string>
-  <string name="standard_browser">Navegador estándar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Sólo los repetidores puente (bridges) estándar de Tor funcionan en dispositivos Intel X86/ATOM</string>
-  <string name="vpn_default_world">Mundo</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-et/strings.xml b/orbotservice/src/main/res/values-et/strings.xml
index 9bb32b5d..0abd8fce 100644
--- a/orbotservice/src/main/res/values-et/strings.xml
+++ b/orbotservice/src/main/res/values-et/strings.xml
@@ -1,210 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.orghttp://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">käivita ja peata Tor</string>
-  <string name="tor_proxy_service_process">torproxyteenus</string>
-  <string name="status_starting_up">Orbot käivitub...</string>
+    <string name="status_starting_up">Orbot käivitub...</string>
   <string name="status_activated">�hendatud Tor võrgustikku</string>
   <string name="status_disabled">Orbot deaktiveeritud</string>
   <string name="tor_process_starting">Tor kliendi käivitamine...</string>
   <string name="tor_process_complete">valmis.</string>
-  <string name="tor_process_waiting">ootel.</string>
-  <string name="not_anonymous_yet">HOIATUS: Teie liiklus pole veel anonüümne! Palun seadistage oma rakendused nii et need kasutaksid HTTP proxy\'t 127.0.0.1:8118 või SOCKS4A või SOCKS5 proxy\'t 127.0.0.1:9050</string>
-  <string name="menu_home">Kodu</string>
-  <string name="menu_browse">Sirvi</string>
-  <string name="menu_settings">Seaded</string>
-  <string name="menu_log">Logi</string>
-  <string name="menu_info">Abi</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stopp</string>
-  <string name="menu_about">Lähemalt</string>
-  <string name="main_layout_download">Lae alla</string>
-  <string name="main_layout_upload">Lae üles</string>
-  <string name="button_help">Abi</string>
-  <string name="button_close">Sulge</string>
-  <string name="button_about">Lähemalt</string>
-  <string name="button_clear_log">Nulli logi</string>
-  <string name="menu_verify">Kontrolli</string>
-  <string name="menu_exit">Välja</string>
-  <string name="press_to_start">- pikk vajutus alustamiseks -</string>
-  <string name="pref_trans_proxy_group">Läbipaistev proxy (Nõuab Root õigusi)</string>
-  <string name="pref_trans_proxy_title">Läbipaistev proxy</string>
-  <string name="pref_trans_proxy_summary">Rakenduste automaatne Torifitseerimine</string>
-  <string name="pref_transparent_all_title">Kõik läbi Tor\'i</string>
-  <string name="pref_transparent_all_summary">Proxy kõikide reakenduste liiklus läbi Tor\'i</string>
-  <string name="pref_transparent_port_fallback_title">Pordiproxy reserv</string>
-  <string name="pref_transparent_port_fallback_summary">HOIATUS: Väldib tavaporte (80, 443, jne). *KASUTAGE AINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta.</string>
-  <string name="pref_transparent_port_title">Portide loend</string>
-  <string name="pref_transparent_port_summary">Proxy portide loend. *KASUTAGE SINULT SIIS* kui \'Kõik\' või \'Rakendused\' režiim ei tööta</string>
-  <string name="pref_transparent_port_dialog">Sisestage pordid mida proxy\'da</string>
-  <string name="pref_has_root">Nõua root juurdepääsu</string>
-  <string name="pref_has_root_summary">Nõua läbipaistva proxy jaoks root juurdepääsu</string>
-  <string name="status_install_success">Tor binaarid edukalt paigaldatud!</string>
-  <string name="status_install_fail">Tor binaarfailide paigaldamine ebaõnnestus. Palun kontrollige logi ja teavitage tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Rakenduse Viga</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Lähemalt Orbot\'ist</string>
-  <string name="btn_next">Edasi</string>
-  <string name="btn_back">Tagasi</string>
-  <string name="btn_finish">Lõpeta</string>
-  <string name="btn_okay">Hea küll</string>
-  <string name="btn_cancel">Katkesta</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Mõned Orbot\'i detailid</string>
-  <string name="wizard_permissions_root">Luba Antud</string>
-  <string name="wizard_permissions_stock">Orbot õigused</string>
-  <string name="wizard_premissions_msg_root">Vinge! Leidsime et teie seadmes on Orbot\'ile lubatud root õigused. Lubame kasutada seda väge arukalt.</string>
-  <string name="wizard_permissions_msg_stock">Kuigi see pole vajalik, saab root juurdepääsuga seadmel kasutada Orbot\'i palju võimsama vahendina. Kasutage allpool olevat nuppu et lubada Orbot\'ile supervõimed!</string>
-  <string name="wizard_permissions_no_root">Kui teil pole root juurdepääsu või te ei tea millest jutt käib, siis kindlustage et kasutate ainult rakendusi mis on seadistatud Orbot\'iga koos töötama.</string>
-  <string name="wizard_permissions_consent">Saan aru ja jätkan ilma Superkasutajata</string>
-  <string name="wizard_permission_enable_root">Luba Orbotile Root õigused</string>
-  <string name="wizard_configure">Seadista Torifitseerimine</string>
-  <string name="wizard_configure_msg">Orbot võimaldab juhtida kõigi rakenduste liikluse läbi Tor\'i V�I valida need rakendused individuaalselt.</string>
-  <string name="wizard_configure_all">Proxy kõik rakendused läbi Tor\'i</string>
-  <string name="wizard_configure_select_apps">Valige Tor\'i jaoks individuaalsed rakendused</string>
-  <string name="wizard_tips_tricks">Orbot-lubatud rakendused</string>
-  <string name="wizard_tips_msg">Alltoodud rakendused arendati Orbot\'iga koos töötama. Koheseks paigaldamiseks vajutage igat allolevat nuppu või paigaldage need hiljem Google Play portaalist, GuardianProject.info veebilehelt või F-Droid.org kaudu.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Turvaline kiirsõnumiklient Androidile</string>
-  <string name="wizard_tips_proxy">Proxy seaded - �pi kuidas seadistada rakendusi töötama koos Orbot\'iga</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo otsingumootori rakendus</string>
-  <string name="wizard_tips_twitter">Seadistage Twitteri proxy server \"localhost\" ja port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxyseaded</string>
-  <string name="wizard_final">Orbot on valmis!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">See avab teie veebisivikus lehe https://check.torproject.org mille kaudu saate näha kas Orbot on ehk seadistatud ja olete ühenduses Tor\'iga.</string>
-  <string name="pref_hs_group">Peidetud Teenuste Majutus</string>
-  <string name="pref_general_group">Ã?ldist</string>
-  <string name="pref_start_boot_title">Käivita Orbot seadme käivitumisel</string>
-  <string name="pref_start_boot_summary">Automaatne Orbot käivitumine ja Tor külge ühendumine seadme käivitumisel</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Hoiatus</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Load</string>
-  <string name="wizard_permissions_root_msg1">Võite Orbot\'ile lubada \'Superkasutaja\' juurdepääsu selleks et võimaldada rohkem võimalusi, nagu näiteks Läbipaistev Proxy.</string>
-  <string name="wizard_permissions_root_msg2">Kui te ei soovi seda teha, siis palun kindlustage et kasutate ainult rakendusi mis on seadistatud töötama koos Orbot\'iga</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot\'ile mõeldud rakendused</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Turvaline vestlusrakendus Off-the-Record krüptoga</string>
-  <string name="wizard_tips_play">Kõik Guardian Project rakendused on leitavad ka Google Play kaudu</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Läbipaistev Proxy</string>
-  <string name="wizard_transproxy_msg">Saate kõik rakendused suunata iseeneslikult Tor kaudu, lisaseadistusteta.</string>
-  <string name="wizard_transproxy_hint">(Klikkige sellele kastile kui teil pole õrna aimugi millest jutt käib)</string>
-  <string name="wizard_transproxy_none">Puudub</string>
-  <string name="pref_transparent_tethering_title">Tor lõastamine</string>
-  <string name="pref_transparent_tethering_summary">Luba Tor Läbipaistev Proxy Wi-Fi ja USB lõastatud seadmetele (vajab uuestilaadimist)</string>
-  <string name="button_grant_superuser">Nõua Superkasutaja Juurdepääsu</string>
-  <string name="pref_select_apps">Vali Rakendused</string>
-  <string name="pref_select_apps_summary">Vali läbi Tor suunatavad rakendused</string>
-  <string name="pref_node_configuration">Sõlme seadistamine</string>
-  <string name="pref_node_configuration_summary">Need on seadistused edasijõudnutele ja võivad vähendada teie anonüümsust</string>
-  <string name="pref_entrance_node">Sisendsõlmed</string>
-  <string name="pref_entrance_node_summary">Sõrmejäljed, hüüdnimed, riigid ja aadressid esimese hüppe jaoks</string>
-  <string name="pref_entrance_node_dialog">Sisestage sisendsõlmed</string>
-  <string name="pref_proxy_title">Väljuva võrgu proxy (Valikuline)</string>
-  <string name="pref_proxy_type_title">Väljuva proxy tüüp</string>
-  <string name="pref_proxy_type_summary">Proxy serveri kasutamise protokoll: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Sisestage proxy tüüp</string>
-  <string name="pref_proxy_host_title">Väljuva proxy seade</string>
-  <string name="pref_proxy_host_summary">Proxyserveri seadmenimi</string>
-  <string name="pref_proxy_host_dialog">Sisestage proxy seade</string>
-  <string name="pref_proxy_port_title">Väljuva proxy port</string>
-  <string name="pref_proxy_port_summary">Proxyserveri port</string>
-  <string name="pref_proxy_port_dialog">Sisestage proxy port</string>
-  <string name="pref_proxy_username_title">Väljuva proxy kasutajanimi</string>
-  <string name="pref_proxy_username_summary">Proxy kasutajanimi (Valikuline)</string>
-  <string name="pref_proxy_username_dialog">Sisestage proxy kasutajanimi</string>
-  <string name="pref_proxy_password_title">Väljuva proxy salasõna</string>
-  <string name="pref_proxy_password_summary">Proxy salasõna (Valikuline)</string>
-  <string name="pref_proxy_password_dialog">Sisestage proxy salasõna</string>
-  <string name="status">Olek</string>
-  <string name="setting_up_full_transparent_proxying_">Täisläbipaistva proxy seadistamine...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Rakenduspõhise läbipaistva proxy seadistamine...</string>
-  <string name="transparent_proxying_enabled">Läbipaistev proxy LUBATUD</string>
-  <string name="transproxy_enabled_for_tethering_">LäbivProxy lõastamine lubatud!</string>
-  <string name="warning_error_starting_transparent_proxying_">Hoiatus: viga läbipaistva proxy käivitamisel!</string>
-  <string name="transproxy_rules_cleared">LäbivProxy seaded nullitud</string>
-  <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Pordipõhise läbipaistva proxy seadistamine...</string>
-  <string name="bridge_error">Silla viga</string>
-  <string name="bridge_requires_ip">Silla võimaluse kasutamiseks peate sisestama vähemalt ühe silla IP aadressi.</string>
-  <string name="send_email_for_bridges">Saatke e-kiri oma gmail kontolt aadressile bridges@xxxxxxxxxxxxxx mis sisaldab ainult ühte rida \"get bridges\".</string>
-  <string name="error">Viga</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Teie ReachableAddresses seadistus põhjustas ekse!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor protsessi käivitamine ebaõnnestus:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Teie ReachableAddresses seadistus põhjustas ekse!</string>
   <string name="your_relay_settings_caused_an_exception_">Teie releeseadistus põhjustas ekse!</string>
-  <string name="exit_nodes">Väljundsõlmed</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Sõrmejäljed, hüüdnimed, riigid ja aadressid viimase hüppe jaoks</string>
-  <string name="enter_exit_nodes">Sisestage väljundsõlmed</string>
-  <string name="exclude_nodes">Välistatud sõlmed</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Sõrmejäljed, hüüdnimed, riigid ja aadressid mida välistada</string>
-  <string name="enter_exclude_nodes">Sisestage välistatavad sõlmed</string>
-  <string name="strict_nodes">Kindlad sõlmed</string>
-  <string name="use_only_these_specified_nodes">Kasuta *ainult* neid märgitud sõlmi</string>
-  <string name="bridges">Sillad</string>
-  <string name="use_bridges">Kasuta sildu</string>
-  <string name="bridges_obfuscated">Varjatud sillad</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Luba Tor võrgustiku alternatiivseid sisendsõlmi</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Luba siis kui seadistatud sillad on varjatud sillad</string>
-  <string name="ip_address_and_port_of_bridges">Sildade IP aadressid ja pordinumbrid</string>
-  <string name="enter_bridge_addresses">Sisestage silla aadressid</string>
-  <string name="relays">Edastajad</string>
-  <string name="relaying">Edastamine</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Luba oma seadmel hakata mitte-väljund edastajaks</string>
-  <string name="relay_port">Edastusport</string>
-  <string name="listening_port_for_your_tor_relay">Port mida teie Tor edastaja kuulab</string>
-  <string name="enter_or_port">Kas Enter VÃ?I port</string>
-  <string name="relay_nickname">Edastaja hüüdnimi</string>
-  <string name="the_nickname_for_your_tor_relay">Teie Tor edastaja hüüdnimi</string>
-  <string name="enter_a_custom_relay_nickname">Sisestage edastaja kohandatud hüüdnimi</string>
-  <string name="reachable_addresses">Juurdepääsetavad aadressid</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Käivita kui piirava poliitikaga tulemüüri taga asuvat klienti.</string>
-  <string name="reachable_ports">Juurdepääsetavad pordid</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Piirava poliitikaga tulemüüris avatud pordid</string>
-  <string name="enter_ports">Sisestage pordid</string>
-  <string name="enable_hidden_services">Varjatud teenuste majutamine</string>
-  <string name="run_servers_accessible_via_the_tor_network">luba üle Tor võrgustiku juurdepääs seadmes töötavale serverile</string>
-  <string name="enter_localhost_ports_for_hidden_services">sisestage varjatud teenuste localhost pordid</string>
-  <string name="hidden_service_ports">Varjatud teenuste pordid</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">teie varjatud teenuste adresseeritav nimi (luuakse automaatselt)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">lubage väljastatav silumislogi (vaatamiseks peab kasutama kas adb või aLogCat utiliite) </string>
-  <string name="project_home">Projekti kodu(d):</string>
-  <string name="the_tor_license">Tor litsents</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Kolmanda osapoole tarkvara:</string>
-  <string name="hidden_service_request">�ks rakendus soovib avada varjatud teenuse porti %S Tor võrgustikule. See on turvaline kui te usaldate seda rakendust.</string>
-  <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
+    <string name="found_existing_tor_process">leidus töötav Tor protsess...</string>
   <string name="something_bad_happened">Juhtus midagi halba. Kontrollige logi</string>
-  <string name="hidden_service_on">varjatud teenused:</string>
-  <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
+    <string name="unable_to_read_hidden_service_name">ei õnnestu lugeda varjatud teenuse nime</string>
   <string name="unable_to_start_tor">Tor käivitamine ebaõnnestus:</string>
-  <string name="pref_use_sys_iptables_title">Kasuta iptables vaikeseadeid</string>
-  <string name="pref_use_sys_iptables_summary">kasuta Orbot\'iga kaasneva iptables binaari asemel süsteemset binaari</string>
-  <string name="error_installing_binares">Tor binaaride paigaldamine või uuendamine ebaõnnestus.</string>
-  <string name="pref_use_persistent_notifications">�hendatud Orbot korral näidata katkematult ikoonide tööriistariba</string>
-  <string name="pref_use_persistent_notifications_title">Pidevalt kuvatavad teated</string>
-  <string name="notification_using_bridges">Sillad lubatud!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Valige Orbot lokaat ja keel</string>
-  <string name="wizard_locale_title">Valige keel</string>
-  <string name="wizard_locale_msg">Jätkake vaikeväärtusega või vahetage kehtiv keel</string>
-  <string name="btn_save_settings">Salvesta seaded</string>
-  <string name="bandwidth_">Ribalaius:</string>
-  <string name="down">alla</string>
-  <string name="up">üles</string>
-  <string name="pref_disable_network_title">Pole võrgu auto-und</string>
-  <string name="pref_disable_network_summary">Pane Tor magama kui Internetiühendus puudub</string>
-  <string name="newnym">Lülitusite uuele Tor identiteedile!</string>
-  <string name="menu_use_chatsecure">Kasutage ChatSecure\'t</string>
-  <string name="permission_manage_tor_label">Hallake Tor\'i</string>
-  <string name="permission_manage_tor_description">Lubage sellel rakendusel hallata Tor teenust</string>
-  <string name="install_apps_">Paigaldada rakendusi?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Interneti ühendus puudub. Panen Tori magama...</string>
+    <string name="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>
 </resources>
diff --git a/orbotservice/src/main/res/values-eu/strings.xml b/orbotservice/src/main/res/values-eu/strings.xml
index f824a45a..fe300c89 100644
--- a/orbotservice/src/main/res/values-eu/strings.xml
+++ b/orbotservice/src/main/res/values-eu/strings.xml
@@ -1,218 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor abiarazi eta gelditu</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot abiarazten ari da...</string>
+    <string name="status_starting_up">Orbot abiarazten ari da...</string>
   <string name="status_activated">Tor sarera konektatuta</string>
   <string name="status_disabled">\"Orbot desaktibatuta dago</string>
   <string name="tor_process_starting">Tor bezeroa hasten...</string>
   <string name="tor_process_complete">eginda.</string>
-  <string name="tor_process_waiting">itxaroten.</string>
-  <string name="not_anonymous_yet">ABISUA: Zure trafikoa ez da anonimoa oraindik! Mesedez konfigura itzazu zure aplikazioak 127.0.0.1:8118 HTTP proxya edo 127.0.0.1:9050 SOCKS4 edo SOCKS5 proxyak erabiltzeko</string>
-  <string name="menu_home">Etxea</string>
-  <string name="menu_browse">Arakatu</string>
-  <string name="menu_settings">Ezarpenak</string>
-  <string name="menu_log">Saioa hasi</string>
-  <string name="menu_info">Laguntza</string>
-  <string name="menu_start">Abiarazi</string>
-  <string name="menu_stop">Gelditu</string>
-  <string name="menu_about">Honi buruz</string>
-  <string name="main_layout_download">Deskargatu</string>
-  <string name="main_layout_upload">Igo</string>
-  <string name="button_help">Laguntza</string>
-  <string name="button_close">Itxi</string>
-  <string name="button_about">Honi buruz</string>
-  <string name="button_clear_log">Zerrenda Garbitu</string>
-  <string name="menu_verify">Egiaztatu</string>
-  <string name="menu_exit">Irten</string>
-  <string name="press_to_start">- sakatu luze hasteko -</string>
-  <string name="pref_trans_proxy_group">Proxyatze Gardena (Root behar du)</string>
-  <string name="pref_trans_proxy_title">Proxyatze Gardena</string>
-  <string name="pref_trans_proxy_summary">Aplikazioen Torifikatze Automatikoa</string>
-  <string name="pref_transparent_all_title">Tor-tu Dena</string>
-  <string name="pref_transparent_all_summary">Aplikazio guztien trafikoa Tor bidez proxyatu</string>
-  <string name="pref_transparent_port_fallback_title">Azken aukerako proxy portuak</string>
-  <string name="pref_transparent_port_fallback_summary">KONTUZ: Ohizko portuak sahiezten ditu (80, 443, etab.) *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil.</string>
-  <string name="pref_transparent_port_title">Portu Zerrenda</string>
-  <string name="pref_transparent_port_summary">Proxyak baimenduko dituen portuak. *ERABILI BAKARRIK* \'Guztiak\' edo \'Aplikazio\' modua ez badabil</string>
-  <string name="pref_transparent_port_dialog">Sartu proxyatzeko portuak</string>
-  <string name="pref_has_root">Root sarrera eskatu</string>
-  <string name="pref_has_root_summary">Root sarrera eskatu proxyatze gardenarentzat</string>
-  <string name="status_install_success">Tor bitarrak zuzen instalatuta!</string>
-  <string name="status_install_fail">Tor fitxategi bitarrak ezin izan dira instalatu. Mesedez ikusi erregistroa eta jakinarazi tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Aplikazio Akatsa</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orboti buruz</string>
-  <string name="btn_next">Hurrengoa</string>
-  <string name="btn_back">Atzera</string>
-  <string name="btn_finish">Amaitu</string>
-  <string name="btn_okay">Ados</string>
-  <string name="btn_cancel">Utzi</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Orbot xehetasun batzuk</string>
-  <string name="wizard_permissions_root">Baimena Emanda</string>
-  <string name="wizard_permissions_stock">Orbot Baimenak</string>
-  <string name="wizard_premissions_msg_root">Bikain! Orbotentzako root baimenak gaituta dituzula detektatu dugu.</string>
-  <string name="wizard_permissions_msg_stock">Beharrezkoa ez den arren, Orbot tresna ahaltsuagoa bihurtu daiteke zure gailuak root atzipena badu. Erabili beheko botoia Orboteri superbotereak emateko!</string>
-  <string name="wizard_permissions_no_root">Root atzipenik ez baduzu edo zertaz ari garen ez badakizu, ziurtatu zire appak Orbotekin lan egiteko konfiguratzen dituzula.</string>
-  <string name="wizard_permissions_consent">Ulertzen dut eta supererabiltzaile gabe jarraitu nahiko nuke</string>
-  <string name="wizard_permission_enable_root">Root Orboti eman</string>
-  <string name="wizard_configure">Torifikazioa Konfiguratu</string>
-  <string name="wizard_configure_msg">Orbotek zure aplikazio guztien EDO banan-banan hautatutako aplikazioen trafiko guztia Tor bidez bideratzeko aukera ematen dizu.</string>
-  <string name="wizard_configure_all">Aplikazio guztiak Tor bidez proxyatu</string>
-  <string name="wizard_configure_select_apps">Hautatu Banakako Aplikazioak Torentzat</string>
-  <string name="wizard_tips_tricks">Orbot-gaitutako Aplikazioak</string>
-  <string name="wizard_tips_msg">Azpiko appak Orbotekin lan egiteko garatuta daude. Sakatu botoi bakoitza orain instalatzeko, edo bilatu geroago Google Play-n, GuardianProject.info webgunean edo F-Droid.org erabiliz.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
-  <string name="wizard_tips_proxy">Proxy Ezarpenak - Ikasi zure aplikazioak Orbotekin funtziona dezaten nola konfiguratu</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Bilaketa Motorraren appa</string>
-  <string name="wizard_tips_twitter">Twittereko proxyaren ostalarian \"localhost\" jarri eta portuan 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy Ezarpenak</string>
-  <string name="wizard_final">Orbot prest dago!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Honek https://check.torproject.org web nabigatzailean irekiko du Orbot konfiguratuta eta Tor-era konektatuta zauden antzemateko.</string>
-  <string name="pref_hs_group">Ezkutuko Zerbitzuak</string>
-  <string name="pref_general_group">Orokorra</string>
-  <string name="pref_start_boot_title">Hasi Orbot Abiarazterakoan</string>
-  <string name="pref_start_boot_summary">Automatikoki Orbot hasi eta Tor konektatu zure Android gailua abiarazterakoan</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Abisua</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Baimenak</string>
-  <string name="wizard_permissions_root_msg1">Aukera moduan Orbot-i \'Supererabiltzaile\' atzipena eman ahal diozu ezaugarri aurreratuak erabiltzeko, Proxy gardena adibidez.</string>
-  <string name="wizard_permissions_root_msg2">Ez baduzu hau egin nahi ziurtatu Orbot-ekin lan egiten duten aplikazioak erabiltzen dituzula.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Gaitutako Aplikazioak</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Txat aplikazio segurua Off-the-Record enkriptazioarekin.</string>
-  <string name="wizard_tips_play">Google Play-n Guardiak Proiektuko aplikazio guztiak bilatu</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxyatze Gardena</string>
-  <string name="wizard_transproxy_msg">Honek zure aplikazioak konfiguratu beharrik Tor saretik joatea ahalbidetzen du.</string>
-  <string name="wizard_transproxy_hint">(Gaituta utzi zertaz ari garez ulertzen ez baduzu)</string>
-  <string name="wizard_transproxy_none">Bat ere ez</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Gaitu proxy gardena Wi-Fi eta USB bidez Tethering-atutako gailuentzat (berrabiaraztea beharrezkoa)</string>
-  <string name="button_grant_superuser">Supererabiltzaile sarrera eskatu</string>
-  <string name="pref_select_apps">Aplikazioak hautatu</string>
-  <string name="pref_select_apps_summary">Tor bidez bideratuko diren aplikazioak hautatu</string>
-  <string name="pref_node_configuration">Nodo Konfigurazioa</string>
-  <string name="pref_node_configuration_summary">Hauek zure anonimotasuna murriztu dezaketen ezarpen aurreratuak dira</string>
-  <string name="pref_entrance_node">Sarrera Nodoak</string>
-  <string name="pref_entrance_node_summary">Lehen jauzirako hatzmarka, ezizen, herrialde eta helbideak</string>
-  <string name="pref_entrance_node_dialog">Sartu Sarrera Nodoak</string>
-  <string name="pref_proxy_title">Irteera sareko proxya (Aukerazkoa)</string>
-  <string name="pref_proxy_type_title">Proxy mota</string>
-  <string name="pref_proxy_type_summary">Proxy zerbitzariarentzako erabiltzeko protokoloak: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Sartu Proxy Mota</string>
-  <string name="pref_proxy_host_title">Proxy Ostalaria</string>
-  <string name="pref_proxy_host_summary">Proxy zerbitzariaren helbidea</string>
-  <string name="pref_proxy_host_dialog">Sartu Proxy Ostalaria</string>
-  <string name="pref_proxy_port_title">Proxy Portua</string>
-  <string name="pref_proxy_port_summary">Proxy zerbitzariaren portua</string>
-  <string name="pref_proxy_port_dialog">Sartu Proxy portua</string>
-  <string name="pref_proxy_username_title">Irteerako proxyaren erabiltzaile izena</string>
-  <string name="pref_proxy_username_summary">Proxy erabiltzaile izena (Aukerazkoa)</string>
-  <string name="pref_proxy_username_dialog">Sartu proxy erabiltzailea</string>
-  <string name="pref_proxy_password_title">Irteerako proxyaren pasahitza</string>
-  <string name="pref_proxy_password_summary">Proxy pasahitza (Aukerazkoa)</string>
-  <string name="pref_proxy_password_dialog">Sartu proxy pasahitza</string>
-  <string name="status">Egoera</string>
-  <string name="setting_up_full_transparent_proxying_">Guztientzako proxy gardena martxan ezartzen...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Aplikazioetan oinarritutako proxy transparentea ezartzen...</string>
-  <string name="transparent_proxying_enabled">Proxyatze gardena GAITUTA</string>
-  <string name="transproxy_enabled_for_tethering_">Proxy gardena gaituta Tethering-ean!</string>
-  <string name="warning_error_starting_transparent_proxying_">ABISUA: akatsa proxyatze gardena hasterakoan!</string>
-  <string name="transproxy_rules_cleared">Proxy gardeneko erregelak garbituta</string>
-  <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Portuetan oinarritutako proxy gardena ezartzen...</string>
-  <string name="bridge_error">Zubi Akatsa</string>
-  <string name="bridge_requires_ip">Zubi ezaiugarria erabiltzeko gutxienez zubi baten IP helbidea sartu behar duzu.</string>
-  <string name="send_email_for_bridges">Gmail kontutik bridges@xxxxxxxxxxxxxx helbidera eposta bat bidali gorputzean \"get bridges\" lerroa duena.</string>
-  <string name="error">Akatsa</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Zure helbide atzigarriak salbuespena sortu du!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ezin izan da Tor prozesua hasi:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Zure helbide atzigarriak salbuespena sortu du!</string>
   <string name="your_relay_settings_caused_an_exception_">Zure errele ezarpenak salbuespena sortu dute!</string>
-  <string name="exit_nodes">Irteera Nodoak</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Hatzmarkak, ezizenak, herrialdeak eta helbideak azkeneko jauzirako</string>
-  <string name="enter_exit_nodes">Irteera Nodoak sartu</string>
-  <string name="exclude_nodes">Nodoak baztertu</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Baztertuko diren hatzmarkak, ezizenak, herrialdeak eta helbideak</string>
-  <string name="enter_exclude_nodes">Baztertzeko nodoak sartu</string>
-  <string name="strict_nodes">Nodo hertsiak</string>
-  <string name="use_only_these_specified_nodes">*Bakarrik* zehaztutako nodo hauek erabili</string>
-  <string name="bridges">Zubiak</string>
-  <string name="use_bridges">Zubiak erabili</string>
-  <string name="bridges_obfuscated">Nahasitako Zubiak</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor sarera sartzeko nodo alternatiboak gaitu</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Gaitu konfiguratutako zubiak nahasitako zubiak badira</string>
-  <string name="ip_address_and_port_of_bridges">IP helbidea eta zubien portua</string>
-  <string name="enter_bridge_addresses">Sartu Zubi Helbideak</string>
-  <string name="relays">Erreleak</string>
-  <string name="relaying">Erreleatzea</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Zure gailua ez-irteerako errelea izatea gaitu</string>
-  <string name="relay_port">Errele Portua</string>
-  <string name="listening_port_for_your_tor_relay">Zure Tor errelearentzako entzuteko portua</string>
-  <string name="enter_or_port">Sartu OR portua</string>
-  <string name="relay_nickname">Errele ezizena</string>
-  <string name="the_nickname_for_your_tor_relay">Zure Tor errelearen ezizena</string>
-  <string name="enter_a_custom_relay_nickname">Sartu gustoko errelearen ezizena</string>
-  <string name="reachable_addresses">Helbide atzigarriak</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Suheziaren atzean exekutatu politika murriztaileekin</string>
-  <string name="reachable_ports">Portu atzigarriak</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Suhezi murriztailetik atzigarri diren portuak</string>
-  <string name="enter_ports">Portuak sartu</string>
-  <string name="enable_hidden_services">Ezkutuko Zerbitzuak Gaitu</string>
-  <string name="run_servers_accessible_via_the_tor_network">gailuko zerbitzuak Tor saretik atzitzea gaitu</string>
-  <string name="enter_localhost_ports_for_hidden_services">sartu localhost portuak ezkutuko zerbitzuentzat</string>
-  <string name="hidden_service_ports">Ezkutuko Zerbitzu Portuak</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">zure eskutuko zerbitzuaren izen atzigarria (automatikoki sortuta)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">arazketarako logak gaitu (adb edo aLogCat erabili ikusteko)</string>
-  <string name="project_home">Proiektuaren etxea(k):</string>
-  <string name="the_tor_license">Tor Lizentzia</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3.-Ataleko-Softwarea:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Aplikazio batek ezkutuko zerbitzariko %S portua ireki nau du Tor sarera. Segurua da aplikazioaz fidatzen bazara.</string>
-  <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
+    <string name="found_existing_tor_process">Aurreko Tor prozesua topatuta...</string>
   <string name="something_bad_happened">Zerbait txarra gertatu da. Begiratu logetan</string>
-  <string name="hidden_service_on">ezkutuko zerbitzua hemen:</string>
-  <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
+    <string name="unable_to_read_hidden_service_name">ezkutuko zerbitzuare izena ezin da irakurri</string>
   <string name="unable_to_start_tor">Ezin izan da Tor hasi:</string>
-  <string name="pref_use_sys_iptables_title">Lehenetsitako Iptables erabili</string>
-  <string name="pref_use_sys_iptables_summary">Sistemako iptables programa erabili Orbot-ekin datorreraren ordez</string>
-  <string name="error_installing_binares">Tor programak ezin izan dira instalatu edo eguneratu.</string>
-  <string name="pref_use_persistent_notifications">Orbot konektatuta dagoenean ikonoa tresna barran mantendu beti</string>
-  <string name="pref_use_persistent_notifications_title">Jakinarazpenetan beti</string>
-  <string name="notification_using_bridges">Zubiak gaituta!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Aukeratu Orbotentzako lokala eta hizkuntza</string>
-  <string name="wizard_locale_title">Hizkuntza aukeratu</string>
-  <string name="wizard_locale_msg">Lehenetsia utzi edo uneko hizkuntzara aldatu</string>
-  <string name="powered_by">Tor-ek eskainita</string>
-  <string name="btn_save_settings">Ezarpenak gorde</string>
-  <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</string>
-  <string name="bandwidth_">Banda zabalera:</string>
-  <string name="down">behera</string>
-  <string name="up">gora</string>
-  <string name="pref_disable_network_title">Sareko lokartze automatikorik ez</string>
-  <string name="pref_disable_network_summary">Jarri Tor lotan internet atzigarri ez dagoenean</string>
-  <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
-  <string name="menu_use_chatsecure">ChatSecure erabili</string>
-  <string name="permission_manage_tor_label">Tor kudeatu</string>
-  <string name="permission_manage_tor_description">Gaitu app hau Tor zerbitzua kontrolatzeko</string>
-  <string name="install_apps_">App-ak instalatu?</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="menu_qr">QR Kodeak</string>
-  <string name="standard_browser">Nabigatzaile Estandarra</string>
+    <string name="no_internet_connection_tor">Ez dago Interneterako konexiorik; Tor egonean dago...</string>
+    <string name="newnym">ChatSecure - Andriodentzako berehalako mezulari bezero ziurra</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fa/strings.xml b/orbotservice/src/main/res/values-fa/strings.xml
index b70cc0f1..dc5b032f 100644
--- a/orbotservice/src/main/res/values-fa/strings.xml
+++ b/orbotservice/src/main/res/values-fa/strings.xml
@@ -2,291 +2,30 @@
 <resources>
   <string name="app_name">ربات Ù¾Û?ازÛ?</string>
   <string name="app_description">اربت Û?Ú© برÙ?اÙ?Ù? پرÙ?کسÛ? Ù?جاÙ?Û? است Ú©Ù? دÛ?گر برÙ?اÙ?Ù? Ù?ا را بÙ? استÙ?ادÙ? اÙ?Ù? از اÛ?Ù?ترÙ?ت تÙ?اÙ?Ù?Ù?د Ù?Û? Ú©Ù?د . اربÙ?ت از تÙ?ر براÛ? رÙ?زگذارÛ? کردÙ? تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت Ø´Ù?ا استÙ?ادÙ? Ù?Û? Ú©Ù?د Ù? بعد Ø¢Ù? Ù?ا را از طرÛ?Ù? کاÙ?Ù¾Û?Ù?ترÙ?اÛ? Ù?تÙ?اÙ?ت در Ù?Ù?اط Ù?ختÙ?Ù? جÙ?اÙ? Ù?Ø®Ù?Û? Ù?Û? Ú©Ù?د. تÙ?ر Û?Ú© برÙ?اÙ?Ù? Ù?جاÙ?Û? Ù? شبکÙ? باز است Ú©Ù? Ø´Ù?ا از Ø´Ù?ا در Ù?Ù?ابÙ? تحت Ù?ظر بÙ?دÙ? در شبکÙ?Ù¬â??  تÙ?دÛ?د آزادÛ? Ù?اÛ? شخصÛ?Ù¬ خصÙ?صÛ?Ù¬ Ù?عاÙ?Û?ت Ù?اÛ? کارÛ? Ù? رابطÙ? Ù?اÛ? شخصÛ? بطÙ?ر اÙ?Ù? Ù?حاÙ?ظت Ù?Û? Ú©Ù?د. </string>
-  <string name="internal_web_url">https://guardianproject.info/apps/orbot/</string>
-  <string name="default_web_url">https://check.torproject.org/?lang=fa_IR</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=fa_IR</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">شرÙ?ع Ù? پاÛ?اÙ? تÙ?ر</string>
-  <string name="tor_proxy_service_process">سرÙ?Ù?س پرÙ?کسÛ? تÙ?ر</string>
-  <string name="status_starting_up">اربÙ?ت درحاÙ? آغاز است...</string>
+    <string name="status_starting_up">اربÙ?ت درحاÙ? آغاز است...</string>
   <string name="status_activated">Ù?تصÙ? بÙ? شبکÙ? تÙ?ر</string>
   <string name="status_disabled">اربÙ?ت غÛ?رÙ?عاÙ? شدÙ? است.</string>
   <string name="status_shutting_down">TorService خاÙ?Ù?Ø´ است</string>
   <string name="tor_process_starting">شرÙ?ع Ú©Ù?اÛ?Ù?ت تÙ?ر...</string>
   <string name="tor_process_complete">تÙ?اÙ?.</string>
-  <string name="tor_process_waiting">در حاÙ? اÙ?تظار.</string>
-  <string name="not_anonymous_yet">Ù?شدار: Ù?عاÙ?Û?ت Ø´Ù?ا Ù?Ù?Ù?ز \"Ú¯Ù?Ù?اÙ?\" Ù?Û?ست! Ù?Ø·Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ø®Ù?د را تÙ?ظÛ?Ù? Ú©Ù?Û?د تا از HTTP پرÙ?کسÛ? 127.0.0.1:8118 Ù? Û?ا SOCKS4A Ù? Û?ا SOCKS5 پرÙ?کسÛ? 127.0.01:9050 استÙ?ادÙ? Ú©Ù?د.</string>
-  <string name="menu_home">خاÙ?Ù?</string>
-  <string name="menu_browse">Ù?رÙ?ر</string>
-  <string name="menu_settings">تÙ?ظÛ?Ù?ات</string>
-  <string name="menu_log">Ù?رÙ?د</string>
-  <string name="menu_info">Ú©Ù?Ú©</string>
-  <string name="menu_apps">Ù?Û? Ù¾Û? اÙ?</string>
-  <string name="menu_start">آغاز</string>
-  <string name="menu_stop">اÛ?ست</string>
-  <string name="menu_about">دربارÙ?</string>
-  <string name="menu_promo_apps">درÛ?اÙ?ت برÙ?اÙ?Ù? Ù?ا ...</string>
-  <string name="main_layout_download">داÙ?Ù?Ù?د</string>
-  <string name="main_layout_upload">آپÙ?Ù?د</string>
-  <string name="button_help">Ú©Ù?Ú©</string>
-  <string name="button_close">بستÙ?</string>
-  <string name="button_about">دربارÙ?</string>
-  <string name="button_clear_log">پاکسازÛ? Ù?رد</string>
-  <string name="menu_verify">بررسÛ?</string>
-  <string name="menu_exit">خرÙ?ج</string>
-  <string name="menu_scan">اسکÙ? BridgeQR</string>
-  <string name="menu_share_bridge">اشتراک BridgeQR</string>
-  <string name="press_to_start">- Ù?Ú¯Ù?دارÛ?د براÛ? شرÙ?ع -</string>
-  <string name="pref_trans_proxy_group">پرÙ?کسÛ?دÙ? Ø´Ù?اÙ? (Ù?Û?از بÙ? Root دارد)</string>
-  <string name="pref_trans_proxy_title">پرÙ?کسÛ? Ø´Ù?اÙ?</string>
-  <string name="pref_trans_proxy_summary">تÙ?ر-Ù?Ù?اÛ?Û? اتÙ?Ù?اتÛ?Ú© اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا</string>
-  <string name="pref_transparent_all_title">تÙ?ر Ù?Ù?Ù? Ú?Û?ز</string>
-  <string name="pref_transparent_all_summary">Ù?عاÙ?Û?ت Ù?Ù?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? تÙ?ر پرÙ?کسÛ? Ú©Ù?Û?د.</string>
-  <string name="pref_transparent_port_fallback_title">Ù?طع پرÙ?کسÛ? Ù¾Ù?رت</string>
-  <string name="pref_transparent_port_fallback_summary">Ù?شدار: Ù¾Ù?رتÙ?اÛ? راÛ?ج دÙ?ر زدÙ? (80, 444, غÛ?رÙ?). *Ù?Ù?Ø· در شراÛ?Ø·Û? استÙ?ادÙ? Ú©Ù?Û?د* Ú©Ù? حاÙ?ت Ù?اÛ? \'Ù?Ù?Ù?\' Û?ا \'اپÙ?Û?Ú©Û?Ø´Ù?\' کار Ù?Ù?Û?Ú©Ù?د.</string>
-  <string name="pref_transparent_port_title">Ù?Ù?رست Ù¾Ù?رت</string>
-  <string name="pref_transparent_port_summary">Ù?Ù?رست پرتÙ?ا بÙ? پرÙ?کسÛ?.*Ù?Ù?Ø· در شراÛ?Ø·Û? استÙ?ادÙ? Ú©Ù?Û?د* Ú©Ù? حاÙ?ت Ù?اÛ? \'Ù?Ù?Ù?\' Û?ا \'اپÙ?Û?Ú©Û?Ø´Ù?\' کار Ù?Ù?Û?Ú©Ù?د.</string>
-  <string name="pref_transparent_port_dialog">Ù¾Ù?رت Ù?ا را  بÙ? پرÙ?کسÛ? Ù?ارد Ú©Ù?</string>
-  <string name="pref_has_root">درخÙ?است دسترسÛ? root</string>
-  <string name="pref_has_root_summary"> درخÙ?است دسترسÛ? رÙ?Ù? براÛ? پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ? </string>
-  <string name="status_install_success">باÛ?Ù?رÛ? Ù?اÛ? تÙ?ر با Ù?Ù?Ù?Ù?Û?ت Ù?صب شدÙ?د!</string>
-  <string name="status_install_fail">Ù?صب Ù?اÛ?Ù? Ù?اÛ? دÙ?تاÛ?Û? تÙ?ر Ù?Ù?Ú©Ù? Ù?بÙ?د. Ù?Ø·Ù?Ù? Ù?طعÙ? را Ù?ارسÛ? Ú©Ù?Û?د Ù? بÙ? tor-assistance@xxxxxxxxxxxxxx اطÙ?اع دÙ?Û?د.</string>
-  <string name="title_error">خطاÛ? اپÙ?Û?Ú©Û?Ø´Û?Ù?</string>
-  <string name="wizard_title">اÙ?ربÙ?ت</string>
-  <string name="wizard_btn_tell_me_more">دربارÙ? اÙ?ربÙ?ت</string>
-  <string name="btn_next">بعدÛ?</string>
-  <string name="btn_back">بازگشت</string>
-  <string name="btn_finish">پاÛ?اÙ?</string>
-  <string name="btn_okay">Ù?بÙ?Ù?</string>
-  <string name="btn_cancel">Ù?غÙ?</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">برخÛ? جزÛ?Û?ات دربارÙ? اÙ?ربÙ?ت</string>
-  <string name="wizard_details_msg">اربت Û?Ú© برÙ?اÙ?Ù? زباÙ? باز است Ú©Ù? شاÙ?Ù? Tor, LibEvent and Polipo Ù?Û? Ø´Ù?د Ù? Ù?ظÛ?Ù?Ù? Ø¢Ù? ارائÙ?  local HTTP proxy (8118) Ù? SOCKS proxy (9050) بÙ? شبکÙ? تÙ?ر است. Ù?Ù?Ú?Ù?Û?Ù? اربت اÛ?Ù? Ù?ابÙ?Û?ت را در دستگاÙ? Ù?اÛ? رÛ?Ø´Ù? دار دارد  Ú©Ù? Ù?Û? تÙ?اÙ?د تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت را از طرÛ?Ù? تÙ?ر ارساÙ? Ú©Ù?د. </string>
-  <string name="wizard_permissions_root">Ù?جÙ?ز صادر گردÛ?د</string>
-  <string name="wizard_permissions_stock">Ù?جÙ?زÙ?اÛ? اÙ?ربÙ?ت</string>
-  <string name="wizard_premissions_msg_root">بسÛ?ار عاÙ?Û?! اÛ?Ù?Ø·Ù?ر Ú©Ù? Ù?عÙ?Ù?Ù? است Ø´Ù?ا داراÛ? Ù?جÙ?ز root براÛ? Ù?عاÙ? کردÙ? ربات Ù¾Û?ازÛ? Ù?ستÛ?د. اÛ?Ù? اÙ?کاÙ? را بخÙ?بÛ? Ù?Ù?رد استÙ?ادÙ? Ù?رار Ø®Ù?اÙ?Û?Ù? داد.</string>
-  <string name="wizard_permissions_msg_stock">Ù?رÚ?Ù?د ضرÙ?رت Ù?دارد اÙ?ا اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root باشد ربات Ù¾Û?ازÛ? با ظرÙ?Û?ت بسÛ?ار بÛ?شترÛ? عÙ?Ù? Ø®Ù?اÙ?د کرد. دکÙ?Ù? زÛ?ر را Ù?شار دÙ?Û?د تا ربات Ù¾Û?ازÛ? داراÛ? ظرÙ?Û?ت حداکثرÛ? بشÙ?د.</string>
-  <string name="wizard_permissions_no_root">اگر سÛ?ستÙ? Ø´Ù?ا داراÛ? دسترسÛ? root Ù?Û?ست Ù? Û?ا اصÙ?ا Ú?Û?زÛ? از اÛ?Ù? عبارت Ù?تÙ?جÙ? Ù?Ù?Û? Ø´Ù?Û?دØ? حتÙ?ا سعÛ? Ú©Ù?Û?د از اپÙ?Ú©Û?Ø´Ù? Ù?اÛ?Û? استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?Û?Ú?Ù? ربات Ù¾Û?ازÛ? تÙ?Û?Ù? شدÙ? اÙ?د.</string>
-  <string name="wizard_permissions_consent">Ù?تÙ?جÙ? Ù?ستÙ? Ù? ترجÛ?Ø­ Ù?Û? دÙ?Ù? بدÙ?Ù? root اداÙ?Ù? بدÙ?Ù?.</string>
-  <string name="wizard_permission_enable_root">Ù?اگذارÛ? دسترسÛ? root براÛ? ربات Ù¾Û?ازÛ?</string>
-  <string name="wizard_configure">تÙ?ظÛ?Ù?ات تبدÛ?Ù? بÙ? تÙ?ر</string>
-  <string name="wizard_configure_msg">ربات Ù¾Û?ازÛ? بÙ? Ø´Ù?ا اÙ?کاÙ? Ù?Û? دÙ?د Ú©Ù? تÙ?اÙ? اپÙ?Û?Ú©Ø´Û?Ù? Ù?ا را از طرÛ?Ù? تÙ?ز  Ù?Ù?تÙ?Ù? Ú©Ù?Û?د Ù? Û?ا اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?رد Ù?ظر Ø®Ù?د را شخصÙ? اÙ?تخاب Ú©Ù?Û?د.</string>
-  <string name="wizard_configure_all">تÙ?اÙ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا را از طرÛ?Ù? تÙ?ر Ù?Ù?تÙ?Ù? Ú©Ù?Û?د.</string>
-  <string name="wizard_configure_select_apps">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ù?Ù?Ù?رد براÛ? تÙ?ر اÙ?تخاب Ú©Ù?Û?د.</string>
-  <string name="wizard_tips_tricks">اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? Ú©Ù? براÛ? ربات Ù¾Û?ازÛ? تÙ?ظÛ?Ù? شدÙ? اÙ?د</string>
-  <string name="wizard_tips_msg">تÙ?صÛ?Ù? Ù?Û? Ú©Ù?Û?Ù? داÙ?Ù?Ù?Ù?د Ù? Ù?عاÙ? Ú©Ù?Û?دØ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ?Û? را استÙ?ادÙ? Ú©Ù?Û?د Ú©Ù? Ù?ستÙ?Û?Ù? بÙ? اÙ?ربÙ?ت Ù?صÙ? Ù?Û? Ø´Ù?Ù?د. دکÙ?Ù? Ù?اÛ? زÛ?ر را Ù?شار دÙ?Û?د تا Ù?صب Ø´Ù?د.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - برÙ?اÙ?Ù? اÙ?Ù? ارساÙ? Ù¾Û?غاÙ? Ù?Ù?رÛ? براÛ? اÙ?درÙ?ئÛ?د</string>
-  <string name="wizard_tips_proxy">تÙ?ظÛ?Ù?ات پرÙ?کسÛ? - Û?ادگÛ?رÛ? تÙ?ظÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? Ù?ا براÛ? کار با اÙ?ربÙ?ت</string>
-  <string name="wizard_tips_duckgo">اپÙ?Û?Ú©Û?Ø´Ù? Ù?Ù?تÙ?ر جستجÙ?Û? داک داک Ú¯Ù?</string>
-  <string name="wizard_tips_twitter">تÙ?Û?Û?تر از \"http proxy \"localhost:8118 پشتÛ?باÙ?Û? Ù?Û? Ú©Ù?د</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ساختÙ? Û?Ú© داستاÙ? Ù? ترک Ø¢Ù? بÙ? Tor براÛ? اÙ?Ù?Û?ت!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">تÙ?ظÛ?Ù?ات پرÙ?کسÛ?</string>
-  <string name="wizard_proxy_help_msg">اگر برÙ?اÙ?Ù? Ø¢Ù?درÙ?Û?دÛ? Ú©Ù? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د Ù?Û? تÙ?اÙ?د از استÙ?ادÙ? HTTP Û?ا  SOCKS proxy ساپÙ?رت Ú©Ù?د٬ پس Ù?Û? تÙ?اÙ?Û?د Ø¢Ù? را براÛ? اتصاÙ? بÙ? اÙ?ربÙ?ت استÙ?ادÙ? از تÙ?ر تÙ?ظÛ?Ù? Ú©Ù?Û?د. .\n\n\n تÙ?ظÛ?Ù?ات Ù?است 127.0.0.1  Û?ا \"localhost\". براÛ? HTTP تÙ?ظÛ?Ù? Ù¾Ù?رت  8118 است. براÛ?  SOCKS Ù¬ پرÙ?کسÛ? 9050. اگر اÙ?کاÙ?Ø´ Ù?جÙ?د دارد از  SOCKS4A Û?ا SOCKS5 استÙ?ادÙ? Ú©Ù?Û?د. \n \n\n\n  Ù?Û? تÙ?اÙ?Û?د در Ù?Ù?رد پرÙ?کسÛ? در Ø¢Ù?درÙ?Û?د بÛ?شتر بÛ?اÙ?Ù?زÛ?د در
- http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">اÙ?ربÙ?ت Ø¢Ù?ادÙ? استÙ?ادÙ? Ù?Û?باشد!</string>
-  <string name="wizard_final_msg">بسÛ?ارÛ? از Ù?ردÙ? در سرتاسر جÙ?اÙ? از تÙ?ر بÙ? دÙ?اÛ?Ù? Ù?تÙ?اÙ?ت استÙ?ادÙ? Ù?Û? Ú©Ù?Ù?د.\n\n خبرÙ?گارÙ?ا Ù? بÙ?اگرÙ?ا٬ Ù?عاÙ?اÙ? Ø­Ù?Ù?Ù? بشر٬ سربازاÙ?Ù¬ Ù?اÙ?Ù?راÙ? اجراÛ? Ù?اÙ?Ù?Ù?Ù¬ Ø´Ù?رÙ?Ù?داÙ? رÚ?Û?Ù? Ù?اÛ? سرکÙ?بگر Ù? Ù?ردÙ? Ù?عÙ?Ù?Ù?Û?... Ù? حاÙ?ا تÙ? </string>
-  <string name="wizard_exit_at_first_screen_toast">Ù?Ø·Ù?ا اÙ?ربÙ?ت را  Ù¾Û?کربÙ?دÛ? Ú©Ù?Û?د Ù?بÙ? از اÛ?Ù?Ú©Ù? Ø´Ù?ا شرÙ?ع بÙ? استÙ?ادÙ? از Ø¢Ù? Ú©Ù?Û?د!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">با Ù?Ù?Ù?Ù?Û?ت بÙ? شبکÙ? Tor Ù?تصÙ? شدÙ? اÛ?د - اÙ?ا اÛ?Ù? بداÙ? Ù?عÙ?ا Ù?Û?ست دستگاÙ? Ø´Ù?ا اÙ?Ù? است. Ø´Ù?ا Ù?Û? تÙ?اÙ?Û?د استÙ?ادÙ? Ú©Ù?Û?د از Ú©Ù?Û?د \"Ù?رÙ?رگر\" براÛ? تست اتصاÙ? . \n\n دربارÙ? Ù?ا در https://guardianproject.info/apps/orbot Ù? Û?ا ارساÙ? اÛ?Ù?Û?Ù? بÙ? help@xxxxxxxxxxxxxxxxxxxx براÛ? کسب اطÙ?اعات بÛ?شتر.</string>
-  <string name="tor_check">با اÛ?Ù? Ù?دÙ? Ù¾Û?Ø´Ù?رض Ù?رÙ?رگر Ù?ب Ø´Ù?ا بÙ? صÙ?Ø­Ù?   https://check.torproject.org باز Ù?Û? Ø´Ù?د تا Ø´Ù?ا Ù?شاÙ?دÙ? Ú©Ù?Û?د Ø¢Û?ا ربات Ù¾Û?ازÛ? تÙ?ظÛ?Ù? شدÙ? است Ù? Ø¢Û?ا Ø´Ù?ا بÙ? تÙ?ر Ù?صÙ? شدÙ? اÛ?د Û?ا Ù?Ù?.</string>
-  <string name="pref_hs_group">سرÙ?Ù?س Ù?اÛ? Ù?Ø®Ù?Û? Ù?است</string>
-  <string name="pref_general_group">Ú©Ù?Û?</string>
-  <string name="pref_start_boot_title">اÙ?ربÙ?ت را Ù?Ù?زÙ?اÙ? با بÙ?ت آغاز Ú©Ù?</string>
-  <string name="pref_start_boot_summary">Ù?Ù?تÛ? اÙ?درÙ?Û?د بÙ?ت شدØ? بصÙ?رت Ø®Ù?دکار ربات Ù¾Û?ازÛ? را اجرا Ù? Ø¢Ù? را بÙ? شبکÙ? تÙ?ر Ù?تصÙ? Ú©Ù?</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">اربت٬ تÙ?ر را براÛ? Ø¢Ù?درÙ?Û?د Ù?Û? Ø¢Ù?رد تا از Ù?حتÙ?Û?ات Ù?Û?Ù?تر شدÙ?Ù¬ Ø¢Ù?اÙ?Û?ز تراÙ?Û?Ú© Ù? Ú©Ù?ترÙ? شبکÙ? Ú©Ù? خطرÛ? براÛ? حرÛ?Ù? خصÙ?صÛ? است Ù? اطÙ?اعات شخصÛ? Ù? رابطÙ? Ù?ا دÙ?اع Ú©Ù?د. \n\nT اÛ?Ù? جادÙ?گر براÛ? تÙ?ظÛ?Ù? اربت Ù? تÙ?ر در دستگاÙ? Ø´Ù?ا Ú©Ù?Ú© Ù?Û? Ú©Ù?د. </string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ù?شدار</string>
-  <string name="wizard_warning_msg">Ù?صب کردÙ? اربت بÙ? Ø®Ù?دÛ? Ø®Ù?د تراÙ?Û?Ú© Ù?Ù?باÛ?Ù? Ø´Ù?ا را Ù?اشÙ?اس Ù?Ø®Ù?اÙ?د کرد.\n\n باÛ?د حتÙ?ا اربت را در دستگاÙ? Û?ا برÙ?اÙ?Ù? اÛ? Ú©Ù? از Ø¢Ù? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د براÛ? استÙ?ادÙ? از تÙ?ر تÙ?ظÛ?Ù? Ù?Ù?اÛ?Û?د.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">دسترسÛ?â??Ù?ا</string>
-  <string name="wizard_permissions_root_msg1">اگر بخÙ?اÙ?Û?د Ù?Û?تÙ?اÙ?Û?د بÙ? ربات Ù¾Û?ازÛ? اجازÙ? دسترسÛ?  سÙ?پر Û?Ù?زر بدÙ?Û?د تا Ù?Û?Ú?Ú¯Û?Ù?اÛ? Ù¾Û?شرÙ?تÙ?  Ù?اÙ?Ù?د پرÙ?کسÛ? Ø´Ù?اÙ? را Ù?عاÙ? Ú©Ù?د </string>
-  <string name="wizard_permissions_root_msg2">اگر Ù?Ù?Û?Ø®Ù?اÙ?Û?د اÛ?Ù? کار را اÙ?جاÙ? دÙ?Û?د Ø? Ù?Ø·Ù?ا Ù?Ø·Ù?ئÙ? Ø´Ù?Û?د Ú©Ù? از اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? استÙ?ادÙ? Ù?Û? Ú©Ù?Û?د Ú©Ù? با ربات Ù¾Û?ازÛ? کار Ù?Û? Ú©Ù?Ù?د</string>
-  <string name="wizard_permissions_no_root_msg">بÙ?ظر Ù?Û? رسد دستگاÙ? Ø´Ù?ا رÛ?Ø´Ù? Ù?دارد Û?ا رÛ?Ø´Ù? اÛ? ارائÙ? Ú©Ù?د Û?ا دسترسÛ? بÙ? کاربرÛ? Ù?دÛ?ر داشتÙ? باشد. \n\n Ù?Ø·Ù?ا حاÙ?ت Apps را در صÙ?Ø­Ù? اصÙ?Û? رÙ?Ø´Ù? Ù?Ù?اÛ?Û?د. </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">  اپÙ?Û?Ú©Û?Ø´Ù?Ù?اÛ?Û? Ú©Ù? ربات Ù¾Û?ازÛ? رÙ?Û? Ø¢Ù?Ù?ا Ù?عاÙ? است</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: برÙ?اÙ?Ù? Ú¯Ù?تگÙ?Û? اÙ?Ù? Ù?حرÙ?اÙ?Ù? با Ù?ابÙ?Û?ت رÙ?زگزارÛ?</string>
-  <string name="wizard_tips_play">تÙ?اÙ?Ù? برÙ?اÙ?Ù? Ù?اÛ? Guardian Project را در Google Play Ù¾Ù?دا Ù?Ù?Ù?د.</string>
-  <string name="wizard_tips_fdroid">Û?اÙ?تÙ? Ù?Ù?Ù? برÙ?اÙ?Ù? Ù?اÛ? Guardian Project در F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Û?اÙ?تÙ? Ù?Ù?Ù? برÙ?اÙ?Ù? Ù?اÛ? Guardian Project در https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">پرÙ?کسÛ? کردÙ? Ø´Ù?اÙ?</string>
-  <string name="wizard_transproxy_msg">اÛ?Ù? بÙ? برÙ?اÙ?Ù? Ù?ا بÙ? Ø´Ù?ا اجازÙ? Ù?Û?دÙ?د Ú©Ù? بدÙ?Ù? Ù?Û?Ú? تÙ?ظÛ?Ù?Û?Ø? بصÙ?رت Ø®Ù?دکار از طرÛ?Ù? شبکÙ? تÙ?ر اجرا Ø´Ù?Ù?د</string>
-  <string name="wizard_transproxy_hint">(اگر Ù?Û?Ú? اÛ?دÙ?â??اÛ? Ù?دارÛ?د Ú©Ù? راجع بÙ? Ú?Ù? Ú?Û?زÛ? حرÙ? Ù?Û?زÙ?Û?Ù? اÛ?Ù? گزÛ?Ù?Ù? را اÙ?تخاب Ú©Ù?Û?د)</string>
-  <string name="wizard_transproxy_none">Ù?Û?Ù?Ú?</string>
-  <string name="pref_transparent_tethering_title"> تترÛ?Ù?Ú¯ از طرÛ?Ù? تÙ?ر</string>
-  <string name="pref_transparent_tethering_summary">پرÙ?کسÛ? Ø´Ù?اÙ? از طرÛ?Ù? تÙ?ر را براÛ? دستگاÙ? Ù?اÛ?Û? Ú©Ù? با Û?Ù? اس بÛ? Û?ا Ù?اÛ? Ù?اÛ? تتر شدÙ? اÙ?د Ù?جاز Ú©Ù?. (بÙ? رÛ? استارت Ù?Û?از دارÙ?د)</string>
-  <string name="button_grant_superuser">درخÙ?است دسترسÛ? براÛ? سÙ?پرÛ?Ù?زر</string>
-  <string name="pref_select_apps">اÙ?تخاب برÙ?اÙ?Ù? Ù?ا</string>
-  <string name="pref_select_apps_summary"> اÙ?تخاب اپÙ?Û?Ú©Û?Ø´Ù? براÛ? Ù?سÛ?رÛ?ابÛ? از طرÛ?Ù? تÙ?ر </string>
-  <string name="pref_node_configuration">تÙ?ظÛ?Ù?ات گرÙ?</string>
-  <string name="pref_node_configuration_summary">اÛ?Ù?Ù?ا تÙ?ظÛ?Ù?ات Ù¾Û?شرÙ?تÙ? اÛ? Ù?ستÙ?د Ú©Ù? Ù?Ù?Ú©Ù? است Ú¯Ù?Ù?اÙ?Û? Ø´Ù?ا را کاÙ?Ø´ دÙ?Ù?د</string>
-  <string name="pref_entrance_node">گرÙ? Ù?اÛ? Ù?رÙ?دÛ?</string>
-  <string name="pref_entrance_node_summary">اثراÙ?گشت Ù?اØ? اساÙ?Û? Ù?ستعارØ? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?اÛ? جÙ?Ø´ اÙ?Ù?</string>
-  <string name="pref_entrance_node_dialog">گرÙ? Ù?اÛ? Ù?رÙ?دÛ? را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="pref_allow_background_starts_title">اجازÙ? دادÙ? اجرا در پس زÙ?Û?Ù?Ù?</string>
-  <string name="button_proxy_all">Ù?Ù?Ù? پرÙ?کسÛ? Ù?ا</string>
-  <string name="button_proxy_none">Ù?Û?Ú? پرÙ?کسÛ?</string>
-  <string name="button_invert_selection">اÙ?تخاب برعکس Ø´Ù?د</string>
-  <string name="pref_proxy_title">پراکسÛ? شبکÙ? خرÙ?جÛ?</string>
-  <string name="pref_proxy_type_title">Ù?Ù?ع پرÙ?کسÛ?</string>
-  <string name="pref_proxy_type_summary">پرÙ?تکÙ? Ù?Ù?رد استÙ?ادÙ? براÛ? پراکسÛ? سرÙ?ر: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Ù?Ù?ع پرÙ?کسÛ? را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="pref_proxy_host_title"> پرÙ?کسÛ? Ù?Û?زباÙ?</string>
-  <string name="pref_proxy_host_summary">Ù?اÙ? سرÙ?ر پرÙ?کسÛ? Ù?Û?زباÙ? </string>
-  <string name="pref_proxy_host_dialog">Ù?اÙ? پرÙ?کسÛ? Ù?Û?زباÙ? را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="pref_proxy_port_title">Ù¾Ù?رت پرÙ?کسÛ? خرÙ?جÛ?</string>
-  <string name="pref_proxy_port_summary">Ù¾Ù?رت سرÙ?ر پرÙ?کسÛ?</string>
-  <string name="pref_proxy_port_dialog">Ù¾Ù?رت پرÙ?کسÛ? را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="pref_proxy_username_title">Ù?اÙ? کاربرÛ? پراکسÛ? خرÙ?جÛ?</string>
-  <string name="pref_proxy_username_summary">Ù?اÙ? کاربرÛ? پرÙ?کسÛ?(اختÛ?ازÛ?)</string>
-  <string name="pref_proxy_username_dialog">Ù?اÙ? کاربرÛ? پرÙ?کسÛ? را Ù?ارد Ù?Ù?اÛ?Û?د</string>
-  <string name="pref_proxy_password_title">Ú©Ù?Ù?Ù? عبÙ?ر پراکسÛ? خرÙ?جÛ?</string>
-  <string name="pref_proxy_password_summary">رÙ?ز عبÙ?ر پرÙ?کسÛ?(اختÛ?ارÛ?)</string>
-  <string name="pref_proxy_password_dialog">رÙ?ز عبÙ?ر پرÙ?کسÛ? را Ù?ارد Ù?Ù?اÛ?Û?د</string>
-  <string name="status">Ù?ضعÛ?ت</string>
-  <string name="setting_up_full_transparent_proxying_">Ù?صب پرÙ?کسÛ? کاÙ?Ù?Ù? Ø´Ù?اÙ?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ù?صب پرÙ?کسÛ? Ø´Ù?اÙ? Ù?بتÙ?Û? بر برÙ?اÙ?Ù?...</string>
-  <string name="transparent_proxying_enabled">پرÙ?کسÛ? Ø´Ù?اÙ? Ù?عاÙ? است</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy براÛ? Tethering Ù?عاÙ? شدÙ? است!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ù?شدار: خطا در Ù?Ù?گاÙ? راÙ? اÙ?دازÛ? پرÙ?کسÛ? Ø´Ù?اÙ?!</string>
-  <string name="transproxy_rules_cleared">Ù?Ù?اÙ?Û?Ù? TransProxy پاک شدÙ?د</string>
-  <string name="couldn_t_start_tor_process_"> تÙ?ر Ù?تÙ?است اجرا Ø´Ù?د:</string>
-  <string name="privoxy_is_running_on_port_">Polipo در حاÙ? اجرا است در Ù¾Ù?رت:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ù?صب پرÙ?کسÛ? Ø´Ù?اÙ? Ù?بتÙ?Û? بر Ù¾Ù?رت...</string>
-  <string name="bridge_error">خطاÛ? Bridge </string>
-  <string name="bridge_requires_ip">براÛ? استÙ?ادÙ? از Ù?Û?Ú?Ú¯Û? BridgeØ? باÛ?د حداÙ?Ù? آدرس IP Û?Ú© Ù¾Ù? را Ù?ارد Ú©Ù?Û?د.</string>
-  <string name="send_email_for_bridges">از Û?Ú© حساب کاربرÛ? جÛ?Ù?Û?Ù?Ø? اÛ?Ù?Û?Ù?Û? با Ù?تÙ? \"get bridges\" بÙ? آدرس bridges@xxxxxxxxxxxxxx بÙ?رستÛ?د.</string>
-  <string name="error">خطا</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">تÙ?ظÛ?Ù?ات Ø´Ù?ا براÛ? آدرس Ù?ابÙ? دسترسÛ? باعث اÛ?جاد خطا شدÙ? اÙ?د !</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_"> تÙ?ر Ù?تÙ?است اجرا Ø´Ù?د:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">تÙ?ظÛ?Ù?ات Ø´Ù?ا براÛ? آدرس Ù?ابÙ? دسترسÛ? باعث اÛ?جاد خطا شدÙ? اÙ?د !</string>
   <string name="your_relay_settings_caused_an_exception_">تÙ?ظÛ?Ù?ات رÙ?Ù? Ø´Ù?ا Ù?Ù?جب خطا شدÙ? اÙ?د</string>
-  <string name="exit_nodes">گرÙ? Ù?اÛ? خرÙ?جÛ?</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">اثر اÙ?گشتÙ?ا Ø? اساÙ?Û? Ù?ستعار Ø? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?ا براÛ? آخرÛ?Ù? جÙ?Ø´ </string>
-  <string name="enter_exit_nodes"> گرÙ? Ù?اÛ? خرÙ?جÛ? را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="exclude_nodes">اÛ?Ù? گرÙ? Ù?ا را استÙ?ادÙ? Ù?Ú©Ù?</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">اثر اÙ?گشتÙ?اØ? اساÙ?Û? Ù?ستعار Ø? Ú©Ø´Ù?رÙ?ا Ù? آدرسÙ?اÛ?Û? Ú©Ù? Ù?باÛ?د استÙ?ادÙ? Ø´Ù?Ù?د</string>
-  <string name="enter_exclude_nodes"> گرÙ? Ù?اÛ?Û? Ú©Ù? Ù?باÛ?د استÙ?ادÙ? Ø´Ù?Ù?د</string>
-  <string name="strict_nodes">گرÙ? Ù?اÛ? Ù?حدÙ?د</string>
-  <string name="use_only_these_specified_nodes">Ù?Ù?Ø· * از اÛ?Ù? گرÙ? Ù?اÛ? Ù?شخص شدÙ? استÙ?ادÙ? Ú©Ù?Û?د* </string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">از Ù¾Ù? Bridges Ú©Ù?</string>
-  <string name="bridges_obfuscated">Ù¾Ù? Ù?اÛ? Ú¯Û?ج Ú©Ù?Ù?دÙ?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">گرÙ? Ù?رÙ?دÛ? Ù?تÙ?اÙ?ب بÙ? شبکÙ? تÙ?ر را Ù?عاÙ? Ú©Ù?Û?د</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">اگر Bridges تÙ?ظÛ?Ù? شدÙ? Ù¾Ù?Ù?اÛ? Ù?ربÙ?Ø· بÙ? پرÙ?کسÛ? Ú¯Û?ج Ú©Ù?Ù?دÙ? Ù?ستÙ?د اÛ?Ù? گزÛ?Ù?Ù? را Ù?عاÙ? Ú©Ù?Û?د</string>
-  <string name="ip_address_and_port_of_bridges">آدرس Ø¢Û? Ù¾Û? Ù? Ù¾Ù?رتÙ? Ù¾Ù? Ù?ا</string>
-  <string name="enter_bridge_addresses">آدرس Bridges را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="relays">بازپخش Ú©Ù?Ù?دÙ? Ù?ا</string>
-  <string name="relaying">درحاÙ? بازپخش</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">دستگاÙ? Ø®Ù?د را براÛ? Û?Ú© بازپخش Ú©Ù?Ù?دÙ? غÛ?ر-خرÙ?جÛ? Ù?عاÙ? Ú©Ù?Û?د</string>
-  <string name="relay_port">Ù¾Ù?رت بازپخش Ú©Ù?Ù?دÙ?</string>
-  <string name="listening_port_for_your_tor_relay"> Ù¾Ù?رت Ø´Ù?Ù?Ù?دÙ? براÛ? باز پخش تÙ?ر</string>
-  <string name="enter_or_port">Ù¾Ù?رت OR را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="relay_nickname">Ù?اÙ? Ù?ستعار بازپخش Ú©Ù?Ù?دÙ?</string>
-  <string name="the_nickname_for_your_tor_relay">Ù?اÙ? Ù?ستعار بازپخش Ú©Ù?Ù?دÙ? Ø´Ù?ا</string>
-  <string name="enter_a_custom_relay_nickname">Û?Ú© Ù?اÙ? Ù?ستعار دÙ?Ø®Ù?اÙ? براÛ? بازپخش Ú©Ù?Ù?دÙ? Ù?ارد Ú©Ù?Û?د</string>
-  <string name="reachable_addresses">آدرس Ù?اÛ? Ù?ابÙ? دسترس</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">بعÙ?Ù?اÙ? Û?Ú© کاربر پشت دÛ?Ù?ارÙ? آتش با سÛ?است Ù?اÛ? Ù?حدÙ?د Ú©Ù?Ù?دÙ? اجرا Ú©Ù?Û?د</string>
-  <string name="reachable_ports">Ù¾Ù?رتâ??Ù?اÛ? Ù?ابÙ? دسترس</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ù¾Ù?رتâ??Ù?اÛ? Ù?ابÙ? دسترس پشت Û?Ú© Ù?اÛ?رÙ?اÙ? Ù?حدÙ?دکÙ?Ù?دÙ?</string>
-  <string name="enter_ports">Ù¾Ù?رتâ??Ù?ا را Ù?ارد Ú©Ù?Û?د</string>
-  <string name="enable_hidden_services">سرÙ?Û?سâ??Ù?اÛ? Ù?Ø®Ù?Û? را Ù?عاÙ? Ú©Ù?</string>
-  <string name="run_servers_accessible_via_the_tor_network">اجازÙ? بدÙ? سرÙ?رÙ?اÛ? رÙ?Û? دستگاÙ? از طرÛ?Ù? شبکÙ? تÙ?ر Ù?ابÙ? دسترسÛ? باشÙ?د</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ù¾Ù?رت Ù?اÛ? Ù?Ù?کاÙ? Ù?است را براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? Ù?ارد Ú©Ù?Û?د</string>
-  <string name="hidden_service_ports">Ù¾Ù?رتâ??Ù?اÛ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ù?اÙ? Ù?شاÙ?Û? پذÛ?ر براÛ? سرÙ?Û?س Ù?Ø®Ù?Û? Ø´Ù?ا (بصÙ?رت Ø®Ù?دکار تÙ?Ù?Û?د شدÙ? است)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ثبت گزارش اشکاÙ? زداÛ?Û? را بÙ? خرÙ?جÛ? Ù?عاÙ? Ú©Ù? (براÛ? Ù?Ù?اÛ?Ø´ باÛ?د از adb Û?ا aLogCat استÙ?ادÙ? Ú©Ù?Û?د)</string>
-  <string name="project_home">صÙ?Ø­Ù? (Ù?اÛ?) اصÙ?Û? پرÙ?Ú?Ù?:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ú¯Ù?اÙ?Û? تÙ?ر</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Û?Ú© اپÙ?Û?Ú©Û?Ø´Ù? Ù?Û?Ø®Ù?اÙ?د Ù¾Ù?رت %S سرÙ?Û?س Ù?Ø®Ù?Û? را بÙ? شبکÙ? تÙ?ر باز Ú©Ù?د. اگر بÙ? اÛ?Ù? اپÙ?Û?Ú©Û?Ø´Ù? اعتÙ?اد دارÛ?د اÛ?Ù? بÛ? خطر است.</string>
-  <string name="found_existing_tor_process">Û?Ú© تÙ?ر درحاÙ? اجرا Ù¾Û?دا شد...</string>
+    <string name="found_existing_tor_process">Û?Ú© تÙ?ر درحاÙ? اجرا Ù¾Û?دا شد...</string>
   <string name="something_bad_happened">اتÙ?اÙ? بدÛ? اÙ?تاد. Ù?Ù?اÛ?ع ثبت شدÙ? را Ú?Ú© Ú©Ù?Û?د</string>
-  <string name="hidden_service_on">سرÙ?Û?س Ù?Ø®Ù?Û? رÙ?Û?:</string>
-  <string name="unable_to_read_hidden_service_name">Ù?اتÙ?اÙ? در Ø®Ù?اÙ?دÙ? Ù?اÙ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
+    <string name="unable_to_read_hidden_service_name">Ù?اتÙ?اÙ? در Ø®Ù?اÙ?دÙ? Ù?اÙ? سرÙ?Û?س Ù?Ø®Ù?Û?</string>
   <string name="unable_to_start_tor">Ù?اتÙ?اÙ? در راÙ? اÙ?دازÛ? تÙ?ر:</string>
-  <string name="unable_to_reset_tor">راÙ? اÙ?دازÛ? Ù?جدد دستگاÙ? Ø´Ù?ا Ø? Ù?ادر Ù?Û?ست بÙ? تÙ?ظÛ?Ù? Ù?جدد Tor !</string>
-  <string name="pref_use_sys_iptables_title">از Iptables Ù¾Û?Ø´ Ù?رض استÙ?ادÙ? Ú©Ù?</string>
-  <string name="pref_use_sys_iptables_summary">بÙ? جاÛ? Ú?Û?زÛ? Ú©Ù? با ربات Ù¾Û?ازÛ? اÙ?Ù?دÙ?Ø? از باÛ?Ù?رÛ? Ø¢Û? Ù¾Û? تÛ?بÙ?ز داخÙ?Û? استÙ?ادÙ? Ú©Ù?</string>
-  <string name="error_installing_binares">Ù?اÛ?Ù?Ù?اÛ? باÛ?Ù?رÛ? تÙ?ر Ù?ادر بÙ? Ù?صب Ù? Û?ا ارتÙ?ا Ù?بÙ?دÙ?د</string>
-  <string name="pref_use_persistent_notifications">Ù?Ù?تÛ? ربات Ù¾Û?ازÛ? Ù?تصÙ? استØ? Ù?Ù?Û?Ø´Ù? Ø¢Û?Ú©Ù?Ù? Ù?ربÙ?Ø· را در Ù?Ù?ار ابزار Ù?Ú¯Ù? دار.</string>
-  <string name="pref_use_persistent_notifications_title">آگاÙ?سازÛ? Ù?Ù?Û?Ø´Ù? رÙ?Ø´Ù?</string>
-  <string name="pref_use_expanded_notifications">Ù?Ù?اÛ?Ø´ اطÙ?اع رساÙ?Û? گستردÙ? با Ú©Ø´Ù?ر خرÙ?جÛ? Tor Ù? IP</string>
-  <string name="pref_use_expanded_notifications_title">اطÙ?اعÛ?Ù? گستردÙ?</string>
-  <string name="notification_using_bridges">Bridges Ù?عاÙ? شدÙ?د!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">زباÙ?</string>
-  <string name="set_locale_summary">زباÙ? Ù?Ø­Ù?Û?  ربات Ù¾Û?ازÛ? را اÙ?تخاب Ú©Ù?Û?د</string>
-  <string name="wizard_locale_title">اÙ?تخاب زباÙ?</string>
-  <string name="wizard_locale_msg">زباÙ? Ú©Ù?Ù?Ù?Û? را تعÙ?Û?ض Ù? Û?ا بÙ? Ø´Ú©Ù? Ù¾Û?Ø´Ù?رض رÙ?اÛ?Ø´ Ú©Ù?Û?د</string>
-  <string name="powered_by">طراحÛ? شدÙ? تÙ?سط Tor</string>
-  <string name="btn_save_settings">ذخÛ?رÙ? تÙ?ظÛ?Ù?ات</string>
-  <string name="no_internet_connection_tor">ارتباط اÛ?Ù?ترÙ?تÛ? Ù?جÙ?د Ù?دارد; تÙ?ر Ø¢Ù?ادÙ? کار است... </string>
-  <string name="bandwidth_">Ù¾Ù?Ù?اÛ? باÙ?د:</string>
-  <string name="down">پائÛ?Ù?</string>
-  <string name="up">باÙ?ا</string>
-  <string name="pref_disable_network_title">خاÙ?Ù?Ø´ کردÙ? در صÙ?رت عدÙ? Ù?جÙ?د شبکÙ?</string>
-  <string name="pref_disable_network_summary">در صÙ?رتÛ? Ú©Ù? شبکÙ? Ù?جÙ?د Ù?داشتÙ? باشد خاÙ?Ù?Ø´ Ø´Ù?د</string>
-  <string name="newnym">Ø´Ù?ا بÙ? Ø´Ù?اسÙ? جدÛ?د تÙ?ر Ù?Ù?تÙ?Ù? شدÛ?د</string>
-  <string name="menu_verify_browser">Ù?رÙ?رگر</string>
-  <string name="menu_use_chatsecure">استÙ?ادÙ? از ChatSecure</string>
-  <string name="permission_manage_tor_label">Ù?دÛ?رÛ?ت تÙ?ر</string>
-  <string name="permission_manage_tor_description">اÛ?Ù? برÙ?اÙ?Ù? بتÙ?اÙ?د سرÙ?Û?س تÙ?ر را Ù?دÛ?رÛ?ت Ú©Ù?د</string>
-  <string name="install_apps_">برÙ?اÙ?Ù? Ù?صب Ø´Ù?دØ?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">ارتباط شبکÙ? اÛ? Ù?جÙ?د Ù?دارد. تÙ?ر بÙ? حاÙ?ت Ø®Ù?اب Ù?Û? رÙ?د</string>
+    <string name="no_internet_connection_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_">ارتباط شبکÙ? اÛ? Ø®Ù?ب است. تÙ?ر را بÛ?دار Ù?Ù?اÛ?Û?د...</string>
   <string name="updating_settings_in_tor_service">بÙ? رÙ?ز رساÙ?Û? تÙ?ظÛ?Ù?ات در سرÙ?Û?س Tor</string>
-  <string name="pref_socks_title">Tor SOCKS</string>
-  <string name="pref_socks_summary">Ù¾Ù?رتÛ? Ú©Ù? تÙ?ر ارائÙ? Ù?Û? دÙ?د SOCKS proxy رÙ?Û? (Ù¾Û?Ø´ Ù?رض: 9050 Û?ا 0 براÛ? غÛ?رÙ?عاÙ? کردÙ?)</string>
-  <string name="pref_socks_dialog">Ù¾Û?کربÙ?دÛ? Ù¾Ù?رت SOCKS</string>
-  <string name="pref_transport_title">Tor TransProxy Port</string>
-  <string name="pref_transport_summary">Ù¾Ù?رتÛ? Ú©Ù? تÙ?ر ارائÙ? Ù?Û? دÙ?د Transparent Proxy رÙ?Û? (Ù¾Û?Ø´ Ù?رض:  9040 Û?ا  0 براÛ? غÛ?رÙ?عاÙ? کردÙ?)</string>
-  <string name="pref_transport_dialog">Ù¾Û?کربÙ?دÛ? Ù¾Ù?رت Transproxy</string>
-  <string name="pref_dnsport_title">Ù¾Ù?رت Tor DNS</string>
-  <string name="pref_dnsport_summary">Ù¾Ù?رتÛ? Ú©Ù? Tor ارائÙ? Ù?Û? دÙ?د Ø¢Ù? DNS رÙ?Û? (بÙ? Ø·Ù?ر Ù¾Û?Ø´ Ù?رض: 5400 Û?ا 0 براÛ? غÛ?ر Ù?عاÙ? کردÙ?)</string>
-  <string name="pref_dnsport_dialog">Ù¾Û?کربÙ?دÛ? Ù¾Ù?رت DNS</string>
-  <string name="pref_torrc_title">Ù¾Û?کربÙ?دÛ? سÙ?ارشÛ? Torrc</string>
-  <string name="pref_torrc_summary">Ù?Ù?Ø· Ù?تخصصاÙ?:  enter direct torrc config lines</string>
-  <string name="pref_torrc_dialog">سÙ?ارشÛ? Torrc</string>
-  <string name="wizard_tips_martus">Ù?Ù?باÛ?Ù? Ù?ارتÙ?س -  Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">IP Ù?اÛ? عÙ?Ù?Ù?Û? Tor Ø´Ù?ا:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ù?Ø·Ù?ا اÛ?Ù? برÙ?اÙ?Ù? را در Ø¢Ù?درÙ?Û?د از کار بÛ?Ù?دازÛ?د  Android-&gt;Settings-&gt;Apps اگر Ù?Ø´Ú©Ù?Û? با اربت دارÛ?د:  </string>
-  <string name="app_conflict">تعارض برÙ?اÙ?Ù?</string>
-  <string name="pref_transproxy_refresh_title">Ø®Ù?دکار تازÙ? کردÙ? Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">درخÙ?است Ù?جدÛ?د براÛ? Ù?Ù?اÙ?Û?Ù? Transproxy  Ù?Ù?تÛ? Ù?ضعÛ?ت شبکÙ? تغÛ?Û?ر کرد</string>
-  <string name="pref_transproxy_flush_title">حذÙ? اجبارÛ? Transproxy</string>
-  <string name="pref_transproxy_flush_summary">اÛ?Ù?جا را Ù?شار دÙ?Û?د براÛ? برÙ?Ù? رÛ?ختÙ? تÙ?اÙ? Ù?Ù?اÙ?Û?Ù?  transproxy</string>
-  <string name="transparent_proxy_rules_flushed_">Ù?Ù?اÙ?Û?Ù? Transparent proxy  برÙ?Ù? رÛ?ختÙ? شد! </string>
-  <string name="you_do_not_have_root_access_enabled">Ø´Ù?ا دسترسÛ? رÙ?ت را Ù?عاÙ? Ù?کردÛ?د. </string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_"> براÛ? اعÙ?اÙ? تÙ?ظÛ?Ù?ات جدÛ?د باÛ?د اÙ?ربات را خاÙ?Ù?Ø´ Ù? رÙ?Ø´Ù? Ú©Ù?Û?د.</string>
-  <string name="menu_vpn">Ù?Û? Ù¾Û? اÙ?</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridges بÙ? رÙ?ز شدÙ?د</string>
-  <string name="restart_orbot_to_use_this_bridge_">براÛ? Ù?عاÙ? کردÙ? تغÛ?Û?رات Ù?Ø·Ù?ا Orbot را راÙ? اÙ?دازÛ? Ù?جدد Ú©Ù?Û?د</string>
-  <string name="menu_qr">کدÙ?اÛ? QR</string>
-  <string name="bridge_mode">حاÙ?ت Bridges</string>
-  <string name="get_bridges_email">اÛ?Ù?Û?Ù?</string>
-  <string name="get_bridges_web">Ù?ب</string>
-  <string name="activate">Ù?عاÙ?</string>
-  <string name="apps_mode">حاÙ?ت Ù?رÙ? اÙ?زار VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">با استÙ?ادÙ? از اÙ?کاÙ? Ù?Û? Ù¾Û? اÙ? اÙ?درÙ?Û?د٬ اÙ?ربات تراÙ?Û?Ú© تÙ?اÙ? اپÙ?Û?Ú©Û?Ø´Ù? Ù?اÛ? Ù?Ù?باÛ?Ù? Ø´Ù?ا را از طرÛ?Ù? شبکÙ? تÙ?ر اÙ?تÙ?اÙ? Ù?Û?دÙ?د. 
-\n\n*Ù?شدار* 
-اÙ?کاÙ? تÙ?Ù?Ù? تÙ?اÙ? Ú¯Ù?Ø´Û? Ù?Ù?Ù?ز جدÛ?د Ù? در حاÙ? آزÙ?اÛ?Ø´ است. بÙ? Ù?Ù?Û?Ù? دÙ?Û?Ù? اÙ?کاÙ? دارد Ú©Ù? بÙ? صÙ?رت Ø®Ù?دکار Ù?عاÙ? Ù?Ø´Ù?د Û?ا Ù?Ù?گاÙ? استÙ?ادÙ? Ù?طع Ø´Ù?د. از اÛ?Ù? اÙ?کاÙ? براÛ? Ù?اشÙ?اس بÙ?دÙ? در Ù?ب Ù?رگز Ù?باÛ?د استÙ?ادÙ? Ú©Ù?Û?د Ù? باÛ?د Ù?Ù?Ø· از Ø¢Ù? براÛ? عبÙ?ر از Ù?اÛ?رÙ?اÙ? Ù?ا Ù? دÙ?ر زدÙ? Ù?Û?Ù?ترÛ?Ù?Ú¯ استÙ?ادÙ? Ø´Ù?د.</string>
-  <string name="send_email">اÛ?Ù?Û?Ù? بÙ?رست</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ù?Û? تÙ?اÙ?Û?د آدرس  bridge  را از طرÛ?Ù? اÛ?Ù?Û?Ù?Ù¬ Ù?ب Û?ا با اسکÙ? کردÙ?  bridge QR code بدست Ø¢Ù?رÛ?د. اÛ?Ù?Û?Ù? Û?ا Ù?ب پاÛ?Û?Ù? را براÛ? درخÙ?است آدرس bridge اÙ?تخاب Ú©Ù?Û?د.\n\n Ù?Ù?تÛ? آدرس را دارÛ?د Ø¢Ù? را Ú©Ù¾Û? Ú©Ù?Û?د Ù? برگرداÙ?Û?د در  اÙ?Ù?Ù?Û?ت Ù?اÛ?  Bridges در تÙ?ظÛ?Ù?ات اربت Ù? Ø¢Ù? را دÙ?بارÙ? راÙ? اÙ?دازÛ? Ú©Ù?Û?د.</string>
-  <string name="install_orweb">Ù?صب Orfox</string>
-  <string name="standard_browser">Ù?رÙ?رگر استاÙ?دارد</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ù?کتÙ?:  Tor bridges استاÙ?دارد Ù?Ù?Ø· بر رÙ?Û? دستگاÙ? Ù?اÛ? Intel X86/ATOM  کار Ù?Û? Ú©Ù?د</string>
-  <string name="vpn_default_world">جÙ?اÙ?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fi/strings.xml b/orbotservice/src/main/res/values-fi/strings.xml
index 2616f723..980cb85a 100644
--- a/orbotservice/src/main/res/values-fi/strings.xml
+++ b/orbotservice/src/main/res/values-fi/strings.xml
@@ -2,277 +2,29 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot on ilmainen välityspalvelinsovellus, joka tarjoaa muille sovelluksille mahdollisuuden käyttää internetiä turvallisemmin. Orbot käyttää Toria kryptaamaan verkkoliikenteesi ja sitten piilottaa sen kierrättämällä sitä usean tietokoneen kautta ympäri maailman. Tor on vapaa ohjelmisto ja avoin verkosto, jotka auttavat puolustautumaan vapautta ja yksityisyyttä uhkaavalta verkkovalvonnalta ja valtioiden verkonseurannalta sekä suojaamaan salaisia liiketoimintoja ja -yhteyksiä.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">käynnistä ja pysäytä Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot käynnistyy...</string>
+    <string name="status_starting_up">Orbot käynnistyy...</string>
   <string name="status_activated">Yhdistetty Tor-verkkoon</string>
   <string name="status_disabled">Orbot on poistettu käytöstä</string>
   <string name="tor_process_starting">Käynnistetään Tor-ohjelmaa...</string>
   <string name="tor_process_complete">valmis.</string>
-  <string name="tor_process_waiting">odottaa.</string>
-  <string name="not_anonymous_yet">VAROITUS: Verkkoliikenteesi ei ole vielä anonyymiä! Määritä ohjelmasi käyttämään HTTP-välityspalvelinta 127.0.0.1:8118 tai SOCKS4A- tai SOCKS5-välityspalvelinta 127.0.0.1:9050</string>
-  <string name="menu_home">Alkuun</string>
-  <string name="menu_browse">Selaa</string>
-  <string name="menu_settings">Asetukset</string>
-  <string name="menu_log">Loki</string>
-  <string name="menu_info">Ohje</string>
-  <string name="menu_start">Aloita</string>
-  <string name="menu_stop">Lopeta</string>
-  <string name="menu_about">Tietoa</string>
-  <string name="main_layout_download">Lataa</string>
-  <string name="main_layout_upload">Lähetä</string>
-  <string name="button_help">Apua</string>
-  <string name="button_close">Sulje</string>
-  <string name="button_about">Tietoa</string>
-  <string name="button_clear_log">Tyhjennä loki</string>
-  <string name="menu_verify">Tarkista</string>
-  <string name="menu_exit">Lopeta</string>
-  <string name="menu_scan">Skannaa sillan QR-koodi</string>
-  <string name="menu_share_bridge">Jaa sillan QR-koodi</string>
-  <string name="press_to_start">- paina pitkään käynnistääksesi -</string>
-  <string name="pref_trans_proxy_group">Läpinäkyvä välityspalvelimen käyttö (vaatii roottauksen)</string>
-  <string name="pref_trans_proxy_title">Läpinäkyvä välityspalvelimen käyttö</string>
-  <string name="pref_trans_proxy_summary">Ohjelmien automaattinen Torimointi</string>
-  <string name="pref_transparent_all_title">Torraa kaikki</string>
-  <string name="pref_transparent_all_summary">Välitä kaikki ohjelmien liikenne Torin läpi</string>
-  <string name="pref_transparent_port_fallback_title">Välityspalvelinportin varoasetus</string>
-  <string name="pref_transparent_port_fallback_summary">VAROITUS: Kiertää yleisiä portteja (80, 443, jne). *K�YT� VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
-  <string name="pref_transparent_port_title">Porttilista</string>
-  <string name="pref_transparent_port_summary">Välityspalvelimen kautta vietävien porttien lista. *K�YT� VAIN* jos \"Kaikki\" tai \"Sovellus\" -tila ei toimi.</string>
-  <string name="pref_transparent_port_dialog">Kirjoita portit, jotka viedään välityspalvelimen kautta</string>
-  <string name="pref_has_root">Pyydä root-tason oikeuksia</string>
-  <string name="pref_has_root_summary">Pyydä root-tason oikeuksia läpinäkyvään tiedonvälitykseen</string>
-  <string name="status_install_success">Tor-binääritiedostojen asennus onnistui!</string>
-  <string name="status_install_fail">Tor-binääritiedostojen asennus epäonnistui. Tarkista loki ja ilmoita asiasta osoitteeseen tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Sovellusvirhe</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tietoja Orbotista</string>
-  <string name="btn_next">Seuraava</string>
-  <string name="btn_back">Takaisin</string>
-  <string name="btn_finish">Lopeta</string>
-  <string name="btn_okay">Selvä</string>
-  <string name="btn_cancel">Peruuta</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Joitakin Orbotin yksityiskohtia</string>
-  <string name="wizard_details_msg">Orbot on avoimen lähdekoodin sovellus, joka sisältää Torin, LibEventin ja Polipon. Se tarjoaa paikallisen HTTP-välityspalvelimen (8118) ja SOCKS-välityspalvelimen (9050) Tor-verkkoon. Rootatulla laitteella Orbot kykenee myös reitittämään kaiken verkkoliikenteen Torin läpi.</string>
-  <string name="wizard_permissions_root">Lupa myönnetty</string>
-  <string name="wizard_permissions_stock">Orbot-oikeudet</string>
-  <string name="wizard_premissions_msg_root">Loistavaa! Olemme havainneet että olet antanut root-tason oikeudet Orbotille. Käytämme näiden oikeuksien suomia mahdollisuuksia harkiten.</string>
-  <string name="wizard_permissions_msg_stock">Vaikka root-tason oikeuksien antaminen Orbotille ei ole pakollista, tulee Orbotista tehokkaampi työkalu jos laitteellasi on root-tason oikeudet. Käytä alla olevaa painiketta antaaksesi Orbotille supervoimat!</string>
-  <string name="wizard_permissions_no_root">Jos sinulla ei ole root-tason oikeuksia tai et tiedä, mitä tarkoitamme, käytä vain Orbotille suunniteltuja ohjelmia.</string>
-  <string name="wizard_permissions_consent">Ymmärrän ja haluan jatkaa ilman Superuser-tason oikeuksia</string>
-  <string name="wizard_permission_enable_root">Anna root-tason oikeudet Orbotille</string>
-  <string name="wizard_configure">Konfiguroi Torimointi</string>
-  <string name="wizard_configure_msg">Orbot mahdollistaa kaiken sovellusliikenteen reitittämisen Tor-sovelluksen kautta TAI valita sovelluksesi yksilöllisesti.</string>
-  <string name="wizard_configure_all">Välitä kaikkien sovellusten tiedonsiirto Tor-verkon kautta</string>
-  <string name="wizard_configure_select_apps">Valitse Tor-verkkoa käyttävät sovellukset</string>
-  <string name="wizard_tips_tricks">Orbotia käyttävät sovellukset</string>
-  <string name="wizard_tips_msg">Alempana näkyvät sovellukset on suunniteltu toimimaan Orbotin kanssa. Paina jokaista nappia, jos haluat asentaa ne nyt. Voit myös löytää ne myöhemmin Googlen Play-kaupasta, GuardianProject.info:n nettisivulta tai F-Droid.org:in kautta.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Turvallinen pikaviestisovellus Androidille</string>
-  <string name="wizard_tips_proxy">Välityspalvelinasetukset - Opi konfiguroimaan sovellukset toimimaan Orbotin kanssa</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo-hakukonesovellus</string>
-  <string name="wizard_tips_twitter">Aseta Twitter-välityspalvelinisännäksi \"localhost\" ja portiksi 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Tee tarina ja jätä se torin turvallisuuteen!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Välityspalvelinasetukset</string>
-  <string name="wizard_proxy_help_msg">Jos käyttämäsi Android-sovellus tukee HTTP- tai SOCKS-välityspalvelimen käyttöä, voit määrittää sen yhdistämään Orbotiin ja käyttämään Toria.\n\n\n Isäntänimi on 127.0.0.1 tai \"localhost\". HTTP-portti on 8118. SOCKS-portti on 9050. SOCKS4A- tai SOCKS5-protokollia tulisi käyttää, mikäli mahdollista.\n \n\n\n Voit lukea lisää välityspalvelinten käytöstä Androidilla usein kysytyistä kysymyksistä osoitteessa: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot on valmis!</string>
-  <string name="wizard_final_msg">Miljoonat ihmiset ympäri maailman käyttävät Toria eri syistä.\n\nJornalistit ja bloggaajat, ihmisoikeuksien puolustajat, poliisit, sotilaat, yritykset, sorrettujen valtioiden kansalaiset, ja tavalliset kansalaiset... ja nyt sinäkin olet valmis siihen!</string>
-  <string name="wizard_exit_at_first_screen_toast">Määritä Orbot ennen kuin alat käyttää sitä!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Tämä avaa selaimesi osoitteeseen https://check.torproject.org nähdäkseen, onko Orbot varmaan konfiguroitu ja onko sinut yhdistetty Tor-sovellukseen.</string>
-  <string name="pref_hs_group">Piilopalvelun isännöinti</string>
-  <string name="pref_general_group">Yleiset</string>
-  <string name="pref_start_boot_title">Aloita Orbot käynnistettäessä</string>
-  <string name="pref_start_boot_summary">Käynnistä Orbot ja yhdistä Toriin automaattisesti, kun Anroid-laitteesi käynnistyy</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot tuo Torin Androidille!\n\nTor auttaa sinua suojautumaan sisältösuodattimilta sekä verkkoliikenteen seurannalta ja valvonnalta, jotka uhkaavat yksityisyyttä, salaista tietoa ja henkilökohtaisia suhteita.\n\nTämä velho auttaa sinua määrittämään Orbotin ja Torin laitteellasi.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Varoitus</string>
-  <string name="wizard_warning_msg">Pelkkä Orbotin asentaminen ei automaattisesti tee verkkoliikenteestäsi anonyymiä. Sinun täytyy määrittää Orbot kunnolla, jotta laitteesi ja muut sovellukset käyttävät Toria onnistuneesti.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Käyttöoikeudet</string>
-  <string name="wizard_permissions_root_msg1">Voit antaa Orbotille Superuser-oikeudet mahdollistaaksesi joitakin lisäominaisuuksia, kuten läpinäkyvän tiedonvälityksen.</string>
-  <string name="wizard_permissions_root_msg2">Jos et halua tehdä tätä, varmista, että käytät Orbotin kanssa toimivaksi suunniteltuja sovelluksia.</string>
-  <string name="wizard_permissions_no_root_msg">Laitteesi ei vaikuta olevan rootattu tai tarjoavan root- tai \'Superuser\'-oikeuksia.\n\nKokeile \'Sovellukset\'-tilaa päänäytöltä.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotia käyttävät sovellukset</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Turvallinen chattailusovellus Off-the-Record -salauksella</string>
-  <string name="wizard_tips_play">Löydä kaikki Guardian-projektin sovellukset Googlen Play-kaupasta</string>
-  <string name="wizard_tips_fdroid">Löydä kaikki Guardian Projectin sovellukset F-Droidista</string>
-  <string name="wizard_tips_fdroid_org">Löydä kaikki Guardian Projectin sovellukset osoitteesta https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Läpinäkyvä tiedonvälitys</string>
-  <string name="wizard_transproxy_msg">Tämä sallii sovellustesi tietoliikenteen menemisen automaattisesti Torin läpi</string>
-  <string name="wizard_transproxy_hint">(Rastita tämä ruutu, jos et tiedä, mitä tarkoitamme)</string>
-  <string name="wizard_transproxy_none">Ei mikään</string>
-  <string name="pref_transparent_tethering_title">Tor-välityspalvelimena oleminen</string>
-  <string name="pref_transparent_tethering_summary">Salli Torin läpinäkyvä tiedonvälitys Wi-Fille ja USB-välityspalvelimena oleville laitteille (vaatii uudelleenkäynnistyksen)</string>
-  <string name="button_grant_superuser">Pyydä Superuser-oikeuksia</string>
-  <string name="pref_select_apps">Valitse sovellukset</string>
-  <string name="pref_select_apps_summary">Valitse Torin läpi reititettävät sovellukset</string>
-  <string name="pref_node_configuration">Tor-solmukohdan konfigurointi</string>
-  <string name="pref_node_configuration_summary">Nämä ovat lisäasetuksia, jotka voivat vähentää anonyymiyttäsi</string>
-  <string name="pref_entrance_node">Tor-sisääntulosolmu</string>
-  <string name="pref_entrance_node_summary">Sormenjäljet, lovet, maat ja osoitteet ensimmäiseen hyppyyn</string>
-  <string name="pref_entrance_node_dialog">Kirjoita sisääntulosolmujen nimet</string>
-  <string name="button_proxy_all">Välitä kaikki</string>
-  <string name="button_proxy_none">�lä välitä mitään</string>
-  <string name="button_invert_selection">Käännä valinta</string>
-  <string name="pref_proxy_title">Lähtevän liikenteen välityspalvelin (valinnainen)</string>
-  <string name="pref_proxy_type_title">Lähtevän liikenteen välityspalvelimen tyyppi</string>
-  <string name="pref_proxy_type_summary">Välityspalvelimen protokolla: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Kirjoita välityspalvelintyyppi</string>
-  <string name="pref_proxy_host_title">Ulosmenovälityspalvelimen isäntä</string>
-  <string name="pref_proxy_host_summary">Välityspalvelimen verkko-osoite</string>
-  <string name="pref_proxy_host_dialog">Kirjoita välityspalvelimen isäntä</string>
-  <string name="pref_proxy_port_title">Ulosmenovälityspalvelimen portti</string>
-  <string name="pref_proxy_port_summary">Välityspalvelimen portti</string>
-  <string name="pref_proxy_port_dialog">Kirjoita välityspalvelimen portti</string>
-  <string name="pref_proxy_username_title">Ulosmenovälityspalvelimen käyttäjänimi</string>
-  <string name="pref_proxy_username_summary">Välityspalvelimen käyttäjätunnus (valinnainen)</string>
-  <string name="pref_proxy_username_dialog">Kirjoita välityspalvelimen käyttäjätunnus</string>
-  <string name="pref_proxy_password_title">Ulosmenovälityspalvelimen salasana</string>
-  <string name="pref_proxy_password_summary">Välityspalvelimen salasana (valinnainen)</string>
-  <string name="pref_proxy_password_dialog">Kirjoita välityspalvelimen salasana</string>
-  <string name="status">Tila</string>
-  <string name="setting_up_full_transparent_proxying_">Täyttä läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Sovelluspohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
-  <string name="transparent_proxying_enabled">Läpinäkyvä tiedonvälitys SALLITTU</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy on otettu käyttöön Tor-välityspalvelimimena olemista varten!</string>
-  <string name="warning_error_starting_transparent_proxying_">VAROITUS: virhe aloittaessa läpinäkyvää tiedonvälitystä!</string>
-  <string name="transproxy_rules_cleared">TransProxyn säännöt tyhjennetty</string>
-  <string name="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</string>
-  <string name="privoxy_is_running_on_port_">Polipo on käynnissä portissa:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Porttipohjaista läpinäkyvää tiedonvälitystä otetaan käyttöön...</string>
-  <string name="bridge_error">Siltavirhe</string>
-  <string name="bridge_requires_ip">Jos haluat käyttää siltaominaisuutta, kirjoita vähintään yhden sillan IP-osoite.</string>
-  <string name="send_email_for_bridges">Lähetä sähköpostia osoitteeseen bridges@xxxxxxxxxxxxxx gmail-osoitteesta siten, että viestin ainoa rivi on \"get bridges\".</string>
-  <string name="error">Virhe</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">ReachableAccess-asetuksesi aiheuttivat virheen!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor-prosessin käynnistäminen epäonnistui:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">ReachableAccess-asetuksesi aiheuttivat virheen!</string>
   <string name="your_relay_settings_caused_an_exception_">Releasetuksesi aiheuttivat virheen!</string>
-  <string name="exit_nodes">Päätesolmut</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Sormenjäljet, lovet, maat ja osoitteet viimeiselle hypylle</string>
-  <string name="enter_exit_nodes">Kirjoita päätesolmut</string>
-  <string name="exclude_nodes">Vältä solmuja</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Vältettävät sormenjäljet, lovet, maat ja osoitteet</string>
-  <string name="enter_exclude_nodes">Kirjoita vältettävät solmut</string>
-  <string name="strict_nodes">Tarkat solmukohdat</string>
-  <string name="use_only_these_specified_nodes">Käytä *vain* näitä solmuja</string>
-  <string name="bridges">Sillat</string>
-  <string name="use_bridges">Käytä siltoja</string>
-  <string name="bridges_obfuscated">Hämärät sillat</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Salli vaihtoehtoiset sisääntulosolmut Tor-verkkoon</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Salli hämärien siltojen konfigurointi</string>
-  <string name="ip_address_and_port_of_bridges">Siltojen IP-osoitteet ja portit</string>
-  <string name="enter_bridge_addresses">Kirjoita siltaosoitteet</string>
-  <string name="relays">Releet</string>
-  <string name="relaying">Releytys</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Salli laitteen käyttö välireleenä</string>
-  <string name="relay_port">Releportti</string>
-  <string name="listening_port_for_your_tor_relay">Tor-releesi kuunteluportti</string>
-  <string name="enter_or_port">Kirjoita OR-portti</string>
-  <string name="relay_nickname">Releen kutsumanimi</string>
-  <string name="the_nickname_for_your_tor_relay">Kutsumanimi Tor-releellesi</string>
-  <string name="enter_a_custom_relay_nickname">Kirjoita mukautettu relenimi</string>
-  <string name="reachable_addresses">Saavutettavissa olevat osoitteet</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Aja asiakkaana rajoitetun palomuurin takaa</string>
-  <string name="reachable_ports">Saavutettavissa olevat portit</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Rajoitetun palomuurin takaa saavutettavat portit</string>
-  <string name="enter_ports">Kirjoita portit</string>
-  <string name="enable_hidden_services">Piilopalvelun isännöinti</string>
-  <string name="run_servers_accessible_via_the_tor_network">salli laitteensisäisen palvelimen käyttö osana Tor-verkkoa</string>
-  <string name="enter_localhost_ports_for_hidden_services">kirjoita sisäiset portit piilopalveluille</string>
-  <string name="hidden_service_ports">Piilopalveluiden portit</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">piilopalvelusi nimiosoite (luodaan automaattisesti)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">salli virheenjäljityslokin tulo tulostevirtaan (käytä adb:tä tai aLogCat:ia tarkastellaksesi)</string>
-  <string name="project_home">Projektin kotisivu(t):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor-lisenssi</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3:n osapuolen ohjelmisto:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Sovellus haluaa avata piilopalveluportin %S Tor-verkkoon. Tämä on turvallista, jos luotat sovellukseen.</string>
-  <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
+    <string name="found_existing_tor_process">löytyi olemassaoleva Tor-prosessi...</string>
   <string name="something_bad_happened">Jotain pahaa tapahtui. Tarkista loki</string>
-  <string name="hidden_service_on">piilopalvelun sijainti:</string>
-  <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
+    <string name="unable_to_read_hidden_service_name">piilopalvelunimen lukeminen epäonnistui</string>
   <string name="unable_to_start_tor">Torin käynnistys epäonnistui:</string>
-  <string name="unable_to_reset_tor">Toria ei voitu nollata, käynnistä laitteesi uudelleen!</string>
-  <string name="pref_use_sys_iptables_title">Käytä Ip-oletustauluja</string>
-  <string name="pref_use_sys_iptables_summary">käytä sisäänrakennettua Ip-taulubinääriä Orbotin mukana tulleen sijasta</string>
-  <string name="error_installing_binares">Tor-binääritiedostojen asentaminen tai päivitys epäonnistui.</string>
-  <string name="pref_use_persistent_notifications">Pidä kuvake aina työkalupalkissa, kun Orbot on yhdistetty</string>
-  <string name="pref_use_persistent_notifications_title">Ilmoitukset aina käytössä</string>
-  <string name="pref_use_expanded_notifications">Näytä laajennettu ilmoitus (Torin ulostulon maa ja IP)</string>
-  <string name="pref_use_expanded_notifications_title">Laajennetut ilmoitukset</string>
-  <string name="notification_using_bridges">Sillat käytössä!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Kieli</string>
-  <string name="set_locale_summary">Valitse maa-asetus ja kieli Orbit-sovellukselle</string>
-  <string name="wizard_locale_title">Valitse kieli</string>
-  <string name="wizard_locale_msg">Jätä oletusarvoon tai vaihda nykyiseen kieleen</string>
-  <string name="powered_by">perustuu Toriin</string>
-  <string name="btn_save_settings">Tallenna asetukset</string>
-  <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</string>
-  <string name="bandwidth_">Kaistanleveys:</string>
-  <string name="down">alas</string>
-  <string name="up">ylös</string>
-  <string name="pref_disable_network_title">Ei verkon automaattilepotilaa</string>
-  <string name="pref_disable_network_summary">Laita Tor nukkumaan, kun internet-yhteyttä ei ole saatavilla</string>
-  <string name="newnym">Vaihdoit Tor-identiteettisi uuteen!</string>
-  <string name="menu_use_chatsecure">Käytä ChatSecurea</string>
-  <string name="permission_manage_tor_label">Hallinnoi Toria</string>
-  <string name="permission_manage_tor_description">Anna tämän sovelluksen ohjata Tor-palvelua</string>
-  <string name="install_apps_">Asennetaanko sovelluksia?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ei verkkoyhteyttä. Tor siirtyy valmiustilaan...</string>
+    <string name="no_internet_connection_tor">Ei internet-yhteyttä; Tor on valmiustilassa...</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-proxy on (oletus: 9050, 0 = poista käytöstä)</string>
-  <string name="pref_socks_dialog">SOCKS-portin valinta</string>
-  <string name="pref_transport_title">Tor TransProxyn portti</string>
-  <string name="pref_transport_summary">Portti, jossa Torin läpinäkyvä välityspalvelin on (oletus: 9040, 0 = poista käytöstä)</string>
-  <string name="pref_transport_dialog">TransProxy-portin valinta</string>
-  <string name="pref_dnsport_title">Tor DNS-portti</string>
-  <string name="pref_dnsport_summary">Portti, jossa Torin DNS on (oletus: 5400, 0 = poista käytöstä)</string>
-  <string name="pref_dnsport_dialog">DNS-portin valinta</string>
-  <string name="pref_torrc_title">Torrc:n mukautetut asetukset</string>
-  <string name="pref_torrc_summary">VAIN ASIANTUNTIJAT: syötä torrc:n määritysrivejä suoraan</string>
-  <string name="pref_torrc_dialog">Mukautettu torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetechin ihmisoikeuksien dokumentaatiosovellus</string>
-  <string name="your_tor_public_ips_">Julkiset Tor-IP:si:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Poista tämä sovellus käytöstä kohdassa Android-&gt;Asetukset-&gt;Sovellukset, jos Orbotin kanssa on ongelmia:</string>
-  <string name="app_conflict">Sovellusristiriita</string>
-  <string name="pref_transproxy_refresh_title">Transproxyn automaattinen päivitys</string>
-  <string name="pref_transproxy_refresh_summary">Uudista Transproxy-säännöt, kun verkon tila muuttuu</string>
-  <string name="pref_transproxy_flush_title">Transproxyn PAKOTETTU POISTO</string>
-  <string name="pref_transproxy_flush_summary">Kosketa tätä tyhjentääksesi transproxyn verkkosäännöt V�LITT�M�STI</string>
-  <string name="transparent_proxy_rules_flushed_">Läpinäkyvän välityspalvelimen säännöt tyhjennetty!</string>
-  <string name="you_do_not_have_root_access_enabled">Sinulla ei ole ROOT-oikeuksia käytössä</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Saatat joutua pysäyttämään ja käynnistämään Orbotin, jotta asetusten muutos tulee käyttöön</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">Mbps</string>
-  <string name="kb">kt</string>
-  <string name="mb">Mt</string>
-  <string name="bridges_updated">Sillat päivitetty</string>
-  <string name="restart_orbot_to_use_this_bridge_">Käynnistä Orbot uudelleen ottaaksesi muutokset käyttöön</string>
-  <string name="menu_qr">QR-koodit</string>
-  <string name="bridge_mode">Siltatila</string>
-  <string name="get_bridges_email">Sähköposti</string>
-  <string name="get_bridges_web">Verkkosivu</string>
-  <string name="activate">Ota käyttöön</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Voit siirtää kaikki sovellukset laitteellasi kulkemaan Tor-verkon kautta Androidin VPN-toiminnolla.\n\n*VAROITUS* Tämä on uusi, kokeellinen ominaisuus, joka ei välttämättä käynnisty automaattisesti tai voi pysähtyä. Sitä EI pitäisi käyttää anonymiyteen, AINOASTAAN palomuurien ja suodatinten ohittamiseen.</string>
-  <string name="send_email">Lähetä sähköpostia</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Voit saada sillan osoitteen sähköpostin kautta, verkkosivulta tai skannaamalla sillan QR-koodin. Valitse \'Sähköposti\' tai \'Verkkosivu\' alta pyytääksesi sillan osoitetta.\n\nKun sinulla on osoite, kopioi &amp; liitä se \"Sillat\" -kohtaan Orbotin asetuksissa ja käynnistä uudelleen.</string>
-  <string name="standard_browser">Normaali selain</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">HUOMAA: Vain standardit Tor-sillat toimivat Intel X86/ATOM -laitteilla.</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fr-rFR/strings.xml b/orbotservice/src/main/res/values-fr-rFR/strings.xml
index 3a11d068..30ad587f 100644
--- a/orbotservice/src/main/res/values-fr-rFR/strings.xml
+++ b/orbotservice/src/main/res/values-fr-rFR/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot est une appli libre de serveur mandataire permettant aux applis d\'utiliser Internet avec une sécurité accrue. Orbot utilise Tor pour chiffrer votre trafic Internet et le cache ensuite en le relayant au travers d\'ordinateurs de par le monde. Tor est un logiciel libre et un réseau ouvert qui vous aide à vous défendre contre une forme de surveillance réseau qui menace la liberté personnelle et la protection des données personnelles, les activités professionnelles confidentielles et les relations, et l\'analyse du trafic des gouvernements.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">démarrer et arrêter Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot démarre...</string>
+    <string name="status_starting_up">Orbot démarre...</string>
   <string name="status_activated">Connecté au réseau Tor</string>
   <string name="status_disabled">Orbot est désactivé</string>
   <string name="status_shutting_down">TorService est en cours d\'extinction</string>
   <string name="tor_process_starting">Démarrage du client Tor...</string>
   <string name="tor_process_complete">terminé.</string>
-  <string name="tor_process_waiting">attente.</string>
-  <string name="not_anonymous_yet">AVERTISSEMENT : votre trafic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le serveur mandataire HTTP 127.0.0.1:8118 ou le serveur mandataire SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string>
-  <string name="menu_home">Accueil</string>
-  <string name="menu_browse">Parcourir</string>
-  <string name="menu_settings">Paramètres</string>
-  <string name="menu_log">Journal</string>
-  <string name="menu_info">Aide</string>
-  <string name="menu_apps">RPV</string>
-  <string name="menu_start">Démarrer</string>
-  <string name="menu_stop">Arrêter</string>
-  <string name="menu_about">Ã? propos</string>
-  <string name="menu_promo_apps">Obtenir des applis...</string>
-  <string name="main_layout_download">Télchargement</string>
-  <string name="main_layout_upload">Téléversement</string>
-  <string name="button_help">Aide</string>
-  <string name="button_close">Fermer</string>
-  <string name="button_about">Ã? propos</string>
-  <string name="button_clear_log">Effacer le journal</string>
-  <string name="menu_verify">Vérifier</string>
-  <string name="menu_exit">Quitter</string>
-  <string name="menu_scan">Balayer un code QR de pont</string>
-  <string name="menu_share_bridge">Partager un code QR de pont</string>
-  <string name="press_to_start">- appuyer longuement pour démarrer -</string>
-  <string name="pref_trans_proxy_group">Relayage transparent (root exigé)</string>
-  <string name="pref_trans_proxy_title">Relayage transparent</string>
-  <string name="pref_trans_proxy_summary">Torifaction automatique des applis</string>
-  <string name="pref_transparent_all_title">Tout passer par Tor</string>
-  <string name="pref_transparent_all_summary">Relayer le trafic de toutes les applis par Tor</string>
-  <string name="pref_transparent_port_fallback_title">Repli pour le relais de port</string>
-  <string name="pref_transparent_port_fallback_summary">AVERTISSEMENT : contourne les ports habituels (80, 443, etc). *� N\'UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
-  <string name="pref_transparent_port_title">Liste des ports</string>
-  <string name="pref_transparent_port_summary">Liste des ports à relayer. *� N\'UTILISER QUE* si les modes « Tout » ou « Appli » ne fonctionnent pas.</string>
-  <string name="pref_transparent_port_dialog">Saisir les ports à relayer</string>
-  <string name="pref_has_root">Demander l\'accès Root</string>
-  <string name="pref_has_root_summary">Demander l\'accès Root pour un relayage transparent</string>
-  <string name="status_install_success">L\'exécutable de Tor a été installé avec succès !</string>
-  <string name="status_install_fail">Le fichier exécutable de Tor n\'a pu pas être installé. Veuillez vérifier le journal et le signaler à tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erreur d\'application</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ã? propos d\'Orbot</string>
-  <string name="btn_next">Suivant</string>
-  <string name="btn_back">Précédent</string>
-  <string name="btn_finish">Fin</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Annuler</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Quelques détails sur Orbot</string>
-  <string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, LibEvent et Polipo. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil rooté, d\'envoyer tout le trafic Internet par Tor.</string>
-  <string name="wizard_permissions_root">Permission accordée</string>
-  <string name="wizard_permissions_stock">Permissions d\'Orbot</string>
-  <string name="wizard_premissions_msg_root">Excellent ! Nous avons détecté les permissions root sont activées pour Orbot. Nous utiliserons ce pouvoir avec discernement.</string>
-  <string name="wizard_permissions_msg_stock">Bien que cela ne soit pas exigé, Orbot peut devenir un outil plus puissant si votre appareil à l\'accès root. Utilisez le bouton ci-dessous pour accorder à Orbot des superpouvoirs !</string>
-  <string name="wizard_permissions_no_root">Si vous n\'avez pas l\'accès root ou n\'avez aucune idée de quoi l\'on parle, assurez-vous d\'utiliser des applis conçues pour fonctionner avec Orbot.</string>
-  <string name="wizard_permissions_consent">Je comprends et je souhaite continuer sans superpouvoir</string>
-  <string name="wizard_permission_enable_root">Accorder les droits Root à Orbot</string>
-  <string name="wizard_configure">Configurer la torification</string>
-  <string name="wizard_configure_msg">Orbot vous donne l\'option de faire passer tout le trafic applicatif par Tor OU de choisir les applications individuellement.</string>
-  <string name="wizard_configure_all">Relayer toutes les applis par Tor</string>
-  <string name="wizard_configure_select_apps">Choisir des applis pour Tor</string>
-  <string name="wizard_tips_tricks">Applis concues pour Orbot</string>
-  <string name="wizard_tips_msg">Les applis ci-dessous ont été développées pour fonctionner avec Orbot. Cliquez sur chaque bouton pour les installer maintenant, ou trouvez plus tard dans Google Play Store, sur le site Web GuardianProject.info ou avec F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client sécurisé de messagerie instantanée pour Android</string>
-  <string name="wizard_tips_proxy">Paramètres du relais - Apprendre à configurer des applis pour qu\'elles fonctionnent avec Orbot</string>
-  <string name="wizard_tips_duckgo">Appli du moteur de recherche DuckDuckgo</string>
-  <string name="wizard_tips_twitter">Configurer le mandataire Twitter sur l\'hôte « localhost:8118 » et le port 8118</string>
-  <string name="wizard_tips_story_maker">Faiseur d\'histoires -  Rédigez une histoire et laissez Tor s\'occuper de la sécurité !</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Paramètres du mandataire</string>
-  <string name="wizard_proxy_help_msg">Si l\'appli Android que vous utilisez peut prendre en charge un mandataire HTTP ou SOCKS, vous pouvez alors la configurer pour se connecter à Orbot et utiliser Tor.\n\n\n Le paramètre de l\'hôte est 127.0.0.1 or « localhost ». Pour HTTP, le paramètre de port est 8118. Pour SOCKS, le mandataire est 9050. Vous devriez utiliser SOCKS4A ou SOCKS5 si possible.\n \n\n\n Vous pouvez en apprendre davantage sur l\'utilisation d\'un serveur mandataire sur Android dans la FAQ sur : http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot est prêt !</string>
-  <string name="wizard_final_msg">Des millions de personnes de par le monde utilisent Tor pour une grande variété de raisons.\n\nDes journalistes et des blogueurs, des défenseurs des droits humains, des officiers des forces de l\'ordre, des soldats, des sociétés, des citoyens de régimes répressifs, et de simples citoyens... et maintenant vous êtes aussi prêt à l\'utiliser !</string>
-  <string name="wizard_exit_at_first_screen_toast">Veuillez configurer Orbot avant de pouvoir commencer à l\'utiliser !</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Vous vous êtes connecté au réseau Tor avec succès - mais cela NE SIGNIFIE PAS que votre appareil est sécurisé. Vous pouvez utiliser le bouton « Navigateur » pour tester votre connexion. \n\n Visitez https://guardianproject.info/apps/orbot ou envoyez un courriel à help@xxxxxxxxxxxxxxxxxxxx pour en savoir davantage.</string>
-  <string name="tor_check">Ceci ouvrira votre navigateur Web sur https://check.torproject.org afin de déterminer si Orbot est convenablement configuré et si vous êtes connecté à Tor.</string>
-  <string name="pref_hs_group">Hébergement de services cachés</string>
-  <string name="pref_general_group">Général</string>
-  <string name="pref_start_boot_title">Démarrer Orbot à l\'amorçage</string>
-  <string name="pref_start_boot_summary">Démarrer Orbot automatiquement et se connecter à Tor lors de l\'amorçage de votre appareil Android</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot, c\'est Tor sur Android !\n\nTor vous aide à vous défendre contre le filtrage du contenu, l\'analyse du trafic et la surveillance du réseau qui menacent la vie privée, les informations confidentielles et les relations interpersonnelles.\n\nCet assistant vous aidera à configurer Orbot et Tor sur votre appareil.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Avertissement</string>
-  <string name="wizard_warning_msg">La simple installation d\'Orbot n\'anonymisera pas automatiquement votre trafic mobile.\n\nVous devez configurer Orbot adéquatement, ainsi que votre appareil et les autres applis pour utiliser Tor avec succès.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">Vous pouvez optionnellement accorder à Orbot un accès « superutilisateur » pour activer des options avancées, comme le relayage transparent.</string>
-  <string name="wizard_permissions_root_msg2">Si vous ne voulez pas le faire, veuillez vous assurer d\'utiliser des applis conçues pour fonctionner avec Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Votre appareil ne semble pas être rooté ou ne pas fournir l\'accès root ou super-utilisateur.\n\nVeuillez plutôt essayer le mode « Applis » de l\'écran principal.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Applis conçues pour Orbot</string>
-  <string name="wizard_tips_gibberbot">Chatsecure : appli sécurisée de clavardage avec chiffrement confidentiel </string>
-  <string name="wizard_tips_orweb">Orfox : navigateur à confidentialité améliorée fonctionnant sur Tor</string>
-  <string name="wizard_tips_play">Trouver toutes les applis du Projet Guardian sur Google Play</string>
-  <string name="wizard_tips_fdroid">Trouver toutes les applis du Projet Guardian sur F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Trouver toutes les applis du Projet Guardian sur https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Relayage transparent</string>
-  <string name="wizard_transproxy_msg">Ceci permet à vos applis d\'utiliser automatiquement le réseau Tor sans aucune configuration.</string>
-  <string name="wizard_transproxy_hint">(Cochez cette case si vous n\'avez aucune idée de ce dont nous parlons)</string>
-  <string name="wizard_transproxy_none">Aucun</string>
-  <string name="pref_transparent_tethering_title">Fonction modem avec Tor</string>
-  <string name="pref_transparent_tethering_summary">Activer le relayage transparent pour les périphériques utilisant la fonction modem soit par Wi-Fi ou par USB (redémarrage nécessaire)</string>
-  <string name="button_grant_superuser">Demander l\'accès superutilisateur</string>
-  <string name="pref_select_apps">Choisir les applis</string>
-  <string name="pref_select_apps_summary">Choisir les applis à acheminer par Tor</string>
-  <string name="pref_node_configuration">Configuration de nÅ?ud </string>
-  <string name="pref_node_configuration_summary">Ces paramètres avancés peuvent réduire votre anonymat</string>
-  <string name="pref_entrance_node">NÅ?uds d\'entrée</string>
-  <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string>
-  <string name="pref_entrance_node_dialog">Saisir les nÅ?uds d\'entrée</string>
-  <string name="pref_allow_background_starts_title">Permet des lancements en arrière-plan</string>
-  <string name="pref_allow_background_starts_summary">Laissez n\'importe quelle appli dire à Orbot de démarrer Tor et les services connexes</string>
-  <string name="button_proxy_all">Tout relayer</string>
-  <string name="button_proxy_none">Ne rien relayer</string>
-  <string name="button_invert_selection">Inverser la sélection</string>
-  <string name="pref_proxy_title">Mandataire pour le réseau sortant (optionnel)</string>
-  <string name="pref_proxy_type_title">Type de mandataire sortant</string>
-  <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur mandataire : HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Saisir le type de mandataire</string>
-  <string name="pref_proxy_host_title">Hôte du mandataire sortant</string>
-  <string name="pref_proxy_host_summary">Nom d\'hôte du serveur mandataire</string>
-  <string name="pref_proxy_host_dialog">Saisir l\'hôte mandataire</string>
-  <string name="pref_proxy_port_title">Port du mandataire sortant</string>
-  <string name="pref_proxy_port_summary">Port du serveur mandataire</string>
-  <string name="pref_proxy_port_dialog">Saisir le port du mandataire</string>
-  <string name="pref_proxy_username_title">Nom d\'utilisateur du mandataire sortant</string>
-  <string name="pref_proxy_username_summary">Nom d\'utilisateur du mandataire (optionnel)</string>
-  <string name="pref_proxy_username_dialog">Saisir le nom d\'utilisateur du mandataire</string>
-  <string name="pref_proxy_password_title">Mot de passe du mandataire sortant</string>
-  <string name="pref_proxy_password_summary">Mot de passe du mandataire (optionnel)</string>
-  <string name="pref_proxy_password_dialog">Saisir le mot de passe du mandataire</string>
-  <string name="status">Ã?tat</string>
-  <string name="setting_up_full_transparent_proxying_">Configuration le relayage entièrement transparent...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configuration d\'un relayage transparent par appli...</string>
-  <string name="transparent_proxying_enabled">Relayage transparent ACTIVÃ?</string>
-  <string name="transproxy_enabled_for_tethering_">Relais transparent activé pour pour la fonction modem !</string>
-  <string name="warning_error_starting_transparent_proxying_">AVERTISSEMENT : erreur lors du démarrage du relayage transparent !</string>
-  <string name="transproxy_rules_cleared">Règles du relais transparent effacées</string>
-  <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
-  <string name="privoxy_is_running_on_port_">Polipo tourne sur le port : </string>
-  <string name="setting_up_port_based_transparent_proxying_">Configuration du relayage transparent par port...</string>
-  <string name="bridge_error">Erreur de pont</string>
-  <string name="bridge_requires_ip">Afin de pouvoir utiliser la fonction pont, vous devez au moins saisir l\'adresse IP d\'un pont.</string>
-  <string name="send_email_for_bridges">Envoyez un courriel à bridges@xxxxxxxxxxxxxx avec la ligne « get bridges », seule, dans le corps du courriel à partir d\'un compte Gmail. </string>
-  <string name="error">Erreur</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Vos paramètres ReachableAddresses (adresses accessibles) ont causé une exception !</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Impossible de démarrer le processus Tor : </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Vos paramètres ReachableAddresses (adresses accessibles) ont causé une exception !</string>
   <string name="your_relay_settings_caused_an_exception_">Vos paramètres de relais ont causé une exception !</string>
-  <string name="exit_nodes">NÅ?uds de sortie</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Empreintes, pseudos, pays et adresses pour le dernier saut</string>
-  <string name="enter_exit_nodes">Saisir les noeuds de sortie</string>
-  <string name="exclude_nodes">NÅ?uds à exclure</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Empreintes, pseudos, pays et adresses à exclure</string>
-  <string name="enter_exclude_nodes">Saisir les nÅ?uds à exclure</string>
-  <string name="strict_nodes">NÅ?uds stricts</string>
-  <string name="use_only_these_specified_nodes">Utiliser *uniquement * ces nÅ?uds spécifiés</string>
-  <string name="bridges">Ponts</string>
-  <string name="use_bridges">Utiliser des ponts</string>
-  <string name="bridges_obfuscated">Ponts obscurcis</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activer des nÅ?uds alternatifs d\'entrée vers le réseau Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activer si les ponts configurés sont des ponts obscurcis</string>
-  <string name="ip_address_and_port_of_bridges">Adresse IP et port des ponts</string>
-  <string name="enter_bridge_addresses">Saisir les adresses des ponts</string>
-  <string name="relays">Relais</string>
-  <string name="relaying">Relayage</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Configurez votre appareil pour être un relais de non-sortie</string>
-  <string name="relay_port">Port du relais</string>
-  <string name="listening_port_for_your_tor_relay">Port d\'écoute pour votre relais Tor</string>
-  <string name="enter_or_port">Saisir le port OR</string>
-  <string name="relay_nickname">Pseudo du relais</string>
-  <string name="the_nickname_for_your_tor_relay">Le pseudo de votre relais Tor</string>
-  <string name="enter_a_custom_relay_nickname">Saisir un pseudo personnalisé pour le relais</string>
-  <string name="reachable_addresses">Adresses accessibles</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Exécuter en tant que client derrière un pare-feu avec des politiques restrictives</string>
-  <string name="reachable_ports">Ports accessibles</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports accessibles derrière un pare-feu restrictif</string>
-  <string name="enter_ports">Saisir les ports</string>
-  <string name="enable_hidden_services">Hébergement de services cachés</string>
-  <string name="run_servers_accessible_via_the_tor_network">permettre aux serveurs sur l\'appareil d\'être accessibles par le réseau Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">saisir les ports de l\'hôte local pour les services cachés</string>
-  <string name="hidden_service_ports">Ports des services cachés</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">le nom adressable pour votre service caché (généré automatiquement)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activer le journal de débogage vers la sortie (vous devez utiliser adb ou aLogCat pour le visualiser)</string>
-  <string name="project_home">Page(s) d\'accueil du projet :</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">La licence de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Logiciels tiers :</string>
-  <string name="tor_version">Tor : https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21 : http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9 : https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21 : http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q : http://www.openssl.org</string>
-  <string name="hidden_service_request">Une appli veut ouvrir le port %S du serveur caché au réseau Tor. ceci est sécuritaire si vous faites confiance à l\'appli.</string>
-  <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
+    <string name="found_existing_tor_process">un processus existant de Tor a été trouvé...</string>
   <string name="something_bad_happened">Quelque chose n\'a pas été. Vérifiez le journal</string>
-  <string name="hidden_service_on">service caché sur :</string>
-  <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
+    <string name="unable_to_read_hidden_service_name">impossible de lire le nom du service caché</string>
   <string name="unable_to_start_tor">Impossible de démarrer Tor :</string>
-  <string name="unable_to_reset_tor">Redémarrez votre appareil, impossible de réinitialiser Tor !</string>
-  <string name="pref_use_sys_iptables_title">Utiliser les Iptables par défaut</string>
-  <string name="pref_use_sys_iptables_summary">Utiliser le binaire iptables intégré à la place du binaire intégré avec Orbot</string>
-  <string name="error_installing_binares">Les fichiers binaires de Tor n\'ont pas pu être installés ou mis à niveau.</string>
-  <string name="pref_use_persistent_notifications">Toujours conserver l\'icône dans la barre des tâches quand Orbot est connecté.</string>
-  <string name="pref_use_persistent_notifications_title">Toujours activer les notifications</string>
-  <string name="pref_use_expanded_notifications">Montrer des notifications étendues avec le pays de sortie de Tor et l\'IP</string>
-  <string name="pref_use_expanded_notifications_title">Notifications étendues</string>
-  <string name="notification_using_bridges">Les ponts sont activés !</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Langue</string>
-  <string name="set_locale_summary">Choisir les paramètres régionaux pour Orbot</string>
-  <string name="wizard_locale_title">Choisir la langue</string>
-  <string name="wizard_locale_msg">Laisser à la valeur par défaut ou changer la langue actuelle</string>
-  <string name="powered_by">propulsé par Tor</string>
-  <string name="btn_save_settings">Enregistrer les paramètres</string>
-  <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</string>
-  <string name="bandwidth_">Bande passante :</string>
-  <string name="down">aval</string>
-  <string name="up">amont</string>
-  <string name="pref_disable_network_title">Pas de mise en veille automatique du réseau</string>
-  <string name="pref_disable_network_summary">Mettre Tor en veille quand aucune connexion Internet n\'est disponible</string>
-  <string name="newnym">Vous avez basculé vers une nouvelle identité Tor !</string>
-  <string name="menu_verify_browser">Navigateur</string>
-  <string name="menu_use_chatsecure">Utiliser ChatSecure</string>
-  <string name="permission_manage_tor_label">Gérer Tor</string>
-  <string name="permission_manage_tor_description">Autoriser cette appli à contrôler le service Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Il semble qu\'Orfox n\'est pas installé. Voulez-vous de l\'aide à ce sujet ou devrions-nous juste ouvrir le navigateur ?</string>
-  <string name="install_apps_">Installer les applis ?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Pas de connectivité réseau. Mise au repos de Tor...</string>
+    <string name="no_internet_connection_tor">Pas de connexion Internet ; Tor est en attente...</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="wizard_tips_martus">Martus mobile - Appli de documentation pour les droits humains de  Benetech</string>
-  <string name="your_tor_public_ips_">Vos IP publiques Tor :</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Veuillez désactiver cette appli dans Android-&gt;Paramètres-&gt;Applications si vous éprouvez des problèmes avec Orbot :</string>
-  <string name="app_conflict">Conflit d\'applis</string>
-  <string name="pref_transproxy_refresh_title">Rafraîchissement automatique de Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Appliquer de nouveau les règles de Transproxy lors des changements d\'état du réseau</string>
-  <string name="pref_transproxy_flush_title">Transproxy ENLEVER DE FORCE</string>
-  <string name="pref_transproxy_flush_summary">Toquer ici pour vider toutes les règles réseau de transproxy MAINTENANT</string>
-  <string name="transparent_proxy_rules_flushed_">Les règles du mandataire transparent ont été vidées !</string>
-  <string name="you_do_not_have_root_access_enabled">L\'accès ROOT n\'est pas activé</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Vous pourriez avoir à arrêter et démarrer Orbot pour que les changements de paramètres soient activés.</string>
-  <string name="menu_vpn">RPV</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">Ko</string>
-  <string name="mb">Mo</string>
-  <string name="bridges_updated">Ponts mis à jour</string>
-  <string name="restart_orbot_to_use_this_bridge_">Veuillez redémarrer Orbot pour activer les changements</string>
-  <string name="menu_qr">Codes QR</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Si votre réseau mobile bloque Tor activement, vous pouvez utiliser un pont pour accéder au réseau.\n\nCHOISIR un des types de ponts ci-dessus pour activer les ponts.</string>
-  <string name="bridge_mode">Mode pont</string>
-  <string name="get_bridges_email">Courriel</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Activer</string>
-  <string name="apps_mode">Mode RPV des applis</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Vous pouvez activer le relais de toutes les applis par le réseau Tor en utilisant la fonction de RPV d\'Android.\n\n*AVERTISSEMENT* Cette fonction est nouvelle et expérimentale et pourrait parfois ne pas démarrer automatiquement, et même s\'arrêter. Elle ne devrait PAS être utilisée pour l\'anonymat, et être SEULEMENT utilisée pour passer les pare-feu et les filtres.</string>
-  <string name="send_email">Envoyer un courriel</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Vous pouvez obtenir une adresse de pont par courriel, par le Web ou en balayant le code QR d\'un pont. Choisissez *Courriel* ou *Web* ci-dessous pour demander une adresse de pont.\n\nUne fois que vous avez une adresse, copiez &amp; collez-la dans le champ « Ponts » des paramètres d\'Orbot et redémarrez.</string>
-  <string name="install_orweb">Installer Orfox</string>
-  <string name="standard_browser">Navigateur standard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Note : seuls les ponts Tor standards fonctionnent sur les appareils Intel X86/ATOM</string>
-  <string name="vpn_default_world">Monde</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-fr/strings.xml b/orbotservice/src/main/res/values-fr/strings.xml
index fa051335..79e119d6 100644
--- a/orbotservice/src/main/res/values-fr/strings.xml
+++ b/orbotservice/src/main/res/values-fr/strings.xml
@@ -2,45 +2,13 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot est une application proxy gratuite qui améliore l\'utilisation plus sécurisée des applications. Orbot utilise Tor pour crypter votre trafic internet et le cacher en passant par une série d\'ordinateur partout dans le monde. Tor est un logiciel gratuit et un réseau ouvert qui vous aide à vous défendre contre les surveillances de réseau qui font peur à la liberté personnelle et la vie privée, les activités confidentielles des entreprises et des relations, et l\'état de la sécurité connu sous le nom d\'analyse de trafic.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Démarrer et arrêter Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Démarrage de Orbot...</string>
+    <string name="status_starting_up">Démarrage de Orbot...</string>
   <string name="status_activated">Connecté au réseau Tor</string>
   <string name="status_disabled">Orbot est désactivé</string>
   <string name="status_shutting_down">Le service Tor est en cours de fermeture</string>
   <string name="tor_process_starting">Démarrage du client Tor...</string>
   <string name="tor_process_complete">terminé.</string>
-  <string name="tor_process_waiting">en attente.</string>
-  <string name="not_anonymous_yet">ATTENTION : Votre trafic n\'est pas encore anonyme ! Veuillez configurer votre application pour utiliser le proxy HTTP 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5A 172.0.0.1:9050</string>
-  <string name="menu_home">Accueil</string>
-  <string name="menu_browse">Naviguer</string>
-  <string name="menu_settings">Paramètres</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Aide</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Démarrer</string>
-  <string name="menu_stop">Arrêter</string>
-  <string name="menu_about">A propos</string>
-  <string name="menu_promo_apps">Obtenir des applications</string>
-  <string name="main_layout_download">Télécharger</string>
-  <string name="main_layout_upload">Envoyer</string>
-  <string name="button_help">Aide</string>
-  <string name="button_close">Fermer</string>
-  <string name="button_about">A propos</string>
-  <string name="button_clear_log">Effacer la log</string>
-  <string name="menu_verify">Vérifier</string>
-  <string name="menu_exit">Quitter</string>
-  <string name="menu_scan">Analyser BridgeQR</string>
-  <string name="menu_share_bridge">Partager BridgeQR</string>
-  <string name="press_to_start">- appui long pour commencer -</string>
-  <string name="pref_trans_proxy_group">Passage du trafic Internet de manière transparente (Requiert le Root)</string>
-  <string name="pref_trans_proxy_title">Passage du trafic Internet de manière transparente</string>
-  <string name="wizard_title">Orbot</string>
-  <!--Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -48,7 +16,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Passage du trafic Internet de manière transparente</string>
-  <string name="default_bridges"></string>
-  <string name="menu_vpn">VPN</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-gl/strings.xml b/orbotservice/src/main/res/values-gl/strings.xml
index c0afa0e4..03226ad2 100644
--- a/orbotservice/src/main/res/values-gl/strings.xml
+++ b/orbotservice/src/main/res/values-gl/strings.xml
@@ -2,208 +2,25 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot é unha aplicación de proxy libre que permite a outras aplicacións usar a internet dun xeito máis seguro. Orbot usa Tor para encriptar o teu tráfico de internet ocultando e rebotándoo a través dunha serie de ordenadores ao redor do mundo. Tor é software libre e unha rede aberta que axuda a defenderte contra unha forma de vixiancia na rede que ameaza a liberdade e privacidade persoal, actividades confidenciáis de negocios e relacións, e estado de seguridade coñecido como análise de tráfico.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e deter Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está a se iniciar...</string>
+    <string name="status_starting_up">Orbot está a se iniciar...</string>
   <string name="status_activated">Conectado á rede Tor</string>
   <string name="status_disabled">Orbot está desactivado</string>
   <string name="tor_process_starting">Iniciando cliente Tor...</string>
   <string name="tor_process_complete">completado.</string>
-  <string name="tor_process_waiting">á espera.</string>
-  <string name="not_anonymous_yet">AVISO: o teu tráfico aínda non é anónimo! Por favor, configura os teus aplicativos para uxar o proxy HTTP 127.0.0.1:8118 ou SOCKS4A ou o proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Inicio</string>
-  <string name="menu_browse">Examinar</string>
-  <string name="menu_settings">Axustes</string>
-  <string name="menu_log">Rexistro (log)</string>
-  <string name="menu_info">Axuda</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Deter</string>
-  <string name="menu_about">Sobre</string>
-  <string name="main_layout_download">Descargar</string>
-  <string name="main_layout_upload">Cargar</string>
-  <string name="button_help">Axuda</string>
-  <string name="button_close">Pechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar rexistro</string>
-  <string name="menu_verify">Comprobar</string>
-  <string name="menu_exit">Saír </string>
-  <string name="press_to_start">- toque longo para comezar-</string>
-  <string name="pref_trans_proxy_group">Proxyficación transparente (cómpre ser root)</string>
-  <string name="pref_trans_proxy_title">Proxyficación transparente</string>
-  <string name="pref_trans_proxy_summary">Torificación Automática dos Aplicativos</string>
-  <string name="pref_transparent_all_title">Tor para todo</string>
-  <string name="pref_transparent_all_summary">Pasar todo o tráfico dos aplicativos por Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porto de Reserva do Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">ATENCI�N: Evita os portos comúns (80, 443, etc). * USAR S�* se os modos  \'Todo\' ou \'Aplicación\' non funcionan.</string>
-  <string name="pref_transparent_port_title">Lista de Portos</string>
-  <string name="pref_transparent_port_summary">Lista de portos a pasar. *USAR S�* se os modos \'Todo\' ou \'Aplicación\' non funcionan</string>
-  <string name="pref_transparent_port_dialog">Introduza os portos a pasar</string>
-  <string name="pref_has_root">Requerir Acceso de Superusuario</string>
-  <string name="pref_has_root_summary">Requerir acceso de root para proxy transparente</string>
-  <string name="status_install_success">Se instalaron con éxito os binarios de Tor!</string>
-  <string name="status_install_fail">Non se puideron instalar os ficheiros binarios de Tor. Por favor, comprobe o rexistro e notifíqueo a tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erro de Aplicativo</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Acerca de Orbot</string>
-  <string name="btn_next">Seguinte</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Rematar</string>
-  <string name="btn_okay">Aceptar</string>
-  <string name="btn_cancel">Cancelar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Algúns detalles sobre Orbot</string>
-  <string name="wizard_permissions_root">Permiso Concedido</string>
-  <string name="wizard_permissions_stock">Permisos de Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelente! Detectamos que ten permisos de root habilitados para Orbot. Empregaremos este poder sabiamente.</string>
-  <string name="wizard_permissions_msg_stock">Aínda que non é necesario, Orbot pode ser unha ferramenta máis poderosa se o seu dispositivo ten acceso de root. Use o botón de abaixo para dar superpoderes a Orbot!</string>
-  <string name="wizard_permissions_no_root">Se non ten acceso de root ou non tén nin idea de  qué lle estamos a falar, asegúrese de usar aplicativos que funcionen con Orbot.</string>
-  <string name="wizard_permissions_consent">Entendo e gostaríame continuar sen Superusuario</string>
-  <string name="wizard_permission_enable_root">Conceder Root a Orbot</string>
-  <string name="wizard_configure">Configurar Torificación</string>
-  <string name="wizard_configure_msg">Orbot dá-lle a opción de enrutar todo o tráfico dos aplicativos a través de Tor OU elexir ditos aplicativos individualmente.</string>
-  <string name="wizard_configure_all">Enviar Todos os Aplicativos Por Tor</string>
-  <string name="wizard_configure_select_apps">Elixir Aplicativos Individuais por Tor</string>
-  <string name="wizard_tips_tricks">Aplicativos habilitados para Tor</string>
-  <string name="wizard_tips_msg">Os aplicativos de abaixo foron programados para funcionar con Orbot. Prema en cada botón para instalar agora, ou os pode atopar despóis en Google Play, no sitio web GuardianProject.info ou en F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensaxería instantánea segura para Android</string>
-  <string name="wizard_tips_proxy">Axustes do Proxy - Aprenda cómo configurar aplicativos para que funcionen con Orbot</string>
-  <string name="wizard_tips_duckgo">Aplicativo do Motor de Búsquedas DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Axustar o host para proxy de Twitter a \"localhost\" e porto 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Axustes do proxy</string>
-  <string name="wizard_final">Orbot está listo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Isto abrirá no seu navegador https://check.torproject.org para ver se Obrbot está configurado probablemente e se está conectado a Tor.</string>
-  <string name="pref_hs_group">Aloxamento Oculto de Servizo</string>
-  <string name="pref_general_group">Xeral</string>
-  <string name="pref_start_boot_title">Inciar Orbot no Arranque</string>
-  <string name="pref_start_boot_summary">Iniciar Orbot automáticamente cando o seu dispositivo Android arranque</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Aviso</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisos</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente pode darlle a Orbot acceso de \'Superusuario\' para habilitar características avanzadas, como o Proxy Transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se non quere facer isto, por favor asegúrese de usar aplicativos feitos para traballar con Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicativos Habilitados para Orbot</string>
-  <string name="wizard_tips_gibberbot">CahtSecure: Aplicativo de chat seguro con Off-the-Record Encryption (OTR)</string>
-  <string name="wizard_tips_play">Atope todos os aplicativos de Guardian Project apps en Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_msg">Isto permite que os seus aplicativos funcionen a través de rede Tor sen ningunha configuración.</string>
-  <string name="wizard_transproxy_hint">(Marque esta caixa se non ten nin idea do que lle estamos a falar)</string>
-  <string name="wizard_transproxy_none">Ningunha</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente Tor para dispositivos enlazados por Wi-Fi ou USB (require reiniciar)</string>
-  <string name="button_grant_superuser">Pedir Acceso de Superusuario</string>
-  <string name="pref_select_apps">Seleccionar Aplicativos</string>
-  <string name="pref_select_apps_summary">Elixir Aplicativos a Enrutar a Través de Tor</string>
-  <string name="pref_node_configuration">Configuración de Nodo</string>
-  <string name="pref_node_configuration_summary">Estes son axuste avanzados que poden reducir o seu anonimato</string>
-  <string name="pref_entrance_node">Nodos de Entrada</string>
-  <string name="pref_entrance_node_summary">Huellas, alias, países e direccións para o primeiro salto</string>
-  <string name="pref_entrance_node_dialog">Introduzca Nodos de Entrada</string>
-  <string name="pref_proxy_title">Proxy para a Rede de Saída (Opcional)</string>
-  <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string>
-  <string name="pref_proxy_type_summary">Protocolo a usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Introduzca Tipo de Proxy</string>
-  <string name="pref_proxy_host_title">Host de Proxy de Saída</string>
-  <string name="pref_proxy_host_summary">Nome do Host Proxy Servidor</string>
-  <string name="pref_proxy_host_dialog">Introduzca o Host Proxy</string>
-  <string name="pref_proxy_port_title">Porto do Proxy de Saída</string>
-  <string name="pref_proxy_port_summary">Porto do Servidor Proxy</string>
-  <string name="pref_proxy_port_dialog">Introduzca o porto do Proxy</string>
-  <string name="pref_proxy_username_title">Nome de usuario do Proxy de Saída</string>
-  <string name="pref_proxy_username_summary">Nome de Usuario do Proxy (Opcional)</string>
-  <string name="pref_proxy_username_dialog">Introduza o Nome de Usuario do Proxy</string>
-  <string name="pref_proxy_password_title">Contrasinal do Proxy de Saída</string>
-  <string name="pref_proxy_password_summary">Contrasinal do Proxy (Opcional)</string>
-  <string name="pref_proxy_password_dialog">Introduza Contrasinal do Proxy</string>
-  <string name="status">Estado</string>
-  <string name="setting_up_full_transparent_proxying_">Preparando proxy transparente completo...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Preparando proxy transparente baseado en aplicativo...</string>
-  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Enlazamento!</string>
-  <string name="warning_error_starting_transparent_proxying_">ATENCIÃ?N: erro arrancando o proxy transparente!</string>
-  <string name="transproxy_rules_cleared">Regras TransProxy limpadas</string>
-  <string name="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Preparando proxy transparente baseado en porto...</string>
-  <string name="bridge_error">Erro de Ponte</string>
-  <string name="bridge_requires_ip">Para usar a característica de ponte, debe introducir cando menos unha dirección IP de ponte.</string>
-  <string name="send_email_for_bridges">Envíe un email a bridges@xxxxxxxxxxxxxx só coa liña \"get bridges\" no corpo do correo dende unha conta de gmail.</string>
-  <string name="error">Erro</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">O seu axuste de ReachableAddresses causou unha excepción!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">No se pudio inciar o proceso Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">O seu axuste de ReachableAddresses causou unha excepción!</string>
   <string name="your_relay_settings_caused_an_exception_">Os seus axustes de relay causou unha excepción!</string>
-  <string name="exit_nodes">Nodos de Saída</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Huellas, alias, países e direccións para o último salto</string>
-  <string name="enter_exit_nodes">Introduza Nodos de Saída</string>
-  <string name="exclude_nodes">Excluir Nodos</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Huellas, alias, países e direccións a excluír</string>
-  <string name="enter_exclude_nodes">Introduza Nodos Excluídos</string>
-  <string name="strict_nodes">Nodos Estritos</string>
-  <string name="use_only_these_specified_nodes">Usar *só* este nodos específicos</string>
-  <string name="bridges">Pontes</string>
-  <string name="use_bridges">Usar Pontes</string>
-  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nodos alternativos de entrada á rede Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se oas pontes configuradas son pontes ofuscadas</string>
-  <string name="ip_address_and_port_of_bridges">Dirección IP e porto das pontes</string>
-  <string name="enter_bridge_addresses">Introduza Direccións das Pontes</string>
-  <string name="relays">Reenvíos</string>
-  <string name="relaying">Reenvío</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Habilite o seu dispositivo para ser un reenvío non de saída</string>
-  <string name="relay_port">Porto de Reenvío</string>
-  <string name="listening_port_for_your_tor_relay">Porto de Escoita do seu reenvío Tor</string>
-  <string name="enter_or_port">Introduza o porto OR</string>
-  <string name="relay_nickname">Alias de Reenvío</string>
-  <string name="the_nickname_for_your_tor_relay">Seu alias para reenvío de Tor</string>
-  <string name="enter_a_custom_relay_nickname">Introduza un alias personalizado de reenvío</string>
-  <string name="reachable_addresses">Direccións Alcanzábeis</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Executar como un cliente detrás dun firewall con políticas restritivas</string>
-  <string name="reachable_ports">Portos Alcanzábeis</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Portos alcanzábeis detrás dun firewall restritivo</string>
-  <string name="enter_ports">Inserir portos</string>
-  <string name="enable_hidden_services">Aloxamento de Servizo Oculto</string>
-  <string name="run_servers_accessible_via_the_tor_network">permitir ao servidor no dispositivo estar accesible na rede Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">introduza os portos localis para servizos ocultos</string>
-  <string name="hidden_service_ports">Portos de Servicios Ocultos</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nome para referirse ao seu servizo oculto (xenerado automáticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar rexistro de depuración na saída (debe usar adb ou aLogCat para ver)</string>
-  <string name="project_home">Páxina(s) de Inicio do Proxecto:</string>
-  <string name="the_tor_license">A Licencia de Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de Terceiros:</string>
-  <string name="hidden_service_request">Un aplicativo quere abrir o porto do servidor oculto %S na rede Tor. Isto é seguro se confía no aplicativo.</string>
-  <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
+    <string name="found_existing_tor_process">atopado proceso Tor existente...</string>
   <string name="something_bad_happened">Algo malo pasou. Comprobe o rexistro</string>
-  <string name="hidden_service_on">servizo oculto en:</string>
-  <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
+    <string name="unable_to_read_hidden_service_name">imposible ler nome de servizo oculto</string>
   <string name="unable_to_start_tor">Incapaz de arrancar Tor</string>
-  <string name="pref_use_sys_iptables_title">Usar iptables por Defecto</string>
-  <string name="pref_use_sys_iptables_summary">usar o binario de iptables instalado en lugar do empaquetado con Orbot</string>
-  <string name="error_installing_binares">Non se puideron instalar ou actualizar os binarios de Tor</string>
-  <string name="pref_use_persistent_notifications">Mostrar sempre a icona na barra de ferramentas cando Orbot estea conectado</string>
-  <string name="pref_use_persistent_notifications_title">Notificacións Sempre Acesas</string>
-  <string name="notification_using_bridges">Pontes habilitadas!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Elixir locale e idioma para Orbot</string>
-  <string name="wizard_locale_title">Escoller idioma</string>
-  <string name="wizard_locale_msg">Deixar por defecto ou cambiar ao idioma actual</string>
-  <string name="btn_save_settings">Gardar os axustes</string>
-  <string name="bandwidth_">Ancho de Banda:</string>
-  <string name="down">caído</string>
-  <string name="up">levantado</string>
-  <string name="pref_disable_network_title">Auto-Parado Sen Rede</string>
-  <string name="pref_disable_network_summary">Parar Tor cando non hai conexión a internet</string>
-  <string name="newnym">Cambiou a unha nova identidade Tor!</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Xestionar Tor</string>
-  <string name="permission_manage_tor_description">Hablitar este aplicativo para controlar o servicio Tor</string>
-  <string name="install_apps_">Instalar aplicativos?</string>
+    <string name="newnym">Cambiou a unha nova identidade Tor!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-gu-rIN/strings.xml b/orbotservice/src/main/res/values-gu-rIN/strings.xml
index bfb4b94f..0fe1e9e1 100644
--- a/orbotservice/src/main/res/values-gu-rIN/strings.xml
+++ b/orbotservice/src/main/res/values-gu-rIN/strings.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="btn_cancel">રદ �ર�</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">પ�ર���સ� ��ઠવણ��</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-gu/strings.xml b/orbotservice/src/main/res/values-gu/strings.xml
index 3965a3d3..0fe1e9e1 100644
--- a/orbotservice/src/main/res/values-gu/strings.xml
+++ b/orbotservice/src/main/res/values-gu/strings.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_info">મદદ</string>
-  <string name="button_help">મદદ</string>
-  <string name="button_close">બ�ધ �ર�</string>
-  <string name="btn_cancel">રદ� �ર�</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">પ�ર���સ� ��ઠવણ��</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-he/strings.xml b/orbotservice/src/main/res/values-he/strings.xml
index e5e33f9b..c22e5b90 100644
--- a/orbotservice/src/main/res/values-he/strings.xml
+++ b/orbotservice/src/main/res/values-he/strings.xml
@@ -2,232 +2,27 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ×?×?× ×? ×?פ×?×?קצ×?×?ת פר×?קס×? ×?×?× ×?×?ת ×?×?×?פשרת ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?שת×?ש ×?×?×?× ×?רנ×? ×?×?×?×?×?. Orbot × ×¢×?רת ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?רנ×? ש×?×? ×?×?×?ס×?×?ת×? ×?×?×?צע×?ת×? × ×?ת×?×?×? ×?ר×? ×?ספר ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?פש×?ת ×?רשת פת×?×?×? ×?×?ס×?×?עת ×?×? ×?×?ת×?×?× ×? ×?פנ×? ס×?×?×?×? ×?ס×?×?×?×?×? ש×? ×?×?צע×? × ×?×?×?ר ×?×?עק×? ×?×?ר רשת ×?×?×?× ×?רנ×? ×?×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×?×?×?ר×?ת ×?×?×?ש×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?×?ער×?×?ת ×?×?ס×?×? ×?ש×?×?×?ת.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">×?ת×?×? ×?עצ×?ר ×?ת Tor</string>
-  <string name="tor_proxy_service_process">ש×?ר×?ת פר×?קס×? Tor</string>
-  <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
+    <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
   <string name="status_activated">×?×?×?×?ר ×?רשת Tor</string>
   <string name="status_disabled">Orbot ×?×?×?×?</string>
   <string name="tor_process_starting">×?ת×?×?×? ×?ק×?×? Tor...</string>
   <string name="tor_process_complete">×?×?ש×?×?.</string>
-  <string name="tor_process_waiting">×?×?×?×?.</string>
-  <string name="not_anonymous_yet">×?×?×?ר×?: ×?תע×?×?ר×? ש×?×? ×?×?× ×? ×?× ×?× ×?×?×?ת ×¢×?×?×?×?! ×?×?קש×? ×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?×? ש×?ת×?פשר ש×?×?×?ש ×?פר×?קס×? HTTP (קר×? 127.0.0.1:8118) ×?×? SOCKS4A ×?×? SOCKS5 (קר×? 127.0.0.1:9050)</string>
-  <string name="menu_home">×?×?ת</string>
-  <string name="menu_browse">×?פ×?×£</string>
-  <string name="menu_settings">×?×?×?ר×?ת</string>
-  <string name="menu_log">ר×?ש×?×?</string>
-  <string name="menu_info">×¢×?ר×?</string>
-  <string name="menu_start">×?ת×?×?</string>
-  <string name="menu_stop">עצ×?ר</string>
-  <string name="menu_about">×?×?×?×?ת</string>
-  <string name="main_layout_download">×?×?ר×?×?</string>
-  <string name="main_layout_upload">×?×¢×?×?×?</string>
-  <string name="button_help">×¢×?ר×?</string>
-  <string name="button_close">ס×?×?ר</string>
-  <string name="button_about">×?×?×?×?ת</string>
-  <string name="button_clear_log">נק×? ר×?ש×?×?</string>
-  <string name="menu_verify">×?×?×?ק</string>
-  <string name="menu_exit">×?צ×?×?×?</string>
-  <string name="menu_scan">סר×?ק BridgeQR</string>
-  <string name="menu_share_bridge">שתף BridgeQR</string>
-  <string name="press_to_start">-× ×?×?×¢×? ×?ר×?×?×? ×?×?ת×?×?×?-</string>
-  <string name="pref_trans_proxy_group">פר×?קס×? שק×?×£ (ש×?רש × ×?רש)</string>
-  <string name="pref_trans_proxy_title">פר×?קס×? שק×?×£</string>
-  <string name="pref_trans_proxy_summary">×¢×?×?×?×? ×?×?×?×?×?×?×?ת ×¢×? ×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_all_title">×?×?×? ×?ר×? Tor</string>
-  <string name="pref_transparent_all_summary">תע×?×?ר ×?ר×? פר×?קס×?  ×¢×?×?ר ×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_port_fallback_title">×?פ×?×? פ×?ר×? פר×?קס×?</string>
-  <string name="pref_transparent_port_fallback_summary">×?×?×?ר×?: עק×?×£ פ×?ר×?×?×? נפ×?צ×?×? (80,443 ×?×?×?\'). *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_title">רש×?×?ת פ×?ר×?×?×?</string>
-  <string name="pref_transparent_port_summary">רש×?×?ת פ×?ר×?×?×? ×?פר×?קס×?. *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_dialog">×?×?×? פ×?ר×?×?×? ×?פר×?קס×?</string>
-  <string name="pref_has_root">×?ר×?ש×? ×?×?שת ש×?רש</string>
-  <string name="pref_has_root_summary">×?קש ×?×?ש×? ×¢×?×?×?× ×? ×¢×?×?ר ש×?×?×?ש ×?פר×?קס×? שק×?×£</string>
-  <string name="status_install_success">ק×?צ×?×? ×?ר×? ×?רצ×? ש×? Tor ×?×?תקנ×? ×?×?צ×?×?×?!</string>
-  <string name="status_install_fail">×?ק×?צ×?×? ×?ר×? ×?×?רצ×? ש×? Tor ×?×? × ×?תנ×? ×?×?תקנ×?. ×?×?קש×? ×?×?×?ק ×?ת ×?×?×?×? ×?×?×?×?×¢ ×? 
-tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ש×?×?×?ת ×?פ×?×?קצ×?×?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">×?×?×?×?ת Orbot</string>
-  <string name="btn_next">×?×?×?</string>
-  <string name="btn_back">×?ק×?×?×?</string>
-  <string name="btn_finish">ס×?×?×?</string>
-  <string name="btn_okay">×?×?ש×?ר</string>
-  <string name="btn_cancel">×?×?×?×?×?</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">פר×?×?×? ×?ס×?×?×?×?×? ש×? Orbot </string>
-  <string name="wizard_details_msg">Orbot ×?×?×? ×?פ×?×?קצ×?×?ת ק×?×? פת×?×? ×?×?×?×?×?ת ×?ת Tor, LibEvent ×?-Polipo. ×?×?×? ×?ת×?×?ר ×?רשת Tor ×?×?×?צע×?ת שרת פר×?קס×? HTTP ×?ק×?×?×? (8118) ×?שרת פר×?קס×? SOCKS (פ×?ר×? 9050). Orbot ×?×?×?×?×? ×?× ×?סף ×¢×? ×?רש×?×?ת ר×?×? ×?נת×? ×?ת ×?×? תע×?×?רת ×?×?×?× ×?רנ×? ש×? ×?×?×?ש×?ר ×?ר×? Tor ×?×?ר×?רת ×?×?×?×?.</string>
-  <string name="wizard_permissions_root">× ×?תנ×? ×?רש×?×?</string>
-  <string name="wizard_permissions_stock">×?רש×?×?ת Orbot</string>
-  <string name="wizard_premissions_msg_root">×?צ×?×?×?! ×?×?×?×?× ×? ×?×? ×?ש ×?×? ×?רש×?×?ת ש×?רש ×?×?×?פשר×?ת ×?ש×?×?×? Orbot. ×?× ×?× ×? נשת×?ש ×?×?×?×? ×?×?×? ×?×?×?×?×?×?.</string>
-  <string name="wizard_permissions_msg_stock">×?×?×?×? ש×?×? ×?×? × ×?רש, Orbot ×?×?×?×?×? ×?×?פ×?×? ×?×?×?×?ת ×?×?×? ×?×?ק ×?×?תר ×?×? ×?×?×?ש×?ר ש×?×? ×?ש ×?×?ש×? ×¢×?×?×?× ×?. תשת×?ש ×?×?פת×?ר ×?×?×?×? ×?×?×? ×?ק×?×? ×?×?×?×?ת ×¢×? ש×? Orbot !</string>
-  <string name="wizard_permissions_no_root">×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×?×?×?× ×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?, רק ת×?×?×?×? שתשת×?ש ×?×?פ×?×?קצ×?×?ת שנ×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot.</string>
-  <string name="wizard_permissions_consent">×?×?נת×? ×?×?× ×? ×?×¢×?×?×£ ×?×?×?ש×?×? ×?×?×? Superuser</string>
-  <string name="wizard_permission_enable_root">×?פשר ×?×?שת ש×?רש ×¢×?×?ר Orbot</string>
-  <string name="wizard_configure">×?×?×?ר ×¢×?×?×?×? ×?×?×?צע×?ת Tor</string>
-  <string name="wizard_configure_msg">Orbot × ×?תנת ×?×? ×?פשר×?ת ×?×?×?×?×? ×?ת ×?×? תע×?×?רת ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor ×?×? ×?×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?נפר×?.</string>
-  <string name="wizard_configure_all">×?שת×?ש ×?פר×?קס×? ×?×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="wizard_configure_select_apps">×?×?ר ×?פ×?×?קצ×?×?ת ×?ס×?×?×?×?ת ×¢×?×?ר Tor</string>
-  <string name="wizard_tips_tricks">Orbot ×?ת×?פשר ×¢×? ×?×?×? ×?פ×?×?קצ×?×?ת</string>
-  <string name="wizard_tips_msg">×?×?פ×?×?קצ×?×?ת ×?ת×?ת פ×?ת×?×? ×?×¢×?×?×?×? ×¢×? Orbot. ×?×?×¥ ×¢×? ×?×? ×?פת×?ר ×?×?תקנ×? ×?×?×?×?×?ת, ×?×? ש×?ת×? ×?×?×?×? ×?×?צ×?×? ×?×?ת×? ×?×?ר ×?×? ×? Google Play, ×?×?תר GuardianProject.info ×?×?
-×?ר×?  F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ת×?×?נת ×?סר×?×? ×?×?×?×?×?×? ×?×?×?×?×?×?ת ×?×?× ×?ר×?×?×?×?</string>
-  <string name="wizard_tips_proxy">×?×?×?ר×?ת פר×?קס×? - ×?×?×? ×?×?×? ×?×?×?×?×?ר ×?פ×?×?קצ×?×?ת ×?×¢×?×?×? ×¢×? Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ×?פ×?×?קצ×?×?ת ×?× ×?×¢ ×?×?פ×?ש</string>
-  <string name="wizard_tips_twitter">ק×?×¢ פר×?קס×? Twitter ×?×?×?ר×? \"localhost\" ×?×?פ×?ר×? 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ×?ער×? ש×?×¢×?ר×?×? ×?×¢×?ת×?× ×?×?×? ×¢×? ש×?×?×?ש ×?-Tor ×?×?×?× ×? ×¢×? ×¢×?×?×?ת×?.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">×?×?×?ר×?ת פר×?קס×?</string>
-  <string name="wizard_proxy_help_msg">×?×? ×?פ×?×?קצת ×?×?× ×?ר×?×?×?×? ש×?ת×? ×?שת×?ש ת×?×?×?ת ×?פר×?קס×? ×?×?×?סס HTTP ×?×? SOCKS, ת×?×?×? ×?×?×?×?×?ר ×?×?ת×? ×?×¢×?×?×? ×¢×? Orbot ת×?ת Tor. \n\n\n ×?×?×?×?ר×?ת ×?×?: ש×? ×?שרת ×?×?×? 127.0.0.1 ×?×? \"localhost\". ×¢×?×?ר HTTP, ×?פ×?ר×? ×?×?×? 8118. ×¢×?×?ר SOCKS, ×?פ×?ר×? ×?×?×? 9050. ×¢×?×?×? ×?×?שת×?ש ×?SOCKS4A ×?×? SOCKS5 ×?×? ×?פשר.\n \n\n\n ת×?×?×? ×?×?×?×?×? ×¢×?×? ×?×?×?×?ת פר×?קס×? ×?×?× ×?ר×?×?×?×? ת×?ת ×¢×?×?×? ×?ש×?×?×?ת ×?נפ×?צ×?ת ש×?× ×? ×?×?ת×?×?ת: http://tinyurl.com/proxyandroid </string>
-  <string name="wizard_final">Orbot ×?×?×?×?!</string>
-  <string name="wizard_final_msg">×?×?×?×?×?× ×? ×?נש×?×? ×?ר×?×?×? ×?×¢×?×?×? ×?שת×?ש×?×? ×?Tor ×?ס×?×?×?ת ר×?×?ת.\n\n ×¢×?ת×?× ×?×?×? ×?×?×?×?×?ר×?×?, פע×?×?×? ×?×?×?×?×?ת ×?×?×?, ש×?×?ר×?×?, ×?×?×?×?×?×?, ת×?×?×?×?×?×?, ×?×?ר×?×? ×?×?ש×?ר×?×? ×?×?×?×?×?×?×? ×?×?×? ×?×?ר×?×?×? פש×?×?×?×?... ×?×¢×?ש×?×? ×?×? ×?ת×?!</string>
-  <string name="wizard_exit_at_first_screen_toast">×?× ×? ×?×?×?ר ×?ת Orbot ×?פנ×? שת×?×?×? ×?×?ת×?×?×? ×?×?שת×?ש ×?×?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">×?×?ר ×?×? ×?×?×?×?×? ×?ת ×?פ×?פ×? ×?רשת ש×?×? ×?×?×?×? https://check.torproject.org ×?×?×? ×?ר×?×?ת ×?×? Orbot ×?×?×?×?ר×? ×?ר×?×?×? ×?×?×? ×?×? ×?ת×? ×?×?×?×?ר ×?רשת Tor.</string>
-  <string name="pref_hs_group">×?×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="pref_general_group">×?×?×?×?</string>
-  <string name="pref_start_boot_title">×?ת×?×? ×?ת Orbot ×?×?×?×?קת ×?×?×?ש×?ר</string>
-  <string name="pref_start_boot_summary">×?ת×?×? ×?ת Orbot ×?×?ת×?×?ר ×?רשת Tor ×?×?×?×?×?×?×?ת ×?×?שר ×?×?×?ש×?ר × ×?×?ק</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">×?×?×?ר×?</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">×?רש×?×?ת</string>
-  <string name="wizard_permissions_root_msg1">×?ת×? ×?×?×?×? ×?×?×¢× ×?ק ×?×?פ×?×?קצ×?×? Orbot ×?×?שת \'Superuser\' ×?×?×? ×?×?פשר ×?×?פ×?×?× ×?×? ×?תק×?×?×?×? ×?×?×? ×?×?ש×?, פר×?קס×? שק×?×£.</string>
-  <string name="wizard_permissions_root_msg2">×?×? ×?ת×? ×?×? ר×?צ×? ×?עש×?ת ×?ת ×?×?, ×?× ×? ×?קפ×? ×?×?שת×?ש ×?×?פ×?×?קצ×?×?ת ש×?×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-×?×?ש×?×?×?×? ×?×?פע×?×?×?</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ×?פ×?×?קצ×?×?ת ×?סר×?×? ×¢×? ×?צפנת Off-the-Record</string>
-  <string name="wizard_tips_play">×?צ×? ×?ת ×?×? ×?פ×?×?צ×?×?ת Guardian Project ×?צ×? Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">פר×?קס×? שק×?×£</string>
-  <string name="wizard_transproxy_msg">×?×? ×?×?פשר ×?×?פ×?×?קצ×?×?ת ש×?×? ×?ר×?×¥ ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ר×? רשת Tor ×?×?×? ×?×? תצ×?ר×?.</string>
-  <string name="wizard_transproxy_hint">(ס×?×? ת×?×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?)</string>
-  <string name="wizard_transproxy_none">×?×?×?×?</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">×?×?פשר ×¢×?×?×?×? ×¢×? פר×?קס×? שק×?×£ ×¢×?×?ר רשת ×?×?×?×?×?×?ת ×?×?×?ש×?ר×?  USB Tethered (×?×?רש ×?ת×?×?×? ×?×?×?ש)</string>
-  <string name="button_grant_superuser">×?ר×?ש ×?×?ש×?ר Superuser</string>
-  <string name="pref_select_apps">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_select_apps_summary">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_node_configuration">×?×?×?ר×?ת Node</string>
-  <string name="pref_node_configuration_summary">ק×?×?×?×?ת ×?×?×?ר×?ת ×?תק×?×?×?ת ש×?×?×?×?×?ת ×?×?פ×?×?ת ×?ת ×?×?× ×?× ×?×?×?×?ת ש×?×?</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">×?×?×?×¢×?ת ×?צ×?×¢, ×?×?× ×?×?×?×?, ×?רצ×?ת ×?×?ת×?×?×?ת ×¢×?×?ר ×?×?×¢×?ר ×?ר×?ש×?×?</string>
-  <string name="pref_entrance_node_dialog">×?×?נס Entrance Nodes</string>
-  <string name="button_proxy_all">×?×¢×?ר ×?×?×? ×?ר×? פר×?קס×?</string>
-  <string name="button_proxy_none">×?×? תשת×?ש ×?פר×?קס×?</string>
-  <string name="button_invert_selection">×?פ×?×? ×?×?×?ר×?</string>
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
-  <string name="pref_proxy_type_summary">פר×?×?×?ק×?×? ש×?×?×?ש ×?שרת פר×?קס×?:  HTTP, HTTPS, Socks4,Socks5</string>
-  <string name="pref_proxy_type_dialog">ס×?×? ×?פר×?קס×?</string>
-  <string name="pref_proxy_host_title">×?×?ר×? ש×? Outbound Proxy</string>
-  <string name="pref_proxy_host_summary">ש×? ×?×?ר×? שרת פר×?קס×?</string>
-  <string name="pref_proxy_host_dialog">×?×?נס ×?×?ר×? פר×?קס×?</string>
-  <string name="pref_proxy_port_title">פ×?ר×? ש×? Outbound Proxy</string>
-  <string name="pref_proxy_port_summary">פ×?ר×? שרת פר×?קס×?</string>
-  <string name="pref_proxy_port_dialog">×?×?נס פ×?ר×? ש×? פר×?קס×?</string>
-  <string name="pref_proxy_username_title">ש×? ×?שת×?ש ש×? Outbound Proxy</string>
-  <string name="pref_proxy_username_summary">ש×? ×?שת×?ש פר×?קס×? (רש×?ת)</string>
-  <string name="pref_proxy_username_dialog">×?×?×? ש×? ×?שת×?ש פר×?קס×?</string>
-  <string name="pref_proxy_password_title">ס×?ס×?×? ש×? Outbound Proxy</string>
-  <string name="pref_proxy_password_summary">ס×?ס×?ת פר×?קס×? (רש×?ת)</string>
-  <string name="pref_proxy_password_dialog">×?×?×? ס×?ס×?ת פר×?קס×?</string>
-  <string name="status">ס×?×?×?ס</string>
-  <string name="setting_up_full_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£...</string>
-  <string name="setting_up_app_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס ×?פ×?×?קצ×?×?ת...</string>
-  <string name="transparent_proxying_enabled">פר×?קס×? שק×?×£ ×?×?×?פשר</string>
-  <string name="transproxy_enabled_for_tethering_">פר×?קס×? שק×?×£ ×?×?×?פשר ×? Tathering!</string>
-  <string name="warning_error_starting_transparent_proxying_">×?×?×?ר×?: ש×?×?×?×? ×?ת×?×?×?×? ×?ת ×?פר×?קס×? ×?שק×?×£!</string>
-  <string name="transproxy_rules_cleared">×?×?×?×? TransProxy ×?×?×?ר×?</string>
-  <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo רץ ×¢×? פ×?ר×?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס פ×?ר×?...</string>
-  <string name="bridge_error">ש×?×?×?ת ×?שר</string>
-  <string name="error">ש×?×?×?×?</string>
-  <string name="exit_nodes">צ×?ת×? ×?צ×?×?×?</string>
-  <string name="enter_exit_nodes">×?×?×? צ×?ת×? ×?צ×?×?×?</string>
-  <string name="exclude_nodes">צ×?ת×?×? ×?×?צ×?×?×?</string>
-  <string name="enter_exclude_nodes">×?×?×? צ×?ת×?×? ×?×?צ×?×?×?</string>
-  <string name="strict_nodes">צ×?ת×?×? קפ×?× ×?×?</string>
-  <string name="use_only_these_specified_nodes">×?שת×?ש *רק* ×?צ×?ת×?×? ×?צ×?×?× ×?×? ×?×?×?</string>
-  <string name="bridges">×?שר×?×?</string>
-  <string name="use_bridges">×?שת×?ש ×?×?שר×?×?</string>
-  <string name="bridges_obfuscated">×?שר×?×? ×?×¢×?רפ×?×?×?</string>
-  <string name="ip_address_and_port_of_bridges">×?ת×?×?ת ×?-IP ×?×?צ×?×?×? ש×? ×?×?שר×?×?</string>
-  <string name="enter_bridge_addresses">×?×?נס ×?ת×?×?×?ת ×?שר</string>
-  <string name="relays">×?×?סר×?×?</string>
-  <string name="relaying">×?×?ס×?ר</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">×?פשר ×?×?×?ש×?ר ש×?×? ×?×?×?×?ת ת×?נת ×?×?סר ש×?×?× × ×? ×?צ×?×?×?</string>
-  <string name="relay_port">פ×?ר×? ×?×?×?סר</string>
-  <string name="listening_port_for_your_tor_relay">פ×?ר×? ×?×?×?×?×? ×¢×?×?ר Tor relay</string>
-  <string name="enter_or_port"> ×?×?נס ×?צ×?×?ת OR</string>
-  <string name="relay_nickname">×?×?× ×?×? ×?×?×?סר</string>
-  <string name="the_nickname_for_your_tor_relay">×?×?×?× ×?×? ×?×?×?סר Tor ש×?×?</string>
-  <string name="enter_a_custom_relay_nickname">×?×?×? ×?×?× ×?×? ×¢×?×?ר ×?×?סר</string>
-  <string name="reachable_addresses">×?ת×?×?×?ת ×?×?×?ש×? ×?×?</string>
-  <string name="reachable_ports">פ×?ר×?×?×? ×?×?×?ש×? ×?×?</string>
-  <string name="enter_ports">×?×?×? פ×?ר×?×?×?</string>
-  <string name="enable_hidden_services">×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="enter_localhost_ports_for_hidden_services">×?×?×? פ×?ר×?×?×? ש×? localhost ×¢×?×?ר ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="hidden_service_ports">פ×?ר×? ×?ש×?ר×?ת×?×? ×?נסתר×?×?</string>
-  <string name="project_home">×?תר×? ×?פר×?×?ק×?:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">×?רש×?×?×? ש×? Tor</string>
-  <string name="https_torproject_org">https://torproject.org/</string>
-  <string name="third_party_software">ת×?×?× ×?-צ×?-×?׳: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</string>
+    <string name="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
   <string name="something_bad_happened">×?ש×?×? רע ×?תר×?ש. ×?×?×?ק ×?ת ×?×?×?×?×?</string>
-  <string name="hidden_service_on">ש×?ר×?ת נסתר ×?:</string>
-  <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
+    <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
   <string name="unable_to_start_tor">×?×? ×?ס×?×?×? ×?×?ת×?×?×? ×?ת Tor:</string>
-  <string name="unable_to_reset_tor">×?ת×?×? ×?ת ×?×?×?ש×?ר ש×?×?, ×?×?×? ×?פשר×?ת ×?×?פע×?×? ×?×?×?ש ×?ת Tor!</string>
-  <string name="pref_use_sys_iptables_title">×?שת×?ש ×?×?ר×?ר×?ת ×?×?×?×?×? ש×? iptables</string>
-  <string name="pref_use_persistent_notifications">×?ש×?×?ר ת×?×?×? ×?ת ×?×?×?ק×?×? ×?סר×?×? ×?×?×?×? ×?ש×?×?ר×?×?×? ×?×?×?×?ר</string>
-  <string name="notification_using_bridges">×?שר×?×? ×?×?×?פשר×?×?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">שפ×?</string>
-  <string name="set_locale_summary">×?×?ר ×?ת ×?×?ק×?×?×?×?ת ×?×?שפ×? ש×? Orbot</string>
-  <string name="wizard_locale_title">×?×?ר שפ×?</string>
-  <string name="wizard_locale_msg">×?ש×?ר ×?ר×?רת ×?×?×?×? ×?×? ×?×?×?×£ ×?שפ×? ×?× ×?×?×?×?ת</string>
-  <string name="powered_by">×?×?פע×? ×?×?×?צע×?ת Tor</string>
-  <string name="btn_save_settings">ש×?×?רת ×?×?×?ר×?ת</string>
-  <string name="no_internet_connection_tor">×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?; ת×?ר ×?×?ת×?×?...</string>
-  <string name="bandwidth_">ר×?×?×? פס:</string>
-  <string name="down">×?×?×?</string>
-  <string name="up">×?×¢×?×?</string>
-  <string name="pref_disable_network_summary">×?×?×? ×?ת Tor ×?×?שר ×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?</string>
-  <string name="newnym">×?×?×?פת ×?×? ×?×?×?ת Tor ×?×?ש×?!</string>
-  <string name="menu_use_chatsecure">×?פע×? ×?ת ChatSecure</string>
-  <string name="permission_manage_tor_label">× ×?×? Tor</string>
-  <string name="permission_manage_tor_description">×?פשר ×?ת ×?פ×?×?קצ×?×? ×?×? ×?×?×? ×?ש×?×?×? ×?ש×?ר×?ת Tor</string>
-  <string name="install_apps_">×?×?תק×?×? ×?פ×?×?קצ×?×??</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">×?×?×? ×?×?×?×?ר ×?רשת. ×?×?×?×? ×?ת Tor....</string>
+    <string name="no_internet_connection_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="your_tor_public_ips_">×?IPs ×?×?×?צ×?× ×?×?×? ש×?×? ×¢×? Tor:</string>
-  <string name="you_do_not_have_root_access_enabled">×?×?×? ×?×? ×?×?שת ר×?×? ×?×?×?פשרת</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצ×?ר×? ×?×?×?×?ת ×?×?×?פע×?×? ×?ת Orbot ×¢×? ×?נת ×?×?×?×?×? ×?ת ×?ש×?× ×?×? ×?×?×?×?ר×?ת.</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="menu_qr">ק×?×? QR</string>
-  <string name="get_bridges_email">×?×?×?\"×?</string>
-  <string name="get_bridges_web">×?תר</string>
-  <string name="activate">×?פע×?</string>
-  <string name="send_email">ש×?×? ×?×?×?\"×?</string>
-  <string name="standard_browser">×?פ×?פ×? ר×?×?×?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hi/strings.xml b/orbotservice/src/main/res/values-hi/strings.xml
index 9156dfa2..a3437449 100644
--- a/orbotservice/src/main/res/values-hi/strings.xml
+++ b/orbotservice/src/main/res/values-hi/strings.xml
@@ -2,25 +2,12 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">�रब�� �� म�फ�त ��प</string>
-  <string name="menu_browse">ब�रा��़</string>
-  <string name="menu_settings">स��ि���स</string>
-  <string name="menu_info">मदद</string>
-  <string name="button_help">मदद</string>
-  <string name="button_close">ब�द  �र�� </string>
-  <string name="wizard_title">Orbot</string>
-  <string name="btn_back">वापस</string>
-  <string name="btn_cancel">रद�द �र�� </string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">प�र���स� स�����</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">समन�य </string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">��� नह��</string>
-  <string name="status">स�थिति</string>
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hr-rHR/strings.xml b/orbotservice/src/main/res/values-hr-rHR/strings.xml
index 717ae740..b80fb51c 100644
--- a/orbotservice/src/main/res/values-hr-rHR/strings.xml
+++ b/orbotservice/src/main/res/values-hr-rHR/strings.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">Polazno</string>
-  <string name="menu_browse">Pretraži</string>
-  <string name="menu_settings">Postavke</string>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="menu_about">O</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zatvori</string>
-  <string name="button_about">O</string>
-  <string name="menu_exit">Izlaz</string>
-  <string name="btn_back">Povratak</string>
-  <string name="btn_cancel">Odustani</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Postavke Proxya</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">OpÄ?enito</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Upozorenje</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Nepoznato</string>
-  <string name="status">Status</string>
-  <string name="error">Greška</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Spremi postavke</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hr/strings.xml b/orbotservice/src/main/res/values-hr/strings.xml
index 8d341f35..32329f31 100644
--- a/orbotservice/src/main/res/values-hr/strings.xml
+++ b/orbotservice/src/main/res/values-hr/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot je besplatna proxy aplikacija koja omoguÄ?uje ostalim aplikacijama da koriste internet sigurnije. Orbot koristi Tor za enkripciju VaÅ¡eg Internet prometa, a zatim ga skriva Å¡aljuÄ?i ga kroz seriju raÄ?unala diljem svijeta. Tor je besplatan software i otvorena mreža koja pomaže u borbi protiv nadzora mreže koji ugrožava osobne slobode i privatnost, povjerljive poslovne aktivnosti i odnose, te pomaže u borbi protiv analize prometa.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">pokreni i zaustavi Tor</string>
-  <string name="tor_proxy_service_process">torproxyusluga</string>
-  <string name="status_starting_up">Orbot se pokreÄ?e...</string>
+    <string name="status_starting_up">Orbot se pokreÄ?e...</string>
   <string name="status_activated">Spojen na Tor mrežu</string>
   <string name="status_disabled">Orbot je deaktiviran</string>
   <string name="status_shutting_down">TorService se gasi</string>
   <string name="tor_process_starting">PokreÄ?em Tor klijent...</string>
   <string name="tor_process_complete">gotovo.</string>
-  <string name="tor_process_waiting">Ä?ekam.</string>
-  <string name="not_anonymous_yet">UPOZORENJE: Vaš promet još nije anoniman! Molimo konfigurirajte Vaše aplikacije da koriste HTTP proxy 127.0.0.1:8118 ili SOCKS4A ili SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Polazno</string>
-  <string name="menu_browse">Pretraži</string>
-  <string name="menu_settings">Postavke</string>
-  <string name="menu_log">Dnevnik</string>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">PoÄ?etak</string>
-  <string name="menu_stop">Zaustavi</string>
-  <string name="menu_about">O</string>
-  <string name="menu_promo_apps">Dohvati aplikacije...</string>
-  <string name="main_layout_download">Preuzimanje</string>
-  <string name="main_layout_upload">Slanje</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zatvori</string>
-  <string name="button_about">O</string>
-  <string name="button_clear_log">OÄ?isti Dnevnik</string>
-  <string name="menu_verify">Provjeri</string>
-  <string name="menu_exit">Izlaz</string>
-  <string name="menu_scan">Skeniraj BridgeQR</string>
-  <string name="menu_share_bridge">Podijeli BridgeQR</string>
-  <string name="press_to_start">- dugi klik za poÄ?etak -</string>
-  <string name="pref_trans_proxy_group">Transparentni Proxy (Zahtijeva Root)</string>
-  <string name="pref_trans_proxy_title">Transparentni Proxy</string>
-  <string name="pref_trans_proxy_summary">Automatska Torifikacija Aplikacija</string>
-  <string name="pref_transparent_all_title">Tor Sve</string>
-  <string name="pref_transparent_all_summary">Proxy promet svih aplikacija kroz Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Rezerva</string>
-  <string name="pref_transparent_port_fallback_summary">UPOZORENJE: Zaobilazi uobiÄ?ajene portove (80, 443, itd.) *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi.</string>
-  <string name="pref_transparent_port_title">Popis portova</string>
-  <string name="pref_transparent_port_summary">Popis portova za proxy. *KORISTITE SAMO* ako \'Sve\' ili \'Aplikacije\' mod ne radi</string>
-  <string name="pref_transparent_port_dialog">Unesite port za proxy</string>
-  <string name="pref_has_root">Zatraži Root Pristup</string>
-  <string name="pref_has_root_summary">Zatraži root pristup za transparentni proxy</string>
-  <string name="status_install_success">Tor izvršne datoteke uspješno instalirane!</string>
-  <string name="status_install_fail">Tor izvrÅ¡ne datoteke nije bilo moguÄ?e instalirati. Molimo provjerite dnevnik i obavijestite tor-assistans@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Greška u Aplikaciji</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O Orbot-u</string>
-  <string name="btn_next">SljedeÄ?e</string>
-  <string name="btn_back">Natrag</string>
-  <string name="btn_finish">Završi</string>
-  <string name="btn_okay">U redu</string>
-  <string name="btn_cancel">Odustani</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Detalji o Orbot-u</string>
-  <string name="wizard_details_msg">Orbot je otvorena aplikacija koja sadrži Tor, LibEvent i Polipo. Pruža lokalni HTTP proxy (8118) i SOCKS proxy (9050) u Tor mrežu. Orbot ima moguÄ?nost, na root-anom ureÄ?aju, slati sav promet kroz Tor.</string>
-  <string name="wizard_permissions_root">Dopuštenje Odobreno</string>
-  <string name="wizard_permissions_stock">Orbot Dopuštenja</string>
-  <string name="wizard_premissions_msg_root">OdliÄ?no! UoÄ?ili smo da imate root dopuÅ¡tenja omoguÄ?ena za Orbot. Koristit Ä?emo ovu moÄ? mudro.</string>
-  <string name="wizard_permissions_msg_stock">Iako nije neophodan, Orbot može postati moÄ?an alat ako vaÅ¡ ureÄ?aj ima root pristup. Koristite gumb niže da bi odobrili Orbot-u supermoÄ?i!</string>
-  <string name="wizard_permissions_no_root">Ako nemate root pristup ili nemate pojma o Ä?emu priÄ?amo, osigurajte da koristite aplikacije koje rade s Orbot-om.</string>
-  <string name="wizard_permissions_consent">Razumijem i želim nastaviti bez Superuser-a</string>
-  <string name="wizard_permission_enable_root">Odobri Root za Orbot</string>
-  <string name="wizard_configure">Konfiguriraj Torifikaciju</string>
-  <string name="wizard_configure_msg">Orbot Vam daje opciju da usmjerite sav aplikacijski promet kroz Tor ILI odaberete aplikacije individualno.</string>
-  <string name="wizard_configure_all">Proxy Sve Aplikacije Kroz Tor</string>
-  <string name="wizard_configure_select_apps">Odaberi Individualne Aplikacije za Tor</string>
-  <string name="wizard_tips_tricks">Orbot-omoguÄ?ene Aplikacije</string>
-  <string name="wizard_tips_msg">Aplikacije dolje su napravljene da rade sa Orbot-om. Kliknite svaki gumb da instalirate odmah ili ih kasnije možete naÄ?i na Google Play-u, na GuardianProject.info web stranici ili preko F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Sigurni klijent instant poruka za Adnroid</string>
-  <string name="wizard_tips_proxy">Proxy Postavke - NauÄ?ite kako konfigurirati aplikacije za rad s Orbot-om</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo aplikacija za pretraživanje</string>
-  <string name="wizard_tips_twitter">Namjesti Twitter proxy na host \"localhost\" i port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - napravite priÄ?u i prepustite sigurnost Tor-u!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Postavke Proxy-a</string>
-  <string name="wizard_proxy_help_msg">Ako Android aplikacija koju koristite podržava koriÅ¡tenje HTTP ili SOCKS proxy-a, možete ju konfigurirati da se spaja na Orbot i koristi Tor.\n\n\n Postavke su 127.0.0.1 ili \"localhost\". Za HTTP postavke porta su 8118. Za SOCKS, proxy je 9050. Trebali bi koristiti SOCKS4A ili SOCKS5 ako je moguÄ?e.\n\n\n Možete nauÄ?iti viÅ¡e o proxy-ranju na Androidu putem Ä?esto postavljenih pitanja: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot je spreman!</string>
-  <string name="wizard_final_msg">Milijuni ljudi diljem svijeta koriste Tor iz raznih razloga.\n\nNovinari i blogeri, pravobranitelji, policijski službenici, vojnici, korporacije, graÄ?ani represivnih režima i uobiÄ?ajeni graÄ?ani... a od sad i Vi!</string>
-  <string name="wizard_exit_at_first_screen_toast">Molimo konfigurirajte Orbot prije nego ga poÄ?nete koristiti!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">UspjeÅ¡no ste spojeni na Tor mrežu - ali ovo NE znaÄ?i da je VaÅ¡ ureÄ?aj siguran. Možete koristiti gumb \'Preglednik\' kako bi testirali svoju vezu. \n\nPosjetite nas na https://guardianproject.info/apps/orbot ili nam poÅ¡aljite email na help@xxxxxxxxxxxxxxxxxxxx kako bi nauÄ?ili viÅ¡e.</string>
-  <string name="tor_check">Ovo Ä?e otvoriti VaÅ¡ web preglednik na https://check.torproject.org kako bi vidjeli je li Orbot konfiguriran i jeste li povezani na Tor.</string>
-  <string name="pref_hs_group">Hosting Skrivenih Usluga</string>
-  <string name="pref_general_group">OpÄ?enito</string>
-  <string name="pref_start_boot_title">Pokreni Orbot pri pokretanju</string>
-  <string name="pref_start_boot_summary">Automatski pokreni Orbot i poveži Tor kad se Android ureÄ?aj pokrene</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot donosi Tor na Android!\n\nTor pomaže u borbi protiv filtriranja prometa, analize prometa i nadzora mreže koji ugrožava privatnost, povjerljive informacije i osobne veze.\n\nOvaj Ä?arobnjak Ä?e Vam pomoÄ?i u konfiguraciji Orbot-a i Tor-a na VaÅ¡em ureÄ?aju.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Upozorenje</string>
-  <string name="wizard_warning_msg">Samo instaliranje Orbot-a neÄ?e automatski anonimizirati VaÅ¡ mobilni promet.\n\nMorate ispravno konfigurirati Orbot, svoj ureÄ?aj i ostale aplikacije da uspjeÅ¡no koriste Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Dopuštenja</string>
-  <string name="wizard_permissions_root_msg1">Opcionalno, možete odobriti Orbot-u \'Superuser\' pristup da bi omoguÄ?ili napredne znaÄ?ajke, kao Å¡to je Transparentni Proxy.</string>
-  <string name="wizard_permissions_root_msg2">Ako ne želite ovo, budite sigurni da koristite aplikacije koje su napravljene da rade s Orbotom</string>
-  <string name="wizard_permissions_no_root_msg">Ä?ini se da VaÅ¡ ureÄ?aj nije root-an.\n\nMolimo probajte \'Aplikacije\' naÄ?in rada na glavnom ekranu.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-OmoguÄ?ene Aplikacije</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Sigurna aplikacija za Ä?avrljanje s Povjerljivom Enkripcijom</string>
-  <string name="wizard_tips_orweb">Orfox: Preglednik s pojaÄ?anom privatnosti koji radi kroz Tor</string>
-  <string name="wizard_tips_play">PronaÄ?i sve Guardian Projekt aplikacije na Google Play</string>
-  <string name="wizard_tips_fdroid">PronaÄ?i sve Guardian Project aplikacije na F-Droid-u</string>
-  <string name="wizard_tips_fdroid_org">PronaÄ?i sve Guardian Project aplikacije na https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentni Proxy</string>
-  <string name="wizard_transproxy_msg">Ovo omoguÄ?ava VaÅ¡im aplikacijama da automatski rade kroz Tor mrežu bez ikakve konfiguracije.</string>
-  <string name="wizard_transproxy_hint">(Stavite kvaÄ?icu ako nemate pojma o Ä?emu priÄ?amo)</string>
-  <string name="wizard_transproxy_none">Ništa</string>
-  <string name="pref_transparent_tethering_title">Tor Privezanje</string>
-  <string name="pref_transparent_tethering_summary">OmoguÄ?i Tor Transparentni Proxy za Wi-Fi i USB privezane ureÄ?aje (zahtijeva ponovno pokretanje)</string>
-  <string name="button_grant_superuser">Zatraži Pristup Superuser-u</string>
-  <string name="pref_select_apps">Odaberi Aplikacije</string>
-  <string name="pref_select_apps_summary">Odaberi Aplikacije koje Ä?e se usmjeriti kroz Tor</string>
-  <string name="pref_node_configuration">Konfiguracija Ä?vora</string>
-  <string name="pref_node_configuration_summary">Ovo su napredne postavke koje mogu smanjiti Vašu anonimnost</string>
-  <string name="pref_entrance_node">Ulazni Ä?vorovi</string>
-  <string name="pref_entrance_node_summary">Otisci prstiju, nadimci, države i adrese za prvi skok</string>
-  <string name="pref_entrance_node_dialog">Unesi Ulazne Ä?vorove</string>
-  <string name="pref_allow_background_starts_title">Dozvoli pokretanja u pozadini</string>
-  <string name="pref_allow_background_starts_summary">Dopusti bilo kojoj aplikaciji da kaže Orbot-u da pokrene Tor i povezane usluge</string>
-  <string name="button_proxy_all">Proxy-raj sve</string>
-  <string name="button_proxy_none">Ne proxy-raj ništa</string>
-  <string name="button_invert_selection">Izokreni odabrano</string>
-  <string name="pref_proxy_title">Izlazni Mrežni Proxy (Opcionalno)</string>
-  <string name="pref_proxy_type_title">Vrsta Izlaznog Proxy-a</string>
-  <string name="pref_proxy_type_summary">Protokol koji se koristi za proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Unesi Tip Proxyj-a</string>
-  <string name="pref_proxy_host_title">DomaÄ?in Izlaznog Proxy-a</string>
-  <string name="pref_proxy_host_summary">Ime domaÄ?ina Proxy Poslužitelja</string>
-  <string name="pref_proxy_host_dialog">Unesi DomaÄ?ina Proxy-a</string>
-  <string name="pref_proxy_port_title">Port Izlaznog Proxy-a</string>
-  <string name="pref_proxy_port_summary">Port Proxy Poslužitelja</string>
-  <string name="pref_proxy_port_dialog">Unesite port za proxy.</string>
-  <string name="pref_proxy_username_title">Proxy izlazno korisniÄ?ko ime</string>
-  <string name="pref_proxy_username_summary">Proxy korisniÄ?ko ime (Opcionalno)</string>
-  <string name="pref_proxy_username_dialog">Unesite Proxy korisniÄ?ko ime</string>
-  <string name="pref_proxy_password_title">Proxy izlazna lozinka</string>
-  <string name="pref_proxy_password_summary">Proxy lozinka (Opcionalno)</string>
-  <string name="pref_proxy_password_dialog">Unesite Proxy lozinku</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Postavljam potpuno transparentan proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na aplikaciji...</string>
-  <string name="transparent_proxying_enabled">Transparentni Proxy OMOGUÄ?ENO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy omoguÄ?en za Privezivanje!</string>
-  <string name="warning_error_starting_transparent_proxying_">UPOZORENJE: greška pri pokretanju transparentnog proxy-a!</string>
-  <string name="transproxy_rules_cleared">TransProxy pravila oÄ?iÅ¡Ä?ena</string>
-  <string name="couldn_t_start_tor_process_">Nije moguÄ?e zapoÄ?eti Tor proces:</string>
-  <string name="privoxy_is_running_on_port_">Polipo je pokrenut na portu:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Postavljam transparentan proxy zasnovan na portu...</string>
-  <string name="bridge_error">Greška Mosta</string>
-  <string name="bridge_requires_ip">Da bi koristili mostove, morate unijeti bar jednu IP adresu mosta.</string>
-  <string name="send_email_for_bridges">PoÅ¡aljite email koristeÄ?i gmail raÄ?un na bridges@xxxxxxxxxxxxxx samo s tekstom \"get bridges\" u sadržaju.</string>
-  <string name="error">Greška</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše ReachableAddresses postavke su uzrokovale iznimku!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Nije moguÄ?e zapoÄ?eti Tor proces:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Vaše ReachableAddresses postavke su uzrokovale iznimku!</string>
   <string name="your_relay_settings_caused_an_exception_">Vaše postavke releja su uzrokovale iznimku!</string>
-  <string name="exit_nodes">Izlazni Ä?vorovi</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Otisci prstiju, nadimci, države i adrese za zadnji skok</string>
-  <string name="enter_exit_nodes">Unesi Izlazne Ä?vorove</string>
-  <string name="exclude_nodes">Nemoj UkljuÄ?iti Ä?vorove</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Otisci prstiju, nadimci, države i adrese koje ne treba ukljuÄ?iti</string>
-  <string name="enter_exclude_nodes">Unesi Ä?vorove koje treba iskljuÄ?iti</string>
-  <string name="strict_nodes">Striktni Ä?vorovi</string>
-  <string name="use_only_these_specified_nodes">Koristi *samo* ove navedene Ä?vorove</string>
-  <string name="bridges">Mostovi</string>
-  <string name="use_bridges">Koristi Mostove</string>
-  <string name="bridges_obfuscated">Skriveni Mostovi</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">OmoguÄ?i naizmjeniÄ?ne ulazne Ä?vorove u Tor Mrežu</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">OmoguÄ?ite ako su postavljeni mostovi skriveni mostovi</string>
-  <string name="ip_address_and_port_of_bridges">IP adresa i port mostova</string>
-  <string name="enter_bridge_addresses">Unesi Adrese Mostova</string>
-  <string name="relays">Releji</string>
-  <string name="relaying">Prenošenje</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">OmoguÄ?ite svom ureÄ?aju da bude ne-izlazni relej</string>
-  <string name="relay_port">Relej Port</string>
-  <string name="listening_port_for_your_tor_relay">Port za slušanje Vašeg Tor releja</string>
-  <string name="enter_or_port">Unesi OR port</string>
-  <string name="relay_nickname">Nadimak releja</string>
-  <string name="the_nickname_for_your_tor_relay">Nadimak za Vaš Tor relej</string>
-  <string name="enter_a_custom_relay_nickname">Unesi prilagoÄ?eni nadimak releja</string>
-  <string name="reachable_addresses">Dostupne Adrese</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Pokreni kao klijent iza firewall-a sa restriktivnim pravilima</string>
-  <string name="reachable_ports">Dostupni portovi</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Portovi dostupni iza restriktivnog firewall-a</string>
-  <string name="enter_ports">Unesi portove</string>
-  <string name="enable_hidden_services">Hosting Skrivenih Usluga</string>
-  <string name="run_servers_accessible_via_the_tor_network">dopusti poslužitelju na ureÄ?aju da bude dostupan preko Tor mreže</string>
-  <string name="enter_localhost_ports_for_hidden_services">unesi localhost portove za skrivene usluge</string>
-  <string name="hidden_service_ports">Portovi za skrivene usluge</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresirano ime za vašu skrivenu uslugu (generirano automatski)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">omoguÄ?i izlaznost dnevnika o otkrivanju greÅ¡ke (mora koristiti adb ili aLogCat za pregled)</string>
-  <string name="project_home">Dom(ovi) Projekta:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor licenca</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software treÄ?e strane:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Aplikacija želi otvoriti port %S skrivenog poslužitelja Tor mreži. Ovo je sigurno ako vjerujete aplikaciji.</string>
-  <string name="found_existing_tor_process">pronaÄ?eni postojeÄ?i Tor procesi...</string>
+    <string name="found_existing_tor_process">pronaÄ?eni postojeÄ?i Tor procesi...</string>
   <string name="something_bad_happened">Nešto loše se dogodilo. Provjerite dnevnik</string>
-  <string name="hidden_service_on">skrivena usluga na:</string>
-  <string name="unable_to_read_hidden_service_name">nije moguÄ?e proÄ?itati ime skrivene usluge</string>
+    <string name="unable_to_read_hidden_service_name">nije moguÄ?e proÄ?itati ime skrivene usluge</string>
   <string name="unable_to_start_tor">Nije moguÄ?e pokrenuti Tor:</string>
-  <string name="unable_to_reset_tor">Ponovno pokrenit svoj ureÄ?aj, nije moguÄ?e ponovno pkrenuti Tor!</string>
-  <string name="pref_use_sys_iptables_title">Koristi Zadane Iptablice</string>
-  <string name="pref_use_sys_iptables_summary">koristi ugraÄ?ene iptablice umjesto onih zapakiranih s Orbot-om</string>
-  <string name="error_installing_binares">Nije bilo moguÄ?e instalirati ili nadograditi Tor datoteke .</string>
-  <string name="pref_use_persistent_notifications">Uvjek drži ikonu na alatnoj traci kad je Orbot spojen</string>
-  <string name="pref_use_persistent_notifications_title">Obavijesti o stalnoj pokrenutosti</string>
-  <string name="pref_use_expanded_notifications">Prikaži proširene obavijesti s Tor izlaznom državom i IP-em</string>
-  <string name="pref_use_expanded_notifications_title">Proširene obavijesti</string>
-  <string name="notification_using_bridges">Mostovi omoguÄ?eni!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Jezik</string>
-  <string name="set_locale_summary">Odaberi lokaciju i jezik za Orbot</string>
-  <string name="wizard_locale_title">Odaberi Jezik</string>
-  <string name="wizard_locale_msg">Ostavi zadano ili promjeni na trenutni jezik</string>
-  <string name="powered_by">pogoni Tor</string>
-  <string name="btn_save_settings">Spremi postavke</string>
-  <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">dolje</string>
-  <string name="up">gore</string>
-  <string name="pref_disable_network_title">Nema mrežnog auto-spavanja</string>
-  <string name="pref_disable_network_summary">Stavi Tor na spavanje kad internet nije dostupan</string>
-  <string name="newnym">Prebacili ste se na nov Tor identitet!</string>
-  <string name="menu_verify_browser">Preglednik</string>
-  <string name="menu_use_chatsecure">Koristi ChatSecure</string>
-  <string name="permission_manage_tor_label">Upravljaj Tor-om</string>
-  <string name="permission_manage_tor_description">OmoguÄ?i ovoj palikaciji da upravlja Tor-om</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ä?ini se da nemate Orfox instaliran. Želite li pomoÄ? s tim ili da samo otvorimo preglednik?</string>
-  <string name="install_apps_">Instaliraj aplikacije?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nema mrežne povezivosti. Stavljam Tor na spavanje...</string>
+    <string name="no_internet_connection_tor">Nema internet veze; Tor je u stanju pripravnosti...</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="wizard_tips_martus">Mobile Martus - Benetech aplikacija za dokumentaciju ljudskih prava</string>
-  <string name="your_tor_public_ips_">Vaši javni Tor IP-evi:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">OnemoguÄ?ite ovu palikaciju u Android-&gt;Postavke-&gt;Aplikacije ako imate problema s Orbot-om:</string>
-  <string name="app_conflict">Konflikt aplikacija</string>
-  <string name="pref_transproxy_refresh_title">Automatsko osvježavanje Transproxy-a</string>
-  <string name="pref_transproxy_refresh_summary">Ponovno primjeni Transproxy pravila kad se promjeni mrežno stanje</string>
-  <string name="pref_transproxy_flush_title">Transproxy PRISILNO UKLANJANJE</string>
-  <string name="pref_transproxy_flush_summary">Dotaknite ovdje da bi oÄ?istili sva transproxy mrežna pravila ODMAH</string>
-  <string name="transparent_proxy_rules_flushed_">Pravila transparentnog proxy-a oÄ?iÅ¡Ä?ena!</string>
-  <string name="you_do_not_have_root_access_enabled">Nema omoguÄ?en root pristup</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Možda Ä?e te morati zaustaviti i pokrenuti Orbot da bi se omoguÄ?ile promjenjene postavke.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Mostova ažurirano</string>
-  <string name="restart_orbot_to_use_this_bridge_">Ponovno pokrenite Orbot da bi omoguÄ?ili promjene</string>
-  <string name="menu_qr">QR kodovi</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ako VaÅ¡ mreža aktivno blokira Tor, možete koristiti Most kako bi pristupili mreži. ODABERITE jedan od gorenavedenih tipova mosta kako bi ih omoguÄ?ili.</string>
-  <string name="bridge_mode">NaÄ?in rada Most</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Aktiviraj</string>
-  <string name="apps_mode">VPN naÄ?in rada aplikacija</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Možete omoguÄ?iti svim aplikacijama na svom ureÄ?aju da se pokreÄ?u kroz Tor koristeÄ?i VPN znaÄ?ajku Android-a.\n\n*UPOZORENJE* Ovo je nova, eksperimentalna znaÄ?ajka i u nekim sluÄ?ajevima se možda neÄ?e automatski pokrenuti, ili Ä?e se zaustaviti. NE bi ju trebalo koristiti za anonimnost, nego SAMO za prolaženje kroz vatrozide i filtere.</string>
-  <string name="send_email">Pošalji email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Možete dobiti adrese mostova kroz email, web ili skeniranjem QR koda. Odaberite \'Email\' ili \'Web\' niže da zatražite adresu mosta.\n\nJednom kad imate adresu, kopirajte i zalijepite ju u \"Mostovi\" postavku Orbot-a i ponovno ga pokrenite.</string>
-  <string name="install_orweb">Instaliraj Orfox</string>
-  <string name="standard_browser">Standardni preglendik</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NAPOMENA: samo standardni Tor mostovi rade na Intel X86/ATOM ureÄ?ajima</string>
-  <string name="vpn_default_world">Svijet</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hu/strings.xml b/orbotservice/src/main/res/values-hu/strings.xml
index a854f25b..b88cf39c 100644
--- a/orbotservice/src/main/res/values-hu/strings.xml
+++ b/orbotservice/src/main/res/values-hu/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Az Orbot egy ingyenes proxy alkalmazás, ami képessé tesz alkalmazásokat, hogy biztonságosabban használhassák az internetet. Az Orbot Tor-t használ, hogy titkosítsa az internetforgalmadat és elrejtse azáltal, hogy pattogtatja számítógépek sorozatain keresztül a világ körül. A Tor ingyenes szoftver és nyitott hálózat, ami segít megvédeni a hálózati felügyelettÅ?l, ami fenyegeti a személyi szabadságot és magánéletet, a bizalmas céges tevékenységeket és kapcsolatokat, és állambiztonság címén a forgalomelemzéstÅ?l.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">a Tor indítása, leállítása</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Az Orbot indul...</string>
+    <string name="status_starting_up">Az Orbot indul...</string>
   <string name="status_activated">Csatlakozva a Tor hálózathoz</string>
   <string name="status_disabled">Az Orbot deaktiválva</string>
   <string name="status_shutting_down">A TorService leáll</string>
   <string name="tor_process_starting">A Tor kliens indítása...</string>
   <string name="tor_process_complete">kész.</string>
-  <string name="tor_process_waiting">várakozik.</string>
-  <string name="not_anonymous_yet">FIGYELEM: A forgalmad még nem névtelen! �llítsd be az alkalmazásaidat, hogy HTTP proxyt használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxyt a 127.0.0.1:9050 címen</string>
-  <string name="menu_home">KezdÅ?lap</string>
-  <string name="menu_browse">Böngészés</string>
-  <string name="menu_settings">Beállítások</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Súgó</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Indítás</string>
-  <string name="menu_stop">Leállítás</string>
-  <string name="menu_about">Névjegy</string>
-  <string name="menu_promo_apps">Alkalmazások beszerzése...</string>
-  <string name="main_layout_download">Letöltés</string>
-  <string name="main_layout_upload">Feltöltés</string>
-  <string name="button_help">Súgó</string>
-  <string name="button_close">Bezár</string>
-  <string name="button_about">Névjegy</string>
-  <string name="button_clear_log">Log törlése</string>
-  <string name="menu_verify">EllenÅ?rzés</string>
-  <string name="menu_exit">Kilépés</string>
-  <string name="menu_scan">BridgeQR szkennelése</string>
-  <string name="menu_share_bridge">BridgeQR megosztása</string>
-  <string name="press_to_start">- hosszú nyomás az indításhoz -</string>
-  <string name="pref_trans_proxy_group">Transzparens Proxyzás (Root szükséges)</string>
-  <string name="pref_trans_proxy_title">Transzparens Proxyzás</string>
-  <string name="pref_trans_proxy_summary">Alkalmazások automatikus Tor-izálása</string>
-  <string name="pref_transparent_all_title">Minden Tor-olása</string>
-  <string name="pref_transparent_all_summary">Minden forgalom átproxyzása a Tor-on</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy visszacsatolás</string>
-  <string name="pref_transparent_port_fallback_summary">FIGYELEM: Kikerüli a szokásos portokat (80, 443, stb). *CSAK AKKOR HASZN�LD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
-  <string name="pref_transparent_port_title">Port Lista</string>
-  <string name="pref_transparent_port_summary">A proxyzandó portok listája. *CSAK AKKOR HASZN�LD* ha a \'Minden\' vagy \'Alkalmazás\' mód nem működik.</string>
-  <string name="pref_transparent_port_dialog">Add meg a proxyzandó portokat</string>
-  <string name="pref_has_root">Root hozzáférés szükséges</string>
-  <string name="pref_has_root_summary">Root hozzáférés szükséges a transzparens proxyzáshoz</string>
-  <string name="status_install_success">A Tor binárisok sikeresen telepítve lettek!</string>
-  <string name="status_install_fail">A Tor bináris állományok telepítése sikertelen. EllenÅ?rizd a naplót és értesítsd a tor-assistants@xxxxxxxxxxxxxx -ot</string>
-  <string name="title_error">Alkalmazás hiba</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Az Orbot-ról</string>
-  <string name="btn_next">Tovább</string>
-  <string name="btn_back">Vissza</string>
-  <string name="btn_finish">Befejezés</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Mégsem</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Néhány Orbot adat</string>
-  <string name="wizard_details_msg">Az Orbot egy nyílt-forráskódú alkalmazás, ami tartalmazza a Tor-t, LibEvent-et és Polipo-t. Szolgáltat egy helyi HTTP proxyt (8118) és egy SOCKS proxyt (9050) a Tor hálózatba. Az Orbot-nak megvan az a képessége is, hogy rootolt eszközön minden internetes forgalmat a Tor-on keresztül küldjön.</string>
-  <string name="wizard_permissions_root">Jogosultság megadva</string>
-  <string name="wizard_permissions_stock">Orbot jogosultságok</string>
-  <string name="wizard_premissions_msg_root">KitűnÅ?! Ã?gy észleltük, hogy root jogot engedélyeztél az Orbot számára. Ezt az erÅ?t bölcsen fogjuk használni.</string>
-  <string name="wizard_permissions_msg_stock"> Habár nem szükséges, az Orbot sokkal hatékonyabb eszköz lehet, ha a készüléknek van root hozzáférése. Használd az alábbi gombot, hogy szuper-erÅ?t adj az Orbot-nak! </string>
-  <string name="wizard_permissions_no_root">Ha nincs root hozzáférésed, vagy fogalmad sincs, hogy mirÅ?l beszélünk, csak gyÅ?zÅ?djél meg arról, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal.</string>
-  <string name="wizard_permissions_consent">�rtettem és Superuser nélkül folytatnám tovább</string>
-  <string name="wizard_permission_enable_root">Root jog megadása az Orbot-nak</string>
-  <string name="wizard_configure">Tor-izálás konfigurálása</string>
-  <string name="wizard_configure_msg">Az Orbot lehetÅ?vé teszi, hogy az összes alkalmazás forgalmát a Tor-on keresztül küldje VAGY hogy egyénileg kiválaszthasd az alkalmazásaidat.</string>
-  <string name="wizard_configure_all">Minden alkalmazás keresztülproxyzása a Tor-on</string>
-  <string name="wizard_configure_select_apps">Alkalmazások kiválasztása a Tor-hoz</string>
-  <string name="wizard_tips_tricks">Orbot-engedélyezett alkalmazások</string>
-  <string name="wizard_tips_msg">Az alábbi alkalmazások az Orbot-tal való együttműködésre lettek fejlesztve. Kattints minden gombra az azonnali telepítéshez, vagy késÅ?bb megtalálod Å?ket a Google Play-en, a GuardianProject.info weboldalon vagy az F-Droid.org-n.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Biztonságos azonnali üzenetküldÅ? kliens Androidra</string>
-  <string name="wizard_tips_proxy">Proxy beállítások - Tanuld meg, hogyan állíthatod be az alkalmazásaidat, hogy együttműködjenek az Orbot-tal</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo keresÅ?motor alkalmazás</string>
-  <string name="wizard_tips_twitter"> �llítsd be a Twitter proxyt a hosztnál \"localhost\"-ra és a port-nál 8118-ra</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Készíts egy történetet és hagyd a Tor-ra a biztonságért!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy beállítások</string>
-  <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használsz támogatja a HTTP vagy SOCKS proxy használatát, akkor konfigurálhatod, hogy csatlakozzon az Orbot-hoz és Tor-t használjon.\n\n\n A hoszt beállítások 127.0.0.1 vagy \"localhost\". HTTP-nek a port beállítása 8118. A SOCKS-nak a proxyja 9050. SOCKS4A -t vagy SOCKS5 -t kéne használnod, ha lehetséges.\n \n\n\n Többet tudhatsz meg a proxyzásról Androidon a GYIK-en keresztül itt: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Az Orbot kész!</string>
-  <string name="wizard_final_msg">Emberek milliói használják a világ körül a Tor-t többféle különbözÅ? okból.\n\nÃ?jságírók és bloggerek, emberi jogok védelmezÅ?i, rendÅ?rök, katonák, cégek, elnyomó rezsimek polgárai, és csak átlagos polgárok... és most már te is készen állsz!</string>
-  <string name="wizard_exit_at_first_screen_toast">Kérlek konfiguráld az Orbot-ot, mielÅ?tt elkezded használni!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Sikeresen csatlakoztál a Tor hálózathoz - de ez NEM jelenti azt, hogy a készüléked biztonságos. Használhatod a \'BöngészÅ?\' gombot a kapcsolatod teszteléséhez. \n\nLátogass meg minket a https://guardianproject.info/apps/orbot -on vagy küldj egy emailt a help@xxxxxxxxxxxxxxxxxxxx -ra, hogy többet megtudj.</string>
-  <string name="tor_check">Ez megnyitja a webböngészÅ?dben a https://check.torproject.org -t ahhoz, hogy lásd, az Orbot valószínűleg konfigurált és csatlakozva vagy a Tor-hoz.</string>
-  <string name="pref_hs_group">Rejtett szolgáltatás kiszolgálás</string>
-  <string name="pref_general_group">�ltalános</string>
-  <string name="pref_start_boot_title">Az Orbot indítása rendszerindításkor</string>
-  <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot és csatlakozik a hálózathoz, amikor az Android eszköz betölt</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Az Orbot elhozza a Tor-t Androidra!\n\nA Tor segít megvédeni téged a tartalomszűréstÅ?l, forgalomelemzéstÅ?l és hálózati felügyelettÅ?l ami fenyegeti a magánéletet, bizalmas információt és személyes kapcsolatokat.\n\nEz a varázsló segít konfigurálni az Orbot-ot és Tor-t az eszközödön.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Figyelem</string>
-  <string name="wizard_warning_msg">Az Orbot egyszerű telepítésével nem fogja automatikusan névtelenné tenni a mobilforgalmadat.\n\nMegfelelÅ?en kell konfigurálnod az Orbot-ot, az eszközödet és egyéb alkalmazásokat ahhoz, hogy sikeresen használják a Tor-t.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Jogosultságok</string>
-  <string name="wizard_permissions_root_msg1">Opcionálisan adhatsz az Orbot részére \'Superuser\' hozzáférést, hogy engedélyezz olyan speciális szolgáltatásokat, mint például a Transzparens Proxyzás.</string>
-  <string name="wizard_permissions_root_msg2">Ha nem akarod ezt tenni, kérlek bizonyosodj meg róla, hogy olyan alkalmazásokat használsz, amelyek együttműködnek az Orbot-tal</string>
-  <string name="wizard_permissions_no_root_msg">Az eszközöd nem tűnik rootoltnak vagy nem ad root vagy \'Superuser\' hozzáférést.\n\nKérlek próbáld az \'Appok\' módot a fÅ?képernyÅ?n ehelyett.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-engedélyezett Alkalmazások</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Biztonságos üzenetküldÅ? alkalmazás OTR titkosítással</string>
-  <string name="wizard_tips_orweb">Orfox: Fokozott adatvédelmi böngészÅ?, ami Tor-on keresztül működik</string>
-  <string name="wizard_tips_play">Az összes Guardian Project alkalmazás keresése a Google Play-en</string>
-  <string name="wizard_tips_fdroid">Az összes Guardian Project alkalmazást megtalálod az F-Droid -on</string>
-  <string name="wizard_tips_fdroid_org">Az összes Guardian Project alkalmazást megtalálod a https://f-droid.org -on</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">�tlátszó Proxyzás</string>
-  <string name="wizard_transproxy_msg">Ez lehetÅ?vé teszi az alkalmazások számára a Tor-on keresztül kommunikálást, bármilyen konfiguráció nélkül.</string>
-  <string name="wizard_transproxy_hint">(Jelöld be ezt négyzetet, ha fogalmad sincs arról, hogy mirÅ?l beszélünk)</string>
-  <string name="wizard_transproxy_none">Nincs</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">A Tor Transzparens Proxyzásának engedélyezése a Wi-Fi és az USB Tetherelt eszközök felé (újraindítást igényel)</string>
-  <string name="button_grant_superuser">Superuser hozzáférés kérése</string>
-  <string name="pref_select_apps">Alkalmazások kiválasztása</string>
-  <string name="pref_select_apps_summary">Válassz alkalmazásokat, amik keresztül haladjanak a Tor-on</string>
-  <string name="pref_node_configuration">Csomópont konfiguráció</string>
-  <string name="pref_node_configuration_summary">Ezek haladó beállítások, amelyek csökkenthetik a névtelenséged.</string>
-  <string name="pref_entrance_node">BelépÅ? csomópontok</string>
-  <string name="pref_entrance_node_summary">Ujjlenyomatok, becenevek, országok és címek az elsÅ? ugráshoz</string>
-  <string name="pref_entrance_node_dialog">BelépÅ? csomópontok megadása</string>
-  <string name="pref_allow_background_starts_title">Háttérbeli indulások engedélyezése</string>
-  <string name="pref_allow_background_starts_summary">Bármely alkalmazás közölheti az Orbot-tal, hogy indítsa a Tor-t és a kapcsolódó szolgáltatásokat</string>
-  <string name="button_proxy_all">Mindent proxyz</string>
-  <string name="button_proxy_none">Semmit nem proxyz</string>
-  <string name="button_invert_selection">Kijelölés megfordítása</string>
-  <string name="pref_proxy_title">KimenÅ? hálózati proxy (választható)</string>
-  <string name="pref_proxy_type_title">Proxy típus</string>
-  <string name="pref_proxy_type_summary">A Proxy szerver által használandó protokoll: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Add meg a proxy típusát</string>
-  <string name="pref_proxy_host_title">KimenÅ? proxy hoszt</string>
-  <string name="pref_proxy_host_summary">Proxy szerver állomásneve</string>
-  <string name="pref_proxy_host_dialog">Add meg a proxy hosztot</string>
-  <string name="pref_proxy_port_title">Proxy port</string>
-  <string name="pref_proxy_port_summary">Proxy szerver port</string>
-  <string name="pref_proxy_port_dialog">Add meg a proxy portját</string>
-  <string name="pref_proxy_username_title">KimenÅ? proxy felhasználónév</string>
-  <string name="pref_proxy_username_summary">Proxy felhasználónév (választható)</string>
-  <string name="pref_proxy_username_dialog">Add meg a proxy felhasználónevet</string>
-  <string name="pref_proxy_password_title">KimenÅ? proxy jelszó</string>
-  <string name="pref_proxy_password_summary">Proxy jelszó (választható)</string>
-  <string name="pref_proxy_password_dialog">Add meg a proxy jelszót</string>
-  <string name="status">Ã?llapot</string>
-  <string name="setting_up_full_transparent_proxying_">A teljes körű transzparens proxyzás beállítása...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Alkalmazásalapú transzparens proxyzás beállítása...</string>
-  <string name="transparent_proxying_enabled">Transzparens proxyzás ENGED�LYEZVE</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy engedélyezve tetheringre!</string>
-  <string name="warning_error_starting_transparent_proxying_">FIGYELMEZTET�S: hiba a transzparens proxyzás indításakor!</string>
-  <string name="transproxy_rules_cleared">TransProxy szabályok törölve</string>
-  <string name="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</string>
-  <string name="privoxy_is_running_on_port_">A Polipo ezen a porton fut:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Port alapú transzparens proxyzás beállítása...</string>
-  <string name="bridge_error">Híd hiba</string>
-  <string name="bridge_requires_ip">A híd szolgáltatás használatához legalább egy híd IP címét meg kell adnod.</string>
-  <string name="send_email_for_bridges">Küldj egy emailt a bridges@xxxxxxxxxxxxxx -ra a \"get bridges\" sorral a levél törzsében egy gmail fiókból.</string>
-  <string name="error">Hiba</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Az elérhetÅ? címeid beállításai kivételt okoztak!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Nem indítható el a Tor folyamat:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Az elérhetÅ? címeid beállításai kivételt okoztak!</string>
   <string name="your_relay_settings_caused_an_exception_">Az átjátszód beállításai kivételt okoztak!</string>
-  <string name="exit_nodes">Kilépési csomópontok</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ujjlenyomatok, becenevek, országok és címek az utolsó ugráshoz</string>
-  <string name="enter_exit_nodes">Kilépési csomópontok megadása</string>
-  <string name="exclude_nodes">Csomópontok kizárása</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Kizárandó ujjlenyomatok, becenevek, országok és címek</string>
-  <string name="enter_exclude_nodes">Add meg a kizárandó csomópontokat</string>
-  <string name="strict_nodes">Szigorú csomópontok</string>
-  <string name="use_only_these_specified_nodes">*Csak* ezeknek a megadott csomópontoknak a használata</string>
-  <string name="bridges">Hidak</string>
-  <string name="use_bridges">Hidak használata</string>
-  <string name="bridges_obfuscated">FedÅ?hidak</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Alternatív belépési pontok engedélyezése a Tor hálózatba</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Bekapcsolva, ha a konfigurált hidak fedÅ?hidak</string>
-  <string name="ip_address_and_port_of_bridges">A hidak IP címe és portja</string>
-  <string name="enter_bridge_addresses">Add meg a híd címeit</string>
-  <string name="relays">�tjátszók</string>
-  <string name="relaying">�tjátszás</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Engedélyezd az eszközödnek, hogy nem-átjátszó elosztó legyen</string>
-  <string name="relay_port">�tjátszó port</string>
-  <string name="listening_port_for_your_tor_relay">Hallgató port a Tor átjátszódnak</string>
-  <string name="enter_or_port">Enter VAGY port</string>
-  <string name="relay_nickname">�tjátszó becenév</string>
-  <string name="the_nickname_for_your_tor_relay">A Tor átjátszód beceneve</string>
-  <string name="enter_a_custom_relay_nickname">Adj meg egy egyedi átjátszó becenevet</string>
-  <string name="reachable_addresses">ElérhetÅ? címek</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Futtatás kliensként egy tűzfal mögül, korlátozó rendelkezésekkel</string>
-  <string name="reachable_ports">ElérhetÅ? portok</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">A tűzfal mögött elérhetÅ? portok</string>
-  <string name="enter_ports">Add meg a portokat</string>
-  <string name="enable_hidden_services">Rejtett szolgáltatás kiszolgálás</string>
-  <string name="run_servers_accessible_via_the_tor_network">a készülék szerver elérhetÅ?ségének engedélyezése a Tor hálózaton keresztül</string>
-  <string name="enter_localhost_ports_for_hidden_services">add meg a localhost portokat a rejtett szolgáltatásokhoz</string>
-  <string name="hidden_service_ports">Rejtett szolgáltatás portok</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">a címezhetÅ? neve a rejtett szolgáltatásaidnak (automatikusan generált)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">a hibakeresési napló engedélyezése a kimenetre (adb -t vagy aLogCat -t kell használni a megtekintéshez)</string>
-  <string name="project_home">Projekt honlap(ok):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Tor Licenc</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3. fél szoftver:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Egy alkalmazás a %S rejtett szerver portot akarja megnyitni a Tor hálózathoz. Ez biztonságos, ha megbízol az alkalmazásban.</string>
-  <string name="found_existing_tor_process">létezÅ? Tor folyamat találva...</string>
+    <string name="found_existing_tor_process">létezÅ? Tor folyamat találva...</string>
   <string name="something_bad_happened">Valami rossz történt. Nézd meg a naplót.</string>
-  <string name="hidden_service_on">rejtett szolgáltatás itt:</string>
-  <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
+    <string name="unable_to_read_hidden_service_name">nem olvasható a rejtett szolgáltatás neve</string>
   <string name="unable_to_start_tor">A Tor indítása sikertelen:</string>
-  <string name="unable_to_reset_tor">Indítsd újra a készüléked, nem lehet helyreállítani a Tor-t!</string>
-  <string name="pref_use_sys_iptables_title">Alapértelmezett Iptables használata</string>
-  <string name="pref_use_sys_iptables_summary">a beépített iptables bináris használata az Orbot-tal egybecsomagolt helyett</string>
-  <string name="error_installing_binares">A Tor binárisok nem telepíthetÅ?ek, vagy frissíthetÅ?ek.</string>
-  <string name="pref_use_persistent_notifications">Mindig tartsa az ikont az eszköztáron, ha az Orbot csatlakoztatva van.</string>
-  <string name="pref_use_persistent_notifications_title">Mindig-bekapcsolt értesítések</string>
-  <string name="pref_use_expanded_notifications">Mutassa a bÅ?vített értesítést a Tor kilépÅ? országgal és IP-vel</string>
-  <string name="pref_use_expanded_notifications_title">BÅ?vített értesítések</string>
-  <string name="notification_using_bridges">Hidak engedélyezve!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Nyelv</string>
-  <string name="set_locale_summary">Válaszd ki a helyszínt és nyelvet az Orbot-nak</string>
-  <string name="wizard_locale_title">Válassz nyelvet</string>
-  <string name="wizard_locale_msg">Hagyd alapértelmezetten vagy válts az aktuális nyelvre</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">Beállítások mentése</string>
-  <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</string>
-  <string name="bandwidth_">Sávszélesség:</string>
-  <string name="down">le</string>
-  <string name="up">fel</string>
-  <string name="pref_disable_network_title">Nincs hálózati auto-alvás</string>
-  <string name="pref_disable_network_summary">A Tor alvó módba helyezése, ha internet nem elérhetÅ?</string>
-  <string name="newnym">�j Tor identitásra váltottál!</string>
-  <string name="menu_verify_browser">BöngészÅ?</string>
-  <string name="menu_use_chatsecure">ChatSecure használata</string>
-  <string name="permission_manage_tor_label">Tor kezelése</string>
-  <string name="permission_manage_tor_description">Engedélyezi ennek az alkalmazásnak, hogy a Tor szolgáltatást vezérelje</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ã?gy tűnik, hogy neked nincs Orfox telepítve. Kérsz segítséget benne, vagy csak nyissuk meg böngészÅ?t?</string>
-  <string name="install_apps_">Alkalmazások telepítése?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nincs hálózati kapcsolat. Tor alvó állapotba helyezése...</string>
+    <string name="no_internet_connection_tor">Nincs internetkapcsolat; Tor készenlétben...</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="wizard_tips_martus">Mobile Martus - Benetech emberi jogok dokumentációja alkalmazás</string>
-  <string name="your_tor_public_ips_">A Tor-od publikus IP-jei:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Kérlek tiltsd le ezt az alkalmazást az Android-&gt;Beállítások-&gt;Alkalmazások-ban, ha az Orbot-tal problémáid vannak: </string>
-  <string name="app_conflict">Alkalmazás ütközés</string>
-  <string name="pref_transproxy_refresh_title">Transproxy auto-frissítés</string>
-  <string name="pref_transproxy_refresh_summary">A Transproxy szabályok újraalkalmazása, ha a hálózati állapot változik</string>
-  <string name="pref_transproxy_flush_title">Transproxy KÃ?NYSZERÃ?TETT ELTÃ?VOLÃ?TÃ?SA</string>
-  <string name="pref_transproxy_flush_summary">�rintsd meg itt, az összes transproxy hálózati szabály AZONNALI kiürítéséhez</string>
-  <string name="transparent_proxy_rules_flushed_">Transzparens proxy szabályok kiürítve!</string>
-  <string name="you_do_not_have_root_access_enabled">Nincs ROOT hozzáférésed engedélyezve</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Szükséged lehet az Orbot megállítására és indítására, hogy a beállítások megváltoztatása engedélyezve legyen.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Hidak frissítve</string>
-  <string name="restart_orbot_to_use_this_bridge_">Kérlek indítsd újra az Orbot-ot a változások engedélyezéséhez</string>
-  <string name="menu_qr">QR kódok</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ha a mobilhálózatod aktívan blokkolja a Tor-t, használhatsz Hidat, hogy hozzáférj a hálózathoz. V�LASSZ egyet a fenti híd típusokból, hogy engedélyezd a hidakat.</string>
-  <string name="bridge_mode">Híd mód</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Aktiválás</string>
-  <string name="apps_mode">Alkalmazások VPN mód</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Engedélyezhetsz minden alkalmazást, hogy Tor hálózaton keresztül fussanak az Android VPN funkcióját használva.\n\n*FIGYELMEZTETÃ?S* Ez egy új, kísérleti funkció és néhány esetben nem indulhat automatikusan, vagy leállhat. NEM kéne névtelenségre használni, CSAK a tűzfalakon és szűrÅ?kön való átjutáshoz.</string>
-  <string name="send_email">Email küldése</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Kaphatsz egy híd-címet emailen, weben keresztül vagy a híd QR kódjának beszkennelésével. Válaszd az \'Email\'-t vagy a \'Web\'-et alább a híd-cím kéréséhez.\n\nAmikor már van egy címed, másold &amp; illeszd be \"Hidak\" preferenciákba az Orbot beállításaiban és indítsd újra.</string>
-  <string name="install_orweb">Orweb telepítése</string>
-  <string name="standard_browser">Standard böngészÅ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">MEGJEGYZ�S: Csak standard Tor hidak működnek az Intel X86/ATOM eszközökön</string>
-  <string name="vpn_default_world">Világ</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-hy-rAM/strings.xml b/orbotservice/src/main/res/values-hy-rAM/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-hy-rAM/strings.xml
+++ b/orbotservice/src/main/res/values-hy-rAM/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ia/strings.xml b/orbotservice/src/main/res/values-ia/strings.xml
index db863c61..b80fb51c 100644
--- a/orbotservice/src/main/res/values-ia/strings.xml
+++ b/orbotservice/src/main/res/values-ia/strings.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">Initio</string>
-  <string name="menu_browse">Navigar</string>
-  <string name="menu_settings">Configurationes</string>
-  <string name="menu_info">Adjuta</string>
-  <string name="menu_about">Circa</string>
-  <string name="button_help">Adjuta</string>
-  <string name="button_close">Clauder</string>
-  <string name="button_about">Circa</string>
-  <string name="menu_exit">Sortir</string>
-  <string name="btn_back">Retro</string>
-  <string name="btn_cancel">Cancellar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Configurationes de proxy:</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">General</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Advertimento</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Nulle</string>
-  <string name="status">Stato</string>
-  <string name="error">Error</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Salveguardar configurationes</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-id/strings.xml b/orbotservice/src/main/res/values-id/strings.xml
index c91af41b..694ac3d9 100644
--- a/orbotservice/src/main/res/values-id/strings.xml
+++ b/orbotservice/src/main/res/values-id/strings.xml
@@ -2,283 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mulai dan akhiri Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sedang dimulai...</string>
+    <string name="status_starting_up">Orbot sedang dimulai...</string>
   <string name="status_activated">Tersambung ke Jaringan Tor</string>
   <string name="status_disabled">Orbot telah dibatalkan</string>
   <string name="status_shutting_down">TorService dimatikan</string>
   <string name="tor_process_starting">Memulai klien Tor...</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Beranda</string>
-  <string name="menu_browse">Jelajah</string>
-  <string name="menu_settings">Pengaturan</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Mulai</string>
-  <string name="menu_stop">Berhenti</string>
-  <string name="menu_about">Tentang</string>
-  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
-  <string name="main_layout_download">Unduh</string>
-  <string name="main_layout_upload">Unggah</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Hapus Log</string>
-  <string name="menu_verify">Periksa</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="menu_scan">Pindai BridgeQR</string>
-  <string name="menu_share_bridge">Bagikan BridgeQR</string>
-  <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
-  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Transparan</string>
-  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
-  <string name="pref_transparent_all_title">Tor Semuanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
-  <string name="pref_transparent_port_title">Daftar Port</string>
-  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
-  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
-  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants@xxxxxxxxxxxxxxx</string>
-  <string name="title_error">Kesalahan Pada Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Berikutnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Selesai</string>
-  <string name="btn_okay">Oke</string>
-  <string name="btn_cancel">Batal</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Beberapa Rincian Orbot</string>
-  <string name="wizard_details_msg">Orbot adalah aplikasi open-source yang mengandung Tor, LibEvent dan Polipo. Tor menyediakan HTTP proxy (8118) dan SOCKS proxy (9050) lokal menuju jaringan Tor. Orbot juga dapat, pada perangkat yang di-root, untuk mengirimkan semua lalu-lintas data internet melalui Tor.</string>
-  <string name="wizard_permissions_root">Izin Diberikan</string>
-  <string name="wizard_permissions_stock">Perizinan Orbot</string>
-  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
-  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torifikasi</string>
-  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
-  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
-  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string>
-  <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
-  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot sudah siap!</string>
-  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
-  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
-  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
-  <string name="pref_general_group">Umum</string>
-  <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
-  <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Peringatan</string>
-  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Perizinan</string>
-  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string>
-  <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
-  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparan Proxying</string>
-  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
-  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
-  <string name="wizard_transproxy_none">Tidak ada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wi-Fi dan Perangkat Tether USB (diperlukan restart)</string>
-  <string name="button_grant_superuser">Meminta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Simpul</string>
-  <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
-  <string name="pref_entrance_node">Simpul Masuk</string>
-  <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
-  <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
-  <string name="pref_allow_background_starts_title">Ijinkan Latar Belakang Berjalan</string>
-  <string name="button_proxy_all">Proxy Semuanya</string>
-  <string name="button_proxy_none">Tanpa Proxy</string>
-  <string name="button_invert_selection">Balik Pilihan</string>
-  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
-  <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
-  <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
-  <string name="pref_proxy_host_title">Outbound Host Proxy</string>
-  <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
-  <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
-  <string name="pref_proxy_port_title">Outbound Port Proxy</string>
-  <string name="pref_proxy_port_summary">Port Server Proxy</string>
-  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
-  <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
-  <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
-  <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
-  <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
-  <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
-  <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
-  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
-  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
-  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
-  <string name="bridge_error">Kesalahan pada Bridge</string>
-  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
-  <string name="send_email_for_bridges">Kirimkan email ke bridges@xxxxxxxxxxxxxx dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
-  <string name="error">Kesalahan</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
   <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
-  <string name="exit_nodes">Node Keluar</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
-  <string name="enter_exit_nodes">Memasuki Node Keluar</string>
-  <string name="exclude_nodes">Node pengecualian</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
-  <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
-  <string name="strict_nodes">Node Terlarang</string>
-  <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Pakai Bridges</string>
-  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
-  <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Sedang me-Relay</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
-  <string name="relay_port">Port Relay</string>
-  <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
-  <string name="enter_or_port">Memasuki OR port</string>
-  <string name="relay_nickname">Nama Relay</string>
-  <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
-  <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
-  <string name="reachable_addresses">Addresses Terjangkau</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
-  <string name="reachable_ports">Ports terjangkau</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
-  <string name="enter_ports">Memasuki ports</string>
-  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
-  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
-  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
-  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
-  <string name="project_home">Beranda Projek:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Lisensi Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
-  <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+    <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
   <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-  <string name="hidden_service_on">layanan tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
-  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
-  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
-  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
-  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
-  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
-  <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
-  <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
-  <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
-  <string name="notification_using_bridges">Bridge diaktifkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Bahasa</string>
-  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
-  <string name="powered_by">diperkuat dengan Tor</string>
-  <string name="btn_save_settings">Simpan Pengaturan</string>
-  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">unduh</string>
-  <string name="up">unggah</string>
-  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
-  <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
-  <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
-  <string name="menu_verify_browser">Peramban</string>
-  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
-  <string name="permission_manage_tor_label">Kelola Tor</string>
-  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
-  <string name="install_apps_">Pasang aplikasi?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string>
+    <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</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="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
-  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
-  <string name="app_conflict">Konflik Aplikasi</string>
-  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
-  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
-  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
-  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridge Telah Diperbarui</string>
-  <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
-  <string name="menu_qr">Kode QR</string>
-  <string name="bridge_mode">Mode Bridge</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Laman</string>
-  <string name="activate">Aktivasi</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Anda dapat membuat semua aplikasi di perangkat anda bekerja melalui jaringan Tor menggunakan fitur VPN dari Android. *AWAS* Fitur ini masih baru, percobaan dan pada beberapa kasus tidak start otomatis, atau bahkan berhenti. Tidak untuk anonimitas, dan HANYA untuk melewati firewall dan penyaringan.</string>
-  <string name="send_email">Kirim Email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string>
-  <string name="standard_browser">Peramban Standar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-in-rID/strings.xml b/orbotservice/src/main/res/values-in-rID/strings.xml
index c91af41b..694ac3d9 100644
--- a/orbotservice/src/main/res/values-in-rID/strings.xml
+++ b/orbotservice/src/main/res/values-in-rID/strings.xml
@@ -2,283 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot adalah aplikasi proxy gratis yang membuat aplikasi-aplikasi lainnya dapat terkoneksi dengan internet secara aman. Orbot menggunakan Tor untuk mengenkripsi hubungan internet anda dan menyalurkannya melewati berbagai komputer di seluruh dunia. Tor adalah software gratis dan suatu network terbuka, yang membantu anda menghindari pengawasan network yang mengancam kebebasan pribadi dan privasi, aktivitas bisnis rahasia dan relasi, serta keamanan negara yang dikenal dengan analisa traffic.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mulai dan akhiri Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sedang dimulai...</string>
+    <string name="status_starting_up">Orbot sedang dimulai...</string>
   <string name="status_activated">Tersambung ke Jaringan Tor</string>
   <string name="status_disabled">Orbot telah dibatalkan</string>
   <string name="status_shutting_down">TorService dimatikan</string>
   <string name="tor_process_starting">Memulai klien Tor...</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Beranda</string>
-  <string name="menu_browse">Jelajah</string>
-  <string name="menu_settings">Pengaturan</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Mulai</string>
-  <string name="menu_stop">Berhenti</string>
-  <string name="menu_about">Tentang</string>
-  <string name="menu_promo_apps">Dapatkan aplikasi...</string>
-  <string name="main_layout_download">Unduh</string>
-  <string name="main_layout_upload">Unggah</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Hapus Log</string>
-  <string name="menu_verify">Periksa</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="menu_scan">Pindai BridgeQR</string>
-  <string name="menu_share_bridge">Bagikan BridgeQR</string>
-  <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
-  <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Transparan</string>
-  <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
-  <string name="pref_transparent_all_title">Tor Semuanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
-  <string name="pref_transparent_port_title">Daftar Port</string>
-  <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
-  <string name="status_install_success">Binary Tor berhasil dipasang!</string>
-  <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants@xxxxxxxxxxxxxxx</string>
-  <string name="title_error">Kesalahan Pada Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Berikutnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Selesai</string>
-  <string name="btn_okay">Oke</string>
-  <string name="btn_cancel">Batal</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Beberapa Rincian Orbot</string>
-  <string name="wizard_details_msg">Orbot adalah aplikasi open-source yang mengandung Tor, LibEvent dan Polipo. Tor menyediakan HTTP proxy (8118) dan SOCKS proxy (9050) lokal menuju jaringan Tor. Orbot juga dapat, pada perangkat yang di-root, untuk mengirimkan semua lalu-lintas data internet melalui Tor.</string>
-  <string name="wizard_permissions_root">Izin Diberikan</string>
-  <string name="wizard_permissions_stock">Perizinan Orbot</string>
-  <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
-  <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torifikasi</string>
-  <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
-  <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
-  <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string>
-  <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Tulis cerita dan biarkan Tor yang mengurus keamanannya!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
-  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan mendukung penggunaan proxy HTTP atau SOCKS, maka anda dapat mengaturnya untuk terhubung ke Orbot dan menggunakan Tor. Setting host-nya 127.0.0.1 atau \"localhost\". Untuk HTTP, setting port-nya adalah 8118. Untuk SOCKS, proxy-nya adalah 9050. Anda disarankan menggunakan SOCKS4A atau SOCKS5 jika memungkinkan. Anda dapat mempelajari lebih lanjut mengenai pemakaian proxy pada Android melalui FAQ di: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot sudah siap!</string>
-  <string name="wizard_final_msg">Jutaan orang di seluruh dunia menggunakan Tor untuk berbagai tujuan. Jurnalis dan blogger, pembela hak asasi manusia, penegak hukum, prajurit, perusahaan, warga negara di rezim yang represif, dan warga biasa... dan kini anda sudah siap juga!</string>
-  <string name="wizard_exit_at_first_screen_toast">Konfigurasi Orbot terlebih dahulu sebelum anda menggunakannya!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
-  <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
-  <string name="pref_general_group">Umum</string>
-  <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
-  <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot membawa Tor ke Android! Tor membantu anda melawan penyaringan konten, analisis trafik dan pengawasan jaringan yang mengancam privasi, informasi rahasia dan hubungan pribadi. Wizard ini akan membantu anda mengkonfigurasikan Orbot dan Tor pada perangkat anda.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Peringatan</string>
-  <string name="wizard_warning_msg">Pemasangan Orbot tidak otomatis membuat trafik mobile anda anonim. Anda harus melakukan konfigurasi Orbot, perangkat anda dan aplikasi lainnya untuk dapat menggunakan Tor dengan baik.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Perizinan</string>
-  <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Perangkat anda belum di-root atau tidak punya akses \'Superuser\'. Silakan coba mode \'Aplikasi\' di tampilan utama.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string>
-  <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
-  <string name="wizard_tips_fdroid">Temukan semua aplikasi Guardian Project di F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Temukan semua aplikasi Guardian Project di https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparan Proxying</string>
-  <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
-  <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
-  <string name="wizard_transproxy_none">Tidak ada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wi-Fi dan Perangkat Tether USB (diperlukan restart)</string>
-  <string name="button_grant_superuser">Meminta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Simpul</string>
-  <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
-  <string name="pref_entrance_node">Simpul Masuk</string>
-  <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
-  <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
-  <string name="pref_allow_background_starts_title">Ijinkan Latar Belakang Berjalan</string>
-  <string name="button_proxy_all">Proxy Semuanya</string>
-  <string name="button_proxy_none">Tanpa Proxy</string>
-  <string name="button_invert_selection">Balik Pilihan</string>
-  <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
-  <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
-  <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
-  <string name="pref_proxy_host_title">Outbound Host Proxy</string>
-  <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
-  <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
-  <string name="pref_proxy_port_title">Outbound Port Proxy</string>
-  <string name="pref_proxy_port_summary">Port Server Proxy</string>
-  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
-  <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
-  <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
-  <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
-  <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
-  <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
-  <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan...</string>
-  <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
-  <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
-  <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo aktif di port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port...</string>
-  <string name="bridge_error">Kesalahan pada Bridge</string>
-  <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
-  <string name="send_email_for_bridges">Kirimkan email ke bridges@xxxxxxxxxxxxxx dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
-  <string name="error">Kesalahan</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
   <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
-  <string name="exit_nodes">Node Keluar</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
-  <string name="enter_exit_nodes">Memasuki Node Keluar</string>
-  <string name="exclude_nodes">Node pengecualian</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
-  <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
-  <string name="strict_nodes">Node Terlarang</string>
-  <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Pakai Bridges</string>
-  <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
-  <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Sedang me-Relay</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
-  <string name="relay_port">Port Relay</string>
-  <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
-  <string name="enter_or_port">Memasuki OR port</string>
-  <string name="relay_nickname">Nama Relay</string>
-  <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
-  <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
-  <string name="reachable_addresses">Addresses Terjangkau</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
-  <string name="reachable_ports">Ports terjangkau</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
-  <string name="enter_ports">Memasuki ports</string>
-  <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
-  <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
-  <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
-  <string name="hidden_service_ports">Ports Layanan Rahasia</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
-  <string name="project_home">Beranda Projek:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android https://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Lisensi Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
-  <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
+    <string name="found_existing_tor_process">menemukan proses Tor yang ada...</string>
   <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
-  <string name="hidden_service_on">layanan tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
-  <string name="unable_to_reset_tor">Boot ulang perangkat anda, gagal me-reset Tor!</string>
-  <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
-  <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
-  <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
-  <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
-  <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
-  <string name="pref_use_expanded_notifications">Tampilkan notifikasi melebar dengan negara dan IP keluar Tor</string>
-  <string name="pref_use_expanded_notifications_title">Notifikasi Melebar</string>
-  <string name="notification_using_bridges">Bridge diaktifkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Bahasa</string>
-  <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
-  <string name="powered_by">diperkuat dengan Tor</string>
-  <string name="btn_save_settings">Simpan Pengaturan</string>
-  <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">unduh</string>
-  <string name="up">unggah</string>
-  <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
-  <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
-  <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
-  <string name="menu_verify_browser">Peramban</string>
-  <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
-  <string name="permission_manage_tor_label">Kelola Tor</string>
-  <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
-  <string name="install_apps_">Pasang aplikasi?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Tidak ada jaringan terhubung. Menidurkan Tor...</string>
+    <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby...</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="wizard_tips_martus">Mobile Martus - Aplikasi Dokumentasi Hak Asasi Manusia milik Benetech</string>
-  <string name="your_tor_public_ips_">IP Publik Tor Anda:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Mohon nonaktifkan aplikasi ini di Android Settings Apps jika Orbot anda bermasalah</string>
-  <string name="app_conflict">Konflik Aplikasi</string>
-  <string name="pref_transproxy_refresh_title">Auto-Refresh Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Pasang ulang rule Transproxy saat status jaringan berubah</string>
-  <string name="pref_transproxy_flush_title">BUANG PAKSA Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ketuk disini untuk mengosongkan semua rule jaringan Transproxy SEKARANG</string>
-  <string name="transparent_proxy_rules_flushed_">Rule proxy transparan telah kosong!</string>
-  <string name="you_do_not_have_root_access_enabled">Anda tidak punya akses ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Anda mungkin harus stop lalu start kembali Orbot agar perubahan setting menjadi aktif.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridge Telah Diperbarui</string>
-  <string name="restart_orbot_to_use_this_bridge_">Silakan start ulang Orbot untuk mengaktifkan perubahan</string>
-  <string name="menu_qr">Kode QR</string>
-  <string name="bridge_mode">Mode Bridge</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Laman</string>
-  <string name="activate">Aktivasi</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Anda dapat membuat semua aplikasi di perangkat anda bekerja melalui jaringan Tor menggunakan fitur VPN dari Android. *AWAS* Fitur ini masih baru, percobaan dan pada beberapa kasus tidak start otomatis, atau bahkan berhenti. Tidak untuk anonimitas, dan HANYA untuk melewati firewall dan penyaringan.</string>
-  <string name="send_email">Kirim Email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string>
-  <string name="standard_browser">Peramban Standar</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">CATATAN: Hanya bridge Tor yang standar yang bekerja di perangkat Intel X86/ATOM</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-in/strings.xml b/orbotservice/src/main/res/values-in/strings.xml
index 42c44612..6ad2270a 100644
--- a/orbotservice/src/main/res/values-in/strings.xml
+++ b/orbotservice/src/main/res/values-in/strings.xml
@@ -1,48 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mulai dan akhiri Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot sedang dimulaiâ?¦</string>
+    <string name="status_starting_up">Orbot sedang dimulaiâ?¦</string>
   <string name="status_activated">Tersambung ke Jaringan Tor</string>
   <string name="status_disabled">Orbot telah dibatalkan</string>
   <string name="status_shutting_down">Orbot sedang dimatikan</string>
-  <string name="not_anonymous_yet">PERINGATAN: </string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Jelajahi</string>
-  <string name="menu_settings">Pengaturan</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_about">Mengenai</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Dekat</string>
-  <string name="button_about">Mengenai</string>
-  <string name="button_clear_log">Hapus Log</string>
-  <string name="menu_verify">Periksa</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="pref_transparent_all_title">Tor Semuanya</string>
-  <string name="pref_transparent_port_title">Daftar Port</string>
-  <string name="pref_has_root">Minta Akses Dasar</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_cancel">Batal</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Umum</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Peringatan</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Tidak ada</string>
-  <string name="status">Status</string>
-  <string name="error">Kesalahan</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Simpan Pengaturan</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-is/strings.xml b/orbotservice/src/main/res/values-is/strings.xml
index bb91f636..7aecb72d 100644
--- a/orbotservice/src/main/res/values-is/strings.xml
+++ b/orbotservice/src/main/res/values-is/strings.xml
@@ -2,277 +2,29 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot er ókeypis proxy smáforrit sem gerir öðrum smáforritum kleift að nota veraldarvefinn á öruggari hátt. Orbot notar Tor til að dulkóða umferð þína á netinu og felur hana svo með að hoppa í gegnum fjölda tölva um allan heim. Tor er ókeypis hugbúnaður og opið net sem aðstoðar þig við að verjast gegn eftirliti á netinu sem vinnur gegn frelsi einkalífsins og friðhelgi, trúnaðar viðskiptamálum og samböndum, og ríkisöryggi þekkt sem umferðargreining.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">ræsa og stöðva Tor</string>
-  <string name="tor_proxy_service_process">torproxyþjónusta</string>
-  <string name="status_starting_up">Orbot er að ræsa...</string>
+    <string name="status_starting_up">Orbot er að ræsa...</string>
   <string name="status_activated">Tengdur við Tor netið</string>
   <string name="status_disabled">Orbot er slökkt</string>
   <string name="tor_process_starting">Kveiki á Tor notanda...</string>
   <string name="tor_process_complete">lokið.</string>
-  <string name="tor_process_waiting">bíða.</string>
-  <string name="not_anonymous_yet">A�V�RUN: Netumferðin þín er ekki nafnlaus enn! Vinsamlegast stilltu hugbúnaðinn þinn til að nota HTTP proxy 127.0.0.1:8118 eða SOCK4A eða SOCK5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Heim</string>
-  <string name="menu_browse">Vafra</string>
-  <string name="menu_settings">Stillingar</string>
-  <string name="menu_log">Skráning</string>
-  <string name="menu_info">Hjálp</string>
-  <string name="menu_start">Byrja</string>
-  <string name="menu_stop">Stöðva</string>
-  <string name="menu_about">Um</string>
-  <string name="main_layout_download">Niðurhal</string>
-  <string name="main_layout_upload">Upphal</string>
-  <string name="button_help">Hjálp</string>
-  <string name="button_close">Loka</string>
-  <string name="button_about">Um</string>
-  <string name="button_clear_log">Hreinsa Skráningu</string>
-  <string name="menu_verify">Athuga</string>
-  <string name="menu_exit">Hætta</string>
-  <string name="menu_scan">Skanna BridgeQR</string>
-  <string name="menu_share_bridge">Deila BridgeQR</string>
-  <string name="press_to_start">- ýttu lengi til að byrja -</string>
-  <string name="pref_trans_proxy_group">Gegnsætt Proxy (�arfnast Rótaraðgangs)</string>
-  <string name="pref_trans_proxy_title">Gegnsætt Proxy</string>
-  <string name="pref_trans_proxy_summary">Sjálfkrafa Tor-gera smáforrit</string>
-  <string name="pref_transparent_all_title">Tor Allt</string>
-  <string name="pref_transparent_all_summary">Beina umferð fyrir öll smáforrit í gegnum Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Beinir til vara</string>
-  <string name="pref_transparent_port_fallback_summary">A�V�RUN: Fer framhjá algengum portum (80, 443, etc). *NOTA A�EINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki.</string>
-  <string name="pref_transparent_port_title">Porta Listi</string>
-  <string name="pref_transparent_port_summary">Listi yfir port til að proxya. *NOTA A�EINS* ef \'Allt\' eða \'Smáforrit\' stilling virkar ekki</string>
-  <string name="pref_transparent_port_dialog">Settu inn port til að proxya</string>
-  <string name="pref_has_root">Biðja um Rótaraðgang</string>
-  <string name="pref_has_root_summary">�arfnast rótaraðgangs fyrir gegnsæja proxýun</string>
-  <string name="status_install_success">Uppsetning Tor skráa tókst!</string>
-  <string name="status_install_fail">Tor binary skrár gátu ekki verið settar upp. Vinsamlegast athugaðu Skráninguna og láttu vita til tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Villa í Forriti</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Um Orbot</string>
-  <string name="btn_next">Næsta</string>
-  <string name="btn_back">Til baka</string>
-  <string name="btn_finish">Enda</string>
-  <string name="btn_okay">Ã?kei</string>
-  <string name="btn_cancel">Hætta við</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Fáein Orbot Smáatriði</string>
-  <string name="wizard_details_msg">Orbot er open-source forrit sem inniheldur Tor, LibEvent og Polipo. �að veitir staðbundinn HTTP proxy (8118) og SOCKS proxy (9050) inná Tor netið. Orbot hefur líka eiginleika, á tæki með rótaraðgang, til að senda alla vefumferð í gegnum Tor.</string>
-  <string name="wizard_permissions_root">Aðgangur Heimilaður</string>
-  <string name="wizard_permissions_stock">Orbot Leyfisveiting</string>
-  <string name="wizard_premissions_msg_root">Frábært! Við höfum skynjað að þú hefur rótaraðgang heimilaðan fyrir Orbot. Við munum nota þetta vald skynsamlega.</string>
-  <string name="wizard_permissions_msg_stock">�rátt fyrir að vera ekki nauðsynlegt, getur Orbot orðið öflugra verkfæri ef tækið þitt hefur rótaraðgang. Notaðu hnappinn fyrir neðan til að veita Orbot ofurkrafta!</string>
-  <string name="wizard_permissions_no_root">Ef þú hefur ekki rótaraðgang eða hefur enga hugmynd um hvað við erum að tala, vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot.</string>
-  <string name="wizard_permissions_consent">�g skil og vil halda áfram án réttinda Ofurnotanda</string>
-  <string name="wizard_permission_enable_root">Veita rótaraðgang fyrir Orbot</string>
-  <string name="wizard_configure">Stilla Torinleika</string>
-  <string name="wizard_configure_msg">Orbot gefur þér möguleikann á að beina allri umferð smáforrita í gegnum Tor E�A að velja smáforrit hvert fyrir sig.</string>
-  <string name="wizard_configure_all">Beina umferð fyrir öll smáforrit í gegnum Tor</string>
-  <string name="wizard_configure_select_apps">Velja Einstök Smáforrit fyrir Tor</string>
-  <string name="wizard_tips_tricks">Orbot-virk Smáforrit</string>
-  <string name="wizard_tips_msg">Smáforritin fyrir neðan voru þróuð til að virka með Orbot. Klikkaðu hvern takka til að setja upp núna, eða þú getur fundið þá seinna á Google Play, á heimasíðu GuardianProject.info eða í gegnum F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - �ruggur spjall þjónn fyrir Android</string>
-  <string name="wizard_tips_proxy">Proxy Stillingar - Lærðu hvernig á að stilla smáforrit til að virka með Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Leitarvél smáforrit</string>
-  <string name="wizard_tips_twitter">Setja Twitter proxy hýsir til \"localhost\" and port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Búða til sögu og skildu það eftir fyrir tor vegna öryggis!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy Stillingar</string>
-  <string name="wizard_proxy_help_msg">Ef að Android smáforritið sem þú notar, styður notkun af HTTP eða SOCKS proxy, getur þú stillt það til að tengjast Orbot og nota Tor.\n\n\nStillingar þjóns er 127.0.0.1 eða \"localhost\". Fyrir HTTP, port stillingin er 8118. Fyrir SOCKS, proxyinn er 9050. �ú ættir að nota SOCKS4A eða SOCKS5 ef mögulegt. �ú getur lært meira um proxýun á Android með FAQ á: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot er tilbúinn!</string>
-  <string name="wizard_final_msg">Milljónir manneskja um allan heim nota Tor útaf mörgum mismunandi ástæðum.\n\nBlaðamenn og bloggarar, mannréttindasinnar, lögreglufólk, hermenn, stórfyrirtæki, þegnar bælandi ríkisstjórna og bara venjulegir borgarar... og núna þú ert líka tilbúinn!</string>
-  <string name="wizard_exit_at_first_screen_toast">Vinsamlegast stilltu Orbot áður en þú getur byrjað að nota það!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">�etta mun opna vef vafrann þinn að https://check.torproject.org til að sjá hvort Orbot sé rétt tengdur og að þú sért tengdur Tor.</string>
-  <string name="pref_hs_group">Falin �jónusta Hýsing</string>
-  <string name="pref_general_group">Almennt</string>
-  <string name="pref_start_boot_title">Virkja Orbot við Ræsingu</string>
-  <string name="pref_start_boot_summary">Sjálfkrafa virkja Orbot og tengja Tor þegar Android tækið þitt ræsist</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot kemur með Tor til Android!\n\nTor hjálpar þér að verjast gegn síun innihalds, umferðargreiningu og net eftirliti sem er hættulegt friðhelgi einkalífsins, trúnaðarupplýsingum og persónulegum samböndum.\n\n�essi leiðbeinandi hjálpar þér að stilla Orbot og Tor á tækinu þínu.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Aðvörun</string>
-  <string name="wizard_warning_msg">Aðeins með að setja Orbot upp mun ekki sjálfkrafa gera netumferð þína nafnlausa.\n\n�ú verður að stilla Orbot rétt, tækið þitt og önnur smáforrit til að nota Tor rétt.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Leyfisveitingar</string>
-  <string name="wizard_permissions_root_msg1">�ú getur valfrjálst veitt Orbot \'Ofurnotanda\' aðgang til að virkja stillingar fyrir lengra komna, eins og Gegnsæ Proxýun.</string>
-  <string name="wizard_permissions_root_msg2">Ef þú vilt ekki gera þetta, vinsamlegast vertu viss um að nota smáforrit sem gerð eru til að vinna með Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Tækið þitt virðist ekki vera með rótaraðgang eða veita \'Ofurnotanda\' réttindi.\n\nVinsamlegast prófaðu \'Smáforrit\' viðmótið á aðalskjánum í staðinn.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Virk Smáforrit</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: �ruggt spjall smáforrit með Utanvegar Dulkóðun</string>
-  <string name="wizard_tips_play">Finndu öll Guardian Verkefnis smáforrit á Google Play</string>
-  <string name="wizard_tips_fdroid">Finndu öll smáforrit úr Guardian Verkefninu á F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Finndu öll smáforrit úr Guardian Verkefninu á https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Gegnsæ Proxýun</string>
-  <string name="wizard_transproxy_msg">�etta leyfir smáforritunum þínum sjálfkrafa að keyra í gengum Tor netið án nokkurra stillinga.</string>
-  <string name="wizard_transproxy_hint">(Hakaðu í þenna reit ef þú hefur enga hugmynd um hvað við erum að tala)</string>
-  <string name="wizard_transproxy_none">Engin</string>
-  <string name="pref_transparent_tethering_title">Tor Netaðgangspunktur</string>
-  <string name="pref_transparent_tethering_summary">Leyfa Tor Gegnsæja Proxýun fyrir Wi-Fi og USB Tæki með Netaðgengi (þarfnast endurræsingar)</string>
-  <string name="button_grant_superuser">Biðja um Ofurnotandaréttindi</string>
-  <string name="pref_select_apps">Velja Smáforrit</string>
-  <string name="pref_select_apps_summary">Velja Smáforrit til að Beina í gegnum Tor</string>
-  <string name="pref_node_configuration">Punkta Stilling</string>
-  <string name="pref_node_configuration_summary">�etta eru flóknari stillingar sem geta minnkað nafnleysið þitt</string>
-  <string name="pref_entrance_node">Inngangs Punktur</string>
-  <string name="pref_entrance_node_summary">Fingraför, uppnefni, lönd og heimilisföng fyrir fyrsta hoppið</string>
-  <string name="pref_entrance_node_dialog">Sláðu Inn Inngangspunkt</string>
-  <string name="button_proxy_all">Proxy Allt</string>
-  <string name="button_proxy_none">Proxy Ekkert</string>
-  <string name="button_invert_selection">Ã?fugt Val</string>
-  <string name="pref_proxy_title">�tistandandi Net Proxy (Valfrjálst)</string>
-  <string name="pref_proxy_type_title">�tistandandi Proxy Gerð</string>
-  <string name="pref_proxy_type_summary">Protocol til að nota fyrir proxy þjón: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Sláðu Inn Gerð Proxýs</string>
-  <string name="pref_proxy_host_title">�tistandandi Proxy Hýsir</string>
-  <string name="pref_proxy_host_summary">Proxy Netþjóns nafn</string>
-  <string name="pref_proxy_host_dialog">Sláðu Inn Proxy �jón</string>
-  <string name="pref_proxy_port_title">Ã?tistandandi Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy Netþjóns port</string>
-  <string name="pref_proxy_port_dialog">Sláðu Inn Proxy port</string>
-  <string name="pref_proxy_username_title">Ã?tistandandi Proxy Notendanafn</string>
-  <string name="pref_proxy_username_summary">Proxy Notendanafn (Valfrjálst)</string>
-  <string name="pref_proxy_username_dialog">Sláðu Inn Proxy Notendanafn</string>
-  <string name="pref_proxy_password_title">�tistandandi Proxy Lykilorð</string>
-  <string name="pref_proxy_password_summary">Proxy Lykilorð (Valfrjálst)</string>
-  <string name="pref_proxy_password_dialog">Sláðu Inn Proxy Lykilorð</string>
-  <string name="status">Staða</string>
-  <string name="setting_up_full_transparent_proxying_">Set upp full-gegnsæjan proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Set upp smáforrita-byggðan gegnsæjan proxy... </string>
-  <string name="transparent_proxying_enabled">Gegnsæ proxýun KVEIKT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy kveikt fyrir Netaðgangspunkt!</string>
-  <string name="warning_error_starting_transparent_proxying_">A�V�RUN: villa við að kveikja á gegnsærri proxýun</string>
-  <string name="transproxy_rules_cleared">TransProxy reglur hreinsaðar</string>
-  <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor þráð:</string>
-  <string name="privoxy_is_running_on_port_">Polipo keyrir á porti:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Set upp port-byggða gegnsæja proxýun...</string>
-  <string name="bridge_error">Brúar Villa</string>
-  <string name="bridge_requires_ip">Til að nota brúar viðbótina, verðuru að slá inn að minnsta kosti eina IP addressu fyrir brú.</string>
-  <string name="send_email_for_bridges">Sendu tölvupóst til bridges@xxxxxxxxxxxxxx með setningunni \"get bridges\" eitt og sér í innihaldi skeytisins frá gmail aðgangi.</string>
-  <string name="error">Villa</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">�itt ReachableAddressur stillingar ollu undanþágu!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Gat ekki kveikt á Tor þráð:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">�itt ReachableAddressur stillingar ollu undanþágu!</string>
   <string name="your_relay_settings_caused_an_exception_">Endurvarp stillingar þínar ollu undanþágu!</string>
-  <string name="exit_nodes">Ã?tgangspunktar</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingraför, uppnefni, lönd og heimilisföng fyrir síðasta hoppið</string>
-  <string name="enter_exit_nodes">Sláðu Inn �tgangspunkta</string>
-  <string name="exclude_nodes">Ã?tiloka Punkta</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingraför, uppnefni, lönd og heimilisföng til að útiloka</string>
-  <string name="enter_exclude_nodes">Sláðu Inn �tiloka Punkta</string>
-  <string name="strict_nodes">Strangir Punktar</string>
-  <string name="use_only_these_specified_nodes">Nota *aðeins* þessa tilgreindu punkta</string>
-  <string name="bridges">Brýr</string>
-  <string name="use_bridges">Nota Brýr</string>
-  <string name="bridges_obfuscated">Villandi Brýr</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kveikja hliðstæðan inngangspunkt inná Tor Netið</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Leyfa ef stilltar brýr eru villandi brýr</string>
-  <string name="ip_address_and_port_of_bridges">IP addressa og brúarport</string>
-  <string name="enter_bridge_addresses">Sláðu Inn Brúar Addressur</string>
-  <string name="relays">Endurvarpar</string>
-  <string name="relaying">Endurvörpun</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Leyfa tækinu þínu að vera útgangslaus endurvarpi</string>
-  <string name="relay_port">Endurvörpunar Port</string>
-  <string name="listening_port_for_your_tor_relay">Hlustunar port fyrir Tor endurvarpann þinn</string>
-  <string name="enter_or_port">Sláðu Inn OR port</string>
-  <string name="relay_nickname">Endurvörpunar viðurnefni</string>
-  <string name="the_nickname_for_your_tor_relay">Viðurnefni fyrir Tor endurvarpið þitt</string>
-  <string name="enter_a_custom_relay_nickname">Sláðu Inn sérhannað endurvarp viðurnefni</string>
-  <string name="reachable_addresses">Nálgunarhæf Heimilisföng</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Keyra sem notandi bakvið eldvegg með hamlandi skilyrðum</string>
-  <string name="reachable_ports">Nálgunarhæf port</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Port nálgunarhæf bakvið hamlandi eldvegg</string>
-  <string name="enter_ports">Sláðu Inn port</string>
-  <string name="enable_hidden_services">Falin �jónusta Hýsing</string>
-  <string name="run_servers_accessible_via_the_tor_network">leyfa á-tæki netþjón til að vera aðgengilegur í gegnum Tor netið</string>
-  <string name="enter_localhost_ports_for_hidden_services">sláðu inn localhost port fyrir faldar þjónustur</string>
-  <string name="hidden_service_ports">Falin �jónustu Port</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nafnið fyrir falda þjónustu þína (búið til sjálfkrafa)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">leyfa villuskráningu á verða búin til (verður að nota adb eða aLogCat til að skoða)</string>
-  <string name="project_home">Heimili Verkefni(sins):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor Leyfið</string>
-  <string name="https_torproject_org">https:torproject.org</string>
-  <string name="third_party_software">Hugbúnaður frá 3ja aðila:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Smáforrit vill opna falið port þjóns %S að Tor netinu. �etta er öruggt ef þú treystir smáforritinu.</string>
-  <string name="found_existing_tor_process">fann annan Tor þráð...</string>
+    <string name="found_existing_tor_process">fann annan Tor þráð...</string>
   <string name="something_bad_happened">Eitthvað slæmt gerðist. Athugaðu skráninguna</string>
-  <string name="hidden_service_on">falin þjónusta á:</string>
-  <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string>
+    <string name="unable_to_read_hidden_service_name">get ekki lesið nafn földu þjónustunnar</string>
   <string name="unable_to_start_tor">Get ekki kveikt á Tor:</string>
-  <string name="unable_to_reset_tor">Endurræstu tækið þitt, ekki hægt að núllstilla Tor!</string>
-  <string name="pref_use_sys_iptables_title">Nota Upprunalegar IPtöflur</string>
-  <string name="pref_use_sys_iptables_summary">nota innbyggðar iptöflur binary í staðinn fyrir þær sem fylgja með Orbot</string>
-  <string name="error_installing_binares">Tor binary-in gátu ekki verið uppsettar eða uppfærðar.</string>
-  <string name="pref_use_persistent_notifications">Alltaf hafa smámynd í glugganum þegar Orbot er tengudr</string>
-  <string name="pref_use_persistent_notifications_title">Alltaf-� Upplýsingar</string>
-  <string name="pref_use_expanded_notifications">Sýndu útvíkkaðar upplýsingar varðandi Tor útgangsland og IP tölu</string>
-  <string name="pref_use_expanded_notifications_title">�tvíkkaðar Upplýsingar</string>
-  <string name="notification_using_bridges">Brýr kveiktar!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Tungumál</string>
-  <string name="set_locale_summary">Veldu staðsetningu og tungumál fyrir Orbot</string>
-  <string name="wizard_locale_title">Veldu Tungumál</string>
-  <string name="wizard_locale_msg">Leyfa upprunalega eða skipta núverandi tungumáli</string>
-  <string name="powered_by">gert kleift af Tor</string>
-  <string name="btn_save_settings">Geyma Stillingar</string>
-  <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</string>
-  <string name="bandwidth_">Bandvídd:</string>
-  <string name="down">niðri</string>
-  <string name="up">uppi</string>
-  <string name="pref_disable_network_title">Enginn Netkerfis Sjálfvirkur-Svefn</string>
-  <string name="pref_disable_network_summary">Svæfðu Tor þegar engin internet tenging er til staðar</string>
-  <string name="newnym">�ú ert komin með nýtt Tor auðkenni!</string>
-  <string name="menu_use_chatsecure">Nota ChatSecure</string>
-  <string name="permission_manage_tor_label">Stilla Tor</string>
-  <string name="permission_manage_tor_description">Leyfa þessu smáforriti að stjórna Tor þjónustunni</string>
-  <string name="install_apps_">Setja upp smáforrit?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Engin tenging við netið. Tor verður svæfður...</string>
+    <string name="no_internet_connection_tor">Engin tenging við netið; Tor er í biðstöðu...</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æfður...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Tenging við netið er góð. Tor verður vakinn...</string>
   <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string>
-  <string name="pref_socks_title">Tor SOCKS</string>
-  <string name="pref_socks_summary">Port sem Tor býður SOCKS proxy á (upprunalegt: 9050 eða 0 til að slökkva)</string>
-  <string name="pref_socks_dialog">SOCK Port Stilling</string>
-  <string name="pref_transport_title">Tor GegnsærProxy Port</string>
-  <string name="pref_transport_summary">Port sem Tor býður Gegnsæjum Proxy á (upprunalegt: 9040 eða 0 til að slökkva)</string>
-  <string name="pref_transport_dialog">GegnsærProxy Port Stilling</string>
-  <string name="pref_dnsport_title">Tor DNS Port</string>
-  <string name="pref_dnsport_summary">Port sem Tor býður DNS á (upprunalegt: 5400 eða 0 til að slökkva)</string>
-  <string name="pref_dnsport_dialog">DNS Port Stilling</string>
-  <string name="pref_torrc_title">Torrc Mótanleg Stilling</string>
-  <string name="pref_torrc_summary">A�EINS S�RFR��INGAR: sláðu inn beinar torrc stillingar línur</string>
-  <string name="pref_torrc_dialog">Mótanlegt Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech Mannréttinda Skjölunar Smáforrit</string>
-  <string name="your_tor_public_ips_">Tor Almennings IP tölurnar �ínar </string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vinsamlegast slökktu á þessu smáforriti í Android-&gt;Settings-&gt;Apps ef þú ert í vandræðum með Orbot: </string>
-  <string name="app_conflict">Smáforrita �rekstur</string>
-  <string name="pref_transproxy_refresh_title">Gegnsærproxy Sjálfkrafa Endurnýjun</string>
-  <string name="pref_transproxy_refresh_summary">Endursetja Gegnsærproxy reglurnar þegar ástand netsins breytist</string>
-  <string name="pref_transproxy_flush_title">Gegnsærproxy �VINGU� FJARL�GING</string>
-  <string name="pref_transproxy_flush_summary">�ttu hér til að henda öllum gegnsærproxy net reglunum N�NA</string>
-  <string name="transparent_proxy_rules_flushed_">Gegnsær proxy reglum hent!</string>
-  <string name="you_do_not_have_root_access_enabled">�ú ert ekki með R�TAR aðgang kveikt</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">�ú gætir þurft að stöðva og byrja Orbot til að stillinga breytingar taka gildi.</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Brýr Uppfærðar</string>
-  <string name="restart_orbot_to_use_this_bridge_">Vinsamlegast endurræstu Orbot til að breytingarnar taki gildi</string>
-  <string name="menu_qr">QR Kóðar</string>
-  <string name="bridge_mode">Brúar Viðmót</string>
-  <string name="get_bridges_email">Tölvupóstur</string>
-  <string name="get_bridges_web">Vefur</string>
-  <string name="activate">Virkja</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">�ú getur leyft öllum smáforritum á tækinu þínu að fara í gegnum Tor netið með að nota VPN möguleikann í Android.\n\n*A�V�RUN* �etta er ný, tilraunar möguleiki og í sumum tilfellum mun ekki byrja sjálfkrafa, eða geta stöðvast. �að ætti EKKI að notast fyrir nafnleysi, og A�EINS notað til að komast í gegnum eldveggi og síur.</string>
-  <string name="send_email">Senda Tölvupóst</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">�ú getur fengið brúar heimilisfang í gegnum tölvupóst, vefinn eða með að skanna brúar QR kóða. Veldu \'Tölvupóstur\' eða \'Vefur\' fyrir neðan til að óska eftir brúar heimilisfangi.\n\n�egar þú hefur heimilisfang, afritaðu &amp; límdu það inn í \'Brýr\' stillingu í stillingar og endurræsun í Orbot.</string>
-  <string name="standard_browser">Staðlaður Vafri</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">ATHUGA�U: Aðeins staðlaðar Tor brýr virka á Intel X86/ATOM devices</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-it/strings.xml b/orbotservice/src/main/res/values-it/strings.xml
index a09c43e3..734a7fd3 100644
--- a/orbotservice/src/main/res/values-it/strings.xml
+++ b/orbotservice/src/main/res/values-it/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot è un\'applicazione proxy che permette alle altre applicazioni di accedere a internet in maniera più sicura. Orbot usa Tor per cifrare il  traffico internet e lo nasconde poi facendolo rimbalzare attraverso una serie di computer attorno al mondo. Tor è un software libero e una rete aperta che aiuta a difendersi da una forma di sorveglianza della rete conosciuta come analisi del traffico. Quest\'ultima minaccia libertà e privacy personale, attività commerciali riservate, rapporti interpersonali, e persino la sicurezza di stato.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">avvia e ferma Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot è in esecuzione...</string>
+    <string name="status_starting_up">Orbot è in esecuzione...</string>
   <string name="status_activated">Connesso alla rete Tor</string>
   <string name="status_disabled">\"Orbot è disattivato</string>
   <string name="status_shutting_down">TorService si sta spegnendo</string>
   <string name="tor_process_starting">Avvio client Tor...</string>
   <string name="tor_process_complete">completa.</string>
-  <string name="tor_process_waiting">attesa.</string>
-  <string name="not_anonymous_yet">ATTENZIONE: Il traffico non è ancora anonimo! Configura le applicazioni per utilizzare il proxy HTTP 127.0.0.1:8118,  SOCKS4A o proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Sfoglia</string>
-  <string name="menu_settings">Impostazioni</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Aiuto</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Avvio</string>
-  <string name="menu_stop">Ferma</string>
-  <string name="menu_about">About</string>
-  <string name="menu_promo_apps">Installa apps...</string>
-  <string name="main_layout_download">Download (velocità/totale)</string>
-  <string name="main_layout_upload">Upload (velocità/totale)</string>
-  <string name="button_help">Aiuto</string>
-  <string name="button_close">Chiudi</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Cancella log</string>
-  <string name="menu_verify">Controlla</string>
-  <string name="menu_exit">Esci</string>
-  <string name="menu_scan">Scansiona BridgeQR</string>
-  <string name="menu_share_bridge">Condividi BridgeQR</string>
-  <string name="press_to_start">- tieni premuto per avviare -</string>
-  <string name="pref_trans_proxy_group">Proxying trasparente (Richiede root)</string>
-  <string name="pref_trans_proxy_title">Proxying trasparente</string>
-  <string name="pref_trans_proxy_summary">Torifying automatico delle app</string>
-  <string name="pref_transparent_all_title">Tor ovunque</string>
-  <string name="pref_transparent_all_summary">Traffico proxy di tutte le app attraverso Tor</string>
-  <string name="pref_transparent_port_fallback_title">Fallback porte proxy</string>
-  <string name="pref_transparent_port_fallback_summary">ATTENZIONE: Aggira le porte comuni (80, 443, ecc). *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
-  <string name="pref_transparent_port_title">Elenco porte</string>
-  <string name="pref_transparent_port_summary">Lista di porte per cui fare proxy. *USARE SOLO* se le modalità \'All\' o \'App\' non funzionano.</string>
-  <string name="pref_transparent_port_dialog">Inserisci porte da proxare</string>
-  <string name="pref_has_root">Richiesto accesso root</string>
-  <string name="pref_has_root_summary">Richiede il root per il proxying trasparente</string>
-  <string name="status_install_success">I binari di Tor sono stati installati con successo!</string>
-  <string name="status_install_fail">I file binari di Tor non possono essere installati. Controlla i log e notifica l\'accaduto su tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Errore applicazione</string>
-  <string name="wizard_title">Benvenuti in Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Avanti</string>
-  <string name="btn_back">Indietro</string>
-  <string name="btn_finish">Fine</string>
-  <string name="btn_okay">Ok</string>
-  <string name="btn_cancel">Annulla</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Alcuni dettagli su Orbot</string>
-  <string name="wizard_details_msg">Orbot è un\'app open-source contenente Tor, LibEvent e Polipo. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) nella rete Tor. Orbot, solo sui dispositivi con permessi di ROOT, offre anche la possibilità di veicolare tutto il traffico attraverso Tor.</string>
-  <string name="wizard_permissions_root">Permesso concesso</string>
-  <string name="wizard_permissions_stock">Permessi Orbot</string>
-  <string name="wizard_premissions_msg_root">Eccellente! Abbiamo rilevato la presenza dei permessi di root attivati per Orbot. Useremo questi poteri con saggezza.</string>
-  <string name="wizard_permissions_msg_stock">Anche se non è richiesto, Orbot può diventare uno strumento ancora più potente se il dispositivo ha accesso come root. Utilizza il pulsante qui sotto per concedere i superpoteri a Orbot!</string>
-  <string name="wizard_permissions_no_root">Se non hai i permessi root o non hai idea di cosa siano, assicurati solamente di utilizzare applicazioni fatte per lavorare con Orbot.</string>
-  <string name="wizard_permissions_consent">Ho capito e desidero continuare senza il root</string>
-  <string name="wizard_permission_enable_root">Concedi permessi root a Orbot</string>
-  <string name="wizard_configure">Configura Torification</string>
-  <string name="wizard_configure_msg">Orbot dà la possibilità di instradare tutto il traffico delle applicazioni tramite Tor o scegliere le applicazioni singolarmente.</string>
-  <string name="wizard_configure_all">Usa Tor come proxy per tutte le applicazioni.</string>
-  <string name="wizard_configure_select_apps">Seleziona singole App per Tor</string>
-  <string name="wizard_tips_tricks">App abilitate per Orbot</string>
-  <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Client sicuro di messaggistica istantanea, per Android</string>
-  <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string>
-  <string name="wizard_tips_duckgo">App del motore di ricerca Duckduckgo</string>
-  <string name="wizard_tips_twitter">Twitter supporta il proxy http \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Crea una storia e lascia a Tor la sicurezza!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Impostazioni proxy</string>
-  <string name="wizard_proxy_help_msg">Se l\'app Android che stai usando supporta l\'uso di Proxy HTTP o SOCKS, allora puoi configurarle per connettersi a Orbot e usare Tor.\n\n\n L\'impostazione host è 127.0.0.1 o \"localhost\". Per l\'HTTP, il valore della porta è 8118. Per SOCKS, il proxy è 9050. Dovresti utilizzare SOCKS4A o SOCKS5 se possibile.\n \n\n\n PPuoi imparare altro sul proxying in Android tramite le FAQ: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot è pronto!</string>
-  <string name="wizard_final_msg">Milioni di persione in giro per il mondo usano Tor per un\'ampia varietà di ragioni.\n\nGiornalisti e blogger, difensori dei diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string>
-  <string name="wizard_exit_at_first_screen_toast">Perfavore configura Orbot prima di iniziare ad usarlo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il tuo dispositivo è sicuro. � possibile utilizzare l\'opzione \'Browser\' dal menù per testare il browser. \n\nVisita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help@xxxxxxxxxxxxxxxxxxxx per saperne di più.</string>
-  <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string>
-  <string name="pref_hs_group">Servizi nascosti</string>
-  <string name="pref_general_group">Generale</string>
-  <string name="pref_start_boot_title">Avvia Orbot al boot</string>
-  <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot porta Tor su Android!\n\nTor ti aiuta a difenderti da filtraggio di contenuti, analisi del traffico e sorveglianza della rete che minacciano la privacy, informazioni personali e relazioni personali.\n\nQuesta procedura guidata ti aiuterà a configurare Orbot e Tor sul tuo dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Attenzione</string>
-  <string name="wizard_warning_msg">La semplice installazione di Orbot non renderà anonimo il tuo traffico di rete mobile.\n\nDevi configurare correttamente Orbot, il tuo dispositivo e le altre applicazioni per usare Tor efficacemente.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permessi</string>
-  <string name="wizard_permissions_root_msg1">Opzionalmente, è possibile concedere ad Orbot l\'accesso da superutente per abilitare funzionalità avanzate come il proxying trasparente.</string>
-  <string name="wizard_permissions_root_msg2">Se non si vuole intraprendere questa scelta, ci si assicuri di utilizzare applicazioni fatte per funzionare con Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Il vostro dispositivo non sembra essere rooted o fornire accesso da \'Superutente\'.\n\nPerfavore prova invece la modalità \'App\' nella schermata principale.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-App abilitate</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: App chat sicura con Cifratura Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: Browser progettato per la privacy che funziona attraverso Tor</string>
-  <string name="wizard_tips_play">Cerca tutte le app del Guardian Project su Google Play</string>
-  <string name="wizard_tips_fdroid">Trova tutte le app Guardian Projec su F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Trova tutte le app Guardian Project su https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxying trasparente</string>
-  <string name="wizard_transproxy_msg">Questo permette alle tue applicazioni di passare automaticamente attraverso la rete Tor senza necessità di ulteriore configurazione.</string>
-  <string name="wizard_transproxy_hint">(Seleziona questa casella se non hai idea di quello di cui stiamo parlando)</string>
-  <string name="wizard_transproxy_none">Nessuno</string>
-  <string name="pref_transparent_tethering_title">Tethering Tor</string>
-  <string name="pref_transparent_tethering_summary">Abilita il proxying trasparente di Tor per i dispositivi connessi in tethering via Wi-Fi e USB (necessita di riavvio)</string>
-  <string name="button_grant_superuser">Richiede accesso superuser</string>
-  <string name="pref_select_apps">Seleziona app</string>
-  <string name="pref_select_apps_summary">Scegli le applicazioni da utilizzare attraverso Tor</string>
-  <string name="pref_node_configuration">Configurazione nodo</string>
-  <string name="pref_node_configuration_summary">Questi sono parametri di configurazione avanzati che possono ridurre il vostro anonimato</string>
-  <string name="pref_entrance_node">Nodi di entrata</string>
-  <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string>
-  <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string>
-  <string name="pref_allow_background_starts_title">Permetti Avvii in Background</string>
-  <string name="pref_allow_background_starts_summary">Permetti a qualsiasi app di comunicare ad Orbot di avviare Tor e servizi relativi</string>
-  <string name="button_proxy_all">Proxa tutto</string>
-  <string name="button_proxy_none">Non proxare niente</string>
-  <string name="button_invert_selection">Inverti selezione</string>
-  <string name="pref_proxy_title">Proxy di Rete in Uscita (Facoltativo)</string>
-  <string name="pref_proxy_type_title">Tipo proxy</string>
-  <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string>
-  <string name="pref_proxy_host_title">Host proxy</string>
-  <string name="pref_proxy_host_summary">Hostname server proxy</string>
-  <string name="pref_proxy_host_dialog">Inserire l\'host del proxy</string>
-  <string name="pref_proxy_port_title">Porta proxy</string>
-  <string name="pref_proxy_port_summary">Porta del server proxy</string>
-  <string name="pref_proxy_port_dialog">Inserire la porta del proxy</string>
-  <string name="pref_proxy_username_title">Nome Utente del Proxy in Uscita</string>
-  <string name="pref_proxy_username_summary">Nome Utente del Proxy (Facoltativo)</string>
-  <string name="pref_proxy_username_dialog">Inserisci Nome Utente del Proxy</string>
-  <string name="pref_proxy_password_title">Password del Proxy in Uscita</string>
-  <string name="pref_proxy_password_summary">Password del Proxy (Facoltativo)</string>
-  <string name="pref_proxy_password_dialog">Inserisci Password Proxy</string>
-  <string name="status">Stato</string>
-  <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string>
-  <string name="transparent_proxying_enabled">Proxying trasparente ABILITATO</string>
-  <string name="transproxy_enabled_for_tethering_">Proxying trasparente abilitato per il tethering</string>
-  <string name="warning_error_starting_transparent_proxying_">AVVERTIMENTO: errore nell\'avvio del TransProxy!</string>
-  <string name="transproxy_rules_cleared">Regole del TransProxy cancellate</string>
-  <string name="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo è in esecuzione sulla porta:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurazione del proxying trasparente basato su porta...</string>
-  <string name="bridge_error">Errore bridge</string>
-  <string name="bridge_requires_ip">Al fine di utilizzare la funzionalità bridge, è necessario inserire almeno l\'indirizzo IP di un bridge.</string>
-  <string name="send_email_for_bridges">Si consiglia di inviare una email a bridges@xxxxxxxxxxxxxx con la linea \"get bridges\" da sola nel corpo del messaggio da un account gmail.</string>
-  <string name="error">Errore</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">La tua configurazione dell\'indirizzo raggiungibile ha causato un\'eccezione!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Impossibile avviare il processo Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">La tua configurazione dell\'indirizzo raggiungibile ha causato un\'eccezione!</string>
   <string name="your_relay_settings_caused_an_exception_">La configurazione del tuo relay ha causato un\'eccezione!</string>
-  <string name="exit_nodes">Nodi di uscita</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Identificatori, nicknames, paesi ed indirizzi per l\'ultimo hop</string>
-  <string name="enter_exit_nodes">Inserire i nodi d\'uscita</string>
-  <string name="exclude_nodes">Escludere i nodi</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Identificatori, nicknames, paesi ed indirizzi da escludere</string>
-  <string name="enter_exclude_nodes">Inserire i nodi da escludere</string>
-  <string name="strict_nodes">Nodi specifici</string>
-  <string name="use_only_these_specified_nodes">Utilizza *solo* i nodi specificati</string>
-  <string name="bridges">Ponti</string>
-  <string name="use_bridges">Utilizza i bridge</string>
-  <string name="bridges_obfuscated">Bridge mascherati</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Abilita nodi alternati in entrata nella rete Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Attiva se i Bridge configurati sono mascherati</string>
-  <string name="ip_address_and_port_of_bridges">Indirizzo IP e porta dei bridge</string>
-  <string name="enter_bridge_addresses">Inserire gli indirizzi dei bridge</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Abilita il tuo dispositivo per essere un relay non di uscita</string>
-  <string name="relay_port">Porta del relay</string>
-  <string name="listening_port_for_your_tor_relay">Porta in ascolto per il proprio Tor relay</string>
-  <string name="enter_or_port">Inserire la porta OR</string>
-  <string name="relay_nickname">Nickname del relay</string>
-  <string name="the_nickname_for_your_tor_relay">Il nickname per il proprio relay Tor</string>
-  <string name="enter_a_custom_relay_nickname">Inserire un nickname personalizzato per il relay</string>
-  <string name="reachable_addresses">Indirizzo raggiungibile</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Esegui come un client dietro un firewall con politiche restrittive</string>
-  <string name="reachable_ports">Porte raggiungibili</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Porte raggiungibili dietro un firewall restrittivo</string>
-  <string name="enter_ports">Inserisci porte</string>
-  <string name="enable_hidden_services">Abilita servizi nascosti</string>
-  <string name="run_servers_accessible_via_the_tor_network">esegui server accessibili attraverso la rete Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">inserire la porta per l\'host locale per i servizi nascosti</string>
-  <string name="hidden_service_ports">Porta per i servizi nascosti</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">il nome di indirizzamento per i propri servizi nascosti (generato automaticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">abilita i log di debug in output (richiede l\'uso di adb o aLogCat per esser visualizzato)</string>
-  <string name="project_home">Home progetto:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Licenza Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software di terze parti:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Un applicazione ha richiesto di aprire la porta per servizi nascosti %S alla rete Tor. Questo è sicuro se ci si fida dell\'applicazione.</string>
-  <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
+    <string name="found_existing_tor_process">trovato un processo Tor esistente...</string>
   <string name="something_bad_happened">E\' accaduto un evento indesiderato. Controllare i log.</string>
-  <string name="hidden_service_on">servizio nascosto attivo:</string>
-  <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
+    <string name="unable_to_read_hidden_service_name">Impossibile leggere il nome del servizio nascosto.</string>
   <string name="unable_to_start_tor">Impossibile avviare Tor:</string>
-  <string name="unable_to_reset_tor">Riavvia il tuo dispositivo, impossibile resettare Tor!</string>
-  <string name="pref_use_sys_iptables_title">Utilizza Iptables di default</string>
-  <string name="pref_use_sys_iptables_summary">utilizza il binario di iptables installato invece di quello fornito con Orbot</string>
-  <string name="error_installing_binares">Non è stato possibile installare o aggiornare i binari di Tor.</string>
-  <string name="pref_use_persistent_notifications">Mantieni sempre l\'icona nella barra degli strumenti quando Orbot è connesso.</string>
-  <string name="pref_use_persistent_notifications_title">Notifiche sempre attive</string>
-  <string name="pref_use_expanded_notifications">Visualizza notifica espansa con nazione e ip dell\'nodo d\'uscita Tor</string>
-  <string name="pref_use_expanded_notifications_title">Espandi notifiche</string>
-  <string name="notification_using_bridges">Bridge attivati!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Lingua</string>
-  <string name="set_locale_summary">Scegli le impostazioni internazionali e la lingua di Orbot</string>
-  <string name="wizard_locale_title">Scegli Lingua</string>
-  <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">Salva impostazioni</string>
-  <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</string>
-  <string name="bandwidth_">Larghezza di Banda:</string>
-  <string name="down">giù</string>
-  <string name="up">su</string>
-  <string name="pref_disable_network_title">impedire spegnimento automatico della rete</string>
-  <string name="pref_disable_network_summary">Stand-by di Tor quando non c\'è un collegamento a internet disponibile</string>
-  <string name="newnym">Sei passato a una nuova identità Tor!</string>
-  <string name="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Usa ChatSecure</string>
-  <string name="permission_manage_tor_label">Gestisci Tor</string>
-  <string name="permission_manage_tor_description">Abilita questa app per controllare il servizio Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Non sembra che tu abbia Orfox installato. Necessiti di aiuto, o apro semplicemente il browser?</string>
-  <string name="install_apps_">Installare applicazioni?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nessuna connettività di rete. Mettendo Tor a riposo...</string>
+    <string name="no_internet_connection_tor">Nessuna connessione ad internet; Tor è in standby...</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="wizard_tips_martus">Mobile Martus - App per la Documentazione dei Diritti Umani Benetech</string>
-  <string name="your_tor_public_ips_">Il tuo Tor IP pubblico è:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Perfavore disabilita quest\'app in Android-&gt;Impostazioni-&gt;Apps se stai avendo problemi con Orbot: </string>
-  <string name="app_conflict">Conflitto app</string>
-  <string name="pref_transproxy_refresh_title">Auto-Refresh TransProxy</string>
-  <string name="pref_transproxy_refresh_summary">Ri-applica regole Transproxy quando cambia lo stato della rete</string>
-  <string name="pref_transproxy_flush_title">FORZA RIMOZIONE Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Clicca qui per eliminare tutte le regole di rete Transproxy IMMEDIATAMENTE</string>
-  <string name="transparent_proxy_rules_flushed_">Regole Proxy Trasparente eliminate!</string>
-  <string name="you_do_not_have_root_access_enabled">Non ci sono i permessi di ROOT abilitati</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Potrebbe essere necessario riavviare Orbot per applicare i cambiamenti delle impostazioni.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridge attivati</string>
-  <string name="restart_orbot_to_use_this_bridge_">Per favore riavvia Orbot per rendere effettive le modifiche</string>
-  <string name="menu_qr">Codici QR</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se la tua rete cellulare blocca attivamente Tor puoi utilizzare un Bridge per accedere alla rete. Seleziona uno dei tipi di bridge da sopra per attivare i bridge</string>
-  <string name="bridge_mode">Modalità Bridge</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Attiva</string>
-  <string name="apps_mode">Modalità VPN per le applicazioni</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Puoi configurare tutte le app del tuo dispositivo per connettersi attraverso la rete Tor usando la modalità VPN di Android.\n\n*ATTENZIONE* Questa è una funzione nuova e sperimentale, in alcuni potrebbe non avviarsi in automatico o fermarsi. NON dovrebbe essere usata per l\'anonimato ma solo per bypassare filtri e firewall.</string>
-  <string name="send_email">Invia email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Tu poi ricevere un indirizzo bridge via email, web o scansionando un codice QR. Seleziona \'Email\' o \'Web\' per richiedere un indirizzo bridge.\n\nUna volta che hai un indirizzo, copialo &amp; incollalo nell\'opzione \"Bridges\" delle impostazioni di Orbot e riavvialo.</string>
-  <string name="install_orweb">Installa Orfox</string>
-  <string name="standard_browser">Browser standard</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Solo i Tor Bridges standard funzionano sui dispositivi Intel x86/Atom</string>
-  <string name="vpn_default_world">Mondo</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-iw/strings.xml b/orbotservice/src/main/res/values-iw/strings.xml
index e5e33f9b..c22e5b90 100644
--- a/orbotservice/src/main/res/values-iw/strings.xml
+++ b/orbotservice/src/main/res/values-iw/strings.xml
@@ -2,232 +2,27 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ×?×?× ×? ×?פ×?×?קצ×?×?ת פר×?קס×? ×?×?× ×?×?ת ×?×?×?פשרת ×?×?פ×?×?קצ×?×?ת ×?×?ר×?ת ×?×?שת×?ש ×?×?×?× ×?רנ×? ×?×?×?×?×?. Orbot × ×¢×?רת ×?-Tor ×?×?×? ×?×?צפ×?×? ×?ת תע×?×?רת ×?×?×?× ×?רנ×? ש×?×? ×?×?×?ס×?×?ת×? ×?×?×?צע×?ת×? × ×?ת×?×?×? ×?ר×? ×?ספר ×?×?ש×?×?×? ×?ר×?×?×? ×?×¢×?×?×?. Tor ×?×?×? ת×?×?× ×? ×?×?פש×?ת ×?רשת פת×?×?×? ×?×?ס×?×?עת ×?×? ×?×?ת×?×?× ×? ×?פנ×? ס×?×?×?×? ×?ס×?×?×?×?×? ש×? ×?×?צע×? × ×?×?×?ר ×?×?עק×? ×?×?ר רשת ×?×?×?× ×?רנ×? ×?×?×?×?×?×?×?×? ×¢×? ×?פר×?×?×?ת, ×?×?×?ר×?ת ×?×?×?ש×?ת, פע×?×?×?×?×?ת עסק×?×?ת ×?×?ער×?×?ת ×?×?ס×?×? ×?ש×?×?×?ת.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">×?ת×?×? ×?עצ×?ר ×?ת Tor</string>
-  <string name="tor_proxy_service_process">ש×?ר×?ת פר×?קס×? Tor</string>
-  <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
+    <string name="status_starting_up">Orbot ×?ת×?×?×?â?¦</string>
   <string name="status_activated">×?×?×?×?ר ×?רשת Tor</string>
   <string name="status_disabled">Orbot ×?×?×?×?</string>
   <string name="tor_process_starting">×?ת×?×?×? ×?ק×?×? Tor...</string>
   <string name="tor_process_complete">×?×?ש×?×?.</string>
-  <string name="tor_process_waiting">×?×?×?×?.</string>
-  <string name="not_anonymous_yet">×?×?×?ר×?: ×?תע×?×?ר×? ש×?×? ×?×?× ×? ×?× ×?× ×?×?×?ת ×¢×?×?×?×?! ×?×?קש×? ×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?×? ש×?ת×?פשר ש×?×?×?ש ×?פר×?קס×? HTTP (קר×? 127.0.0.1:8118) ×?×? SOCKS4A ×?×? SOCKS5 (קר×? 127.0.0.1:9050)</string>
-  <string name="menu_home">×?×?ת</string>
-  <string name="menu_browse">×?פ×?×£</string>
-  <string name="menu_settings">×?×?×?ר×?ת</string>
-  <string name="menu_log">ר×?ש×?×?</string>
-  <string name="menu_info">×¢×?ר×?</string>
-  <string name="menu_start">×?ת×?×?</string>
-  <string name="menu_stop">עצ×?ר</string>
-  <string name="menu_about">×?×?×?×?ת</string>
-  <string name="main_layout_download">×?×?ר×?×?</string>
-  <string name="main_layout_upload">×?×¢×?×?×?</string>
-  <string name="button_help">×¢×?ר×?</string>
-  <string name="button_close">ס×?×?ר</string>
-  <string name="button_about">×?×?×?×?ת</string>
-  <string name="button_clear_log">נק×? ר×?ש×?×?</string>
-  <string name="menu_verify">×?×?×?ק</string>
-  <string name="menu_exit">×?צ×?×?×?</string>
-  <string name="menu_scan">סר×?ק BridgeQR</string>
-  <string name="menu_share_bridge">שתף BridgeQR</string>
-  <string name="press_to_start">-× ×?×?×¢×? ×?ר×?×?×? ×?×?ת×?×?×?-</string>
-  <string name="pref_trans_proxy_group">פר×?קס×? שק×?×£ (ש×?רש × ×?רש)</string>
-  <string name="pref_trans_proxy_title">פר×?קס×? שק×?×£</string>
-  <string name="pref_trans_proxy_summary">×¢×?×?×?×? ×?×?×?×?×?×?×?ת ×¢×? ×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_all_title">×?×?×? ×?ר×? Tor</string>
-  <string name="pref_transparent_all_summary">תע×?×?ר ×?ר×? פר×?קס×?  ×¢×?×?ר ×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="pref_transparent_port_fallback_title">×?פ×?×? פ×?ר×? פר×?קס×?</string>
-  <string name="pref_transparent_port_fallback_summary">×?×?×?ר×?: עק×?×£ פ×?ר×?×?×? נפ×?צ×?×? (80,443 ×?×?×?\'). *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_title">רש×?×?ת פ×?ר×?×?×?</string>
-  <string name="pref_transparent_port_summary">רש×?×?ת פ×?ר×?×?×? ×?פר×?קס×?. *×?שת×?ש רק* ×?×? ×?×?×?פנ×?×? \'All\' ×?×? \'App\'  ×?×? ×¢×?×?×?×?×?.</string>
-  <string name="pref_transparent_port_dialog">×?×?×? פ×?ר×?×?×? ×?פר×?קס×?</string>
-  <string name="pref_has_root">×?ר×?ש×? ×?×?שת ש×?רש</string>
-  <string name="pref_has_root_summary">×?קש ×?×?ש×? ×¢×?×?×?× ×? ×¢×?×?ר ש×?×?×?ש ×?פר×?קס×? שק×?×£</string>
-  <string name="status_install_success">ק×?צ×?×? ×?ר×? ×?רצ×? ש×? Tor ×?×?תקנ×? ×?×?צ×?×?×?!</string>
-  <string name="status_install_fail">×?ק×?צ×?×? ×?ר×? ×?×?רצ×? ש×? Tor ×?×? × ×?תנ×? ×?×?תקנ×?. ×?×?קש×? ×?×?×?ק ×?ת ×?×?×?×? ×?×?×?×?×¢ ×? 
-tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">ש×?×?×?ת ×?פ×?×?קצ×?×?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">×?×?×?×?ת Orbot</string>
-  <string name="btn_next">×?×?×?</string>
-  <string name="btn_back">×?ק×?×?×?</string>
-  <string name="btn_finish">ס×?×?×?</string>
-  <string name="btn_okay">×?×?ש×?ר</string>
-  <string name="btn_cancel">×?×?×?×?×?</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">פר×?×?×? ×?ס×?×?×?×?×? ש×? Orbot </string>
-  <string name="wizard_details_msg">Orbot ×?×?×? ×?פ×?×?קצ×?×?ת ק×?×? פת×?×? ×?×?×?×?×?ת ×?ת Tor, LibEvent ×?-Polipo. ×?×?×? ×?ת×?×?ר ×?רשת Tor ×?×?×?צע×?ת שרת פר×?קס×? HTTP ×?ק×?×?×? (8118) ×?שרת פר×?קס×? SOCKS (פ×?ר×? 9050). Orbot ×?×?×?×?×? ×?× ×?סף ×¢×? ×?רש×?×?ת ר×?×? ×?נת×? ×?ת ×?×? תע×?×?רת ×?×?×?× ×?רנ×? ש×? ×?×?×?ש×?ר ×?ר×? Tor ×?×?ר×?רת ×?×?×?×?.</string>
-  <string name="wizard_permissions_root">× ×?תנ×? ×?רש×?×?</string>
-  <string name="wizard_permissions_stock">×?רש×?×?ת Orbot</string>
-  <string name="wizard_premissions_msg_root">×?צ×?×?×?! ×?×?×?×?× ×? ×?×? ×?ש ×?×? ×?רש×?×?ת ש×?רש ×?×?×?פשר×?ת ×?ש×?×?×? Orbot. ×?× ×?× ×? נשת×?ש ×?×?×?×? ×?×?×? ×?×?×?×?×?×?.</string>
-  <string name="wizard_permissions_msg_stock">×?×?×?×? ש×?×? ×?×? × ×?רש, Orbot ×?×?×?×?×? ×?×?פ×?×? ×?×?×?×?ת ×?×?×? ×?×?ק ×?×?תר ×?×? ×?×?×?ש×?ר ש×?×? ×?ש ×?×?ש×? ×¢×?×?×?× ×?. תשת×?ש ×?×?פת×?ר ×?×?×?×? ×?×?×? ×?ק×?×? ×?×?×?×?ת ×¢×? ש×? Orbot !</string>
-  <string name="wizard_permissions_no_root">×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×?×?×?× ×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?, רק ת×?×?×?×? שתשת×?ש ×?×?פ×?×?קצ×?×?ת שנ×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot.</string>
-  <string name="wizard_permissions_consent">×?×?נת×? ×?×?× ×? ×?×¢×?×?×£ ×?×?×?ש×?×? ×?×?×? Superuser</string>
-  <string name="wizard_permission_enable_root">×?פשר ×?×?שת ש×?רש ×¢×?×?ר Orbot</string>
-  <string name="wizard_configure">×?×?×?ר ×¢×?×?×?×? ×?×?×?צע×?ת Tor</string>
-  <string name="wizard_configure_msg">Orbot × ×?תנת ×?×? ×?פשר×?ת ×?×?×?×?×? ×?ת ×?×? תע×?×?רת ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor ×?×? ×?×?×?×?ר ×?ת ×?×?פ×?×?קצ×?×?ת ש×?×? ×?נפר×?.</string>
-  <string name="wizard_configure_all">×?שת×?ש ×?פר×?קס×? ×?×?×? ×?×?פ×?×?קצ×?×?ת ×?ר×? Tor</string>
-  <string name="wizard_configure_select_apps">×?×?ר ×?פ×?×?קצ×?×?ת ×?ס×?×?×?×?ת ×¢×?×?ר Tor</string>
-  <string name="wizard_tips_tricks">Orbot ×?ת×?פשר ×¢×? ×?×?×? ×?פ×?×?קצ×?×?ת</string>
-  <string name="wizard_tips_msg">×?×?פ×?×?קצ×?×?ת ×?ת×?ת פ×?ת×?×? ×?×¢×?×?×?×? ×¢×? Orbot. ×?×?×¥ ×¢×? ×?×? ×?פת×?ר ×?×?תקנ×? ×?×?×?×?×?ת, ×?×? ש×?ת×? ×?×?×?×? ×?×?צ×?×? ×?×?ת×? ×?×?ר ×?×? ×? Google Play, ×?×?תר GuardianProject.info ×?×?
-×?ר×?  F-Droid.org</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ת×?×?נת ×?סר×?×? ×?×?×?×?×?×? ×?×?×?×?×?×?ת ×?×?× ×?ר×?×?×?×?</string>
-  <string name="wizard_tips_proxy">×?×?×?ר×?ת פר×?קס×? - ×?×?×? ×?×?×? ×?×?×?×?×?ר ×?פ×?×?קצ×?×?ת ×?×¢×?×?×? ×¢×? Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ×?פ×?×?קצ×?×?ת ×?× ×?×¢ ×?×?פ×?ש</string>
-  <string name="wizard_tips_twitter">ק×?×¢ פר×?קס×? Twitter ×?×?×?ר×? \"localhost\" ×?×?פ×?ר×? 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ×?ער×? ש×?×¢×?ר×?×? ×?×¢×?ת×?× ×?×?×? ×¢×? ש×?×?×?ש ×?-Tor ×?×?×?× ×? ×¢×? ×¢×?×?×?ת×?.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">×?×?×?ר×?ת פר×?קס×?</string>
-  <string name="wizard_proxy_help_msg">×?×? ×?פ×?×?קצת ×?×?× ×?ר×?×?×?×? ש×?ת×? ×?שת×?ש ת×?×?×?ת ×?פר×?קס×? ×?×?×?סס HTTP ×?×? SOCKS, ת×?×?×? ×?×?×?×?×?ר ×?×?ת×? ×?×¢×?×?×? ×¢×? Orbot ת×?ת Tor. \n\n\n ×?×?×?×?ר×?ת ×?×?: ש×? ×?שרת ×?×?×? 127.0.0.1 ×?×? \"localhost\". ×¢×?×?ר HTTP, ×?פ×?ר×? ×?×?×? 8118. ×¢×?×?ר SOCKS, ×?פ×?ר×? ×?×?×? 9050. ×¢×?×?×? ×?×?שת×?ש ×?SOCKS4A ×?×? SOCKS5 ×?×? ×?פשר.\n \n\n\n ת×?×?×? ×?×?×?×?×? ×¢×?×? ×?×?×?×?ת פר×?קס×? ×?×?× ×?ר×?×?×?×? ת×?ת ×¢×?×?×? ×?ש×?×?×?ת ×?נפ×?צ×?ת ש×?× ×? ×?×?ת×?×?ת: http://tinyurl.com/proxyandroid </string>
-  <string name="wizard_final">Orbot ×?×?×?×?!</string>
-  <string name="wizard_final_msg">×?×?×?×?×?× ×? ×?נש×?×? ×?ר×?×?×? ×?×¢×?×?×? ×?שת×?ש×?×? ×?Tor ×?ס×?×?×?ת ר×?×?ת.\n\n ×¢×?ת×?× ×?×?×? ×?×?×?×?×?ר×?×?, פע×?×?×? ×?×?×?×?×?ת ×?×?×?, ש×?×?ר×?×?, ×?×?×?×?×?×?, ת×?×?×?×?×?×?, ×?×?ר×?×? ×?×?ש×?ר×?×? ×?×?×?×?×?×?×? ×?×?×? ×?×?ר×?×?×? פש×?×?×?×?... ×?×¢×?ש×?×? ×?×? ×?ת×?!</string>
-  <string name="wizard_exit_at_first_screen_toast">×?× ×? ×?×?×?ר ×?ת Orbot ×?פנ×? שת×?×?×? ×?×?ת×?×?×? ×?×?שת×?ש ×?×?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">×?×?ר ×?×? ×?×?×?×?×? ×?ת ×?פ×?פ×? ×?רשת ש×?×? ×?×?×?×? https://check.torproject.org ×?×?×? ×?ר×?×?ת ×?×? Orbot ×?×?×?×?ר×? ×?ר×?×?×? ×?×?×? ×?×? ×?ת×? ×?×?×?×?ר ×?רשת Tor.</string>
-  <string name="pref_hs_group">×?×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="pref_general_group">×?×?×?×?</string>
-  <string name="pref_start_boot_title">×?ת×?×? ×?ת Orbot ×?×?×?×?קת ×?×?×?ש×?ר</string>
-  <string name="pref_start_boot_summary">×?ת×?×? ×?ת Orbot ×?×?ת×?×?ר ×?רשת Tor ×?×?×?×?×?×?×?ת ×?×?שר ×?×?×?ש×?ר × ×?×?ק</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">×?×?×?ר×?</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">×?רש×?×?ת</string>
-  <string name="wizard_permissions_root_msg1">×?ת×? ×?×?×?×? ×?×?×¢× ×?ק ×?×?פ×?×?קצ×?×? Orbot ×?×?שת \'Superuser\' ×?×?×? ×?×?פשר ×?×?פ×?×?× ×?×? ×?תק×?×?×?×? ×?×?×? ×?×?ש×?, פר×?קס×? שק×?×£.</string>
-  <string name="wizard_permissions_root_msg2">×?×? ×?ת×? ×?×? ר×?צ×? ×?עש×?ת ×?ת ×?×?, ×?× ×? ×?קפ×? ×?×?שת×?ש ×?×?פ×?×?קצ×?×?ת ש×?×?×¢×?×? ×?×¢×?×?×? ×¢×? Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-×?×?ש×?×?×?×? ×?×?פע×?×?×?</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ×?פ×?×?קצ×?×?ת ×?סר×?×? ×¢×? ×?צפנת Off-the-Record</string>
-  <string name="wizard_tips_play">×?צ×? ×?ת ×?×? ×?פ×?×?צ×?×?ת Guardian Project ×?צ×? Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">פר×?קס×? שק×?×£</string>
-  <string name="wizard_transproxy_msg">×?×? ×?×?פשר ×?×?פ×?×?קצ×?×?ת ש×?×? ×?ר×?×¥ ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ר×? רשת Tor ×?×?×? ×?×? תצ×?ר×?.</string>
-  <string name="wizard_transproxy_hint">(ס×?×? ת×?×?×? ×?×? ×?×? ×?×?×? ×?×? ×?×?ש×? ×¢×? ×?×? ×?× ×?× ×? ×?×?×?ר×?×?)</string>
-  <string name="wizard_transproxy_none">×?×?×?×?</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">×?×?פשר ×¢×?×?×?×? ×¢×? פר×?קס×? שק×?×£ ×¢×?×?ר רשת ×?×?×?×?×?×?ת ×?×?×?ש×?ר×?  USB Tethered (×?×?רש ×?ת×?×?×? ×?×?×?ש)</string>
-  <string name="button_grant_superuser">×?ר×?ש ×?×?ש×?ר Superuser</string>
-  <string name="pref_select_apps">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_select_apps_summary">×?×?ר ×?פ×?קצ×?×?ת</string>
-  <string name="pref_node_configuration">×?×?×?ר×?ת Node</string>
-  <string name="pref_node_configuration_summary">ק×?×?×?×?ת ×?×?×?ר×?ת ×?תק×?×?×?ת ש×?×?×?×?×?ת ×?×?פ×?×?ת ×?ת ×?×?× ×?× ×?×?×?×?ת ש×?×?</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">×?×?×?×¢×?ת ×?צ×?×¢, ×?×?× ×?×?×?×?, ×?רצ×?ת ×?×?ת×?×?×?ת ×¢×?×?ר ×?×?×¢×?ר ×?ר×?ש×?×?</string>
-  <string name="pref_entrance_node_dialog">×?×?נס Entrance Nodes</string>
-  <string name="button_proxy_all">×?×¢×?ר ×?×?×? ×?ר×? פר×?קס×?</string>
-  <string name="button_proxy_none">×?×? תשת×?ש ×?פר×?קס×?</string>
-  <string name="button_invert_selection">×?פ×?×? ×?×?×?ר×?</string>
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
-  <string name="pref_proxy_type_summary">פר×?×?×?ק×?×? ש×?×?×?ש ×?שרת פר×?קס×?:  HTTP, HTTPS, Socks4,Socks5</string>
-  <string name="pref_proxy_type_dialog">ס×?×? ×?פר×?קס×?</string>
-  <string name="pref_proxy_host_title">×?×?ר×? ש×? Outbound Proxy</string>
-  <string name="pref_proxy_host_summary">ש×? ×?×?ר×? שרת פר×?קס×?</string>
-  <string name="pref_proxy_host_dialog">×?×?נס ×?×?ר×? פר×?קס×?</string>
-  <string name="pref_proxy_port_title">פ×?ר×? ש×? Outbound Proxy</string>
-  <string name="pref_proxy_port_summary">פ×?ר×? שרת פר×?קס×?</string>
-  <string name="pref_proxy_port_dialog">×?×?נס פ×?ר×? ש×? פר×?קס×?</string>
-  <string name="pref_proxy_username_title">ש×? ×?שת×?ש ש×? Outbound Proxy</string>
-  <string name="pref_proxy_username_summary">ש×? ×?שת×?ש פר×?קס×? (רש×?ת)</string>
-  <string name="pref_proxy_username_dialog">×?×?×? ש×? ×?שת×?ש פר×?קס×?</string>
-  <string name="pref_proxy_password_title">ס×?ס×?×? ש×? Outbound Proxy</string>
-  <string name="pref_proxy_password_summary">ס×?ס×?ת פר×?קס×? (רש×?ת)</string>
-  <string name="pref_proxy_password_dialog">×?×?×? ס×?ס×?ת פר×?קס×?</string>
-  <string name="status">ס×?×?×?ס</string>
-  <string name="setting_up_full_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£...</string>
-  <string name="setting_up_app_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס ×?פ×?×?קצ×?×?ת...</string>
-  <string name="transparent_proxying_enabled">פר×?קס×? שק×?×£ ×?×?×?פשר</string>
-  <string name="transproxy_enabled_for_tethering_">פר×?קס×? שק×?×£ ×?×?×?פשר ×? Tathering!</string>
-  <string name="warning_error_starting_transparent_proxying_">×?×?×?ר×?: ש×?×?×?×? ×?ת×?×?×?×? ×?ת ×?פר×?קס×? ×?שק×?×£!</string>
-  <string name="transproxy_rules_cleared">×?×?×?×? TransProxy ×?×?×?ר×?</string>
-  <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo רץ ×¢×? פ×?ר×?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">×?×?× ×? ש×? ×?פר×?קס×? ×?שק×?×£ ×?×?×?סס פ×?ר×?...</string>
-  <string name="bridge_error">ש×?×?×?ת ×?שר</string>
-  <string name="error">ש×?×?×?×?</string>
-  <string name="exit_nodes">צ×?ת×? ×?צ×?×?×?</string>
-  <string name="enter_exit_nodes">×?×?×? צ×?ת×? ×?צ×?×?×?</string>
-  <string name="exclude_nodes">צ×?ת×?×? ×?×?צ×?×?×?</string>
-  <string name="enter_exclude_nodes">×?×?×? צ×?ת×?×? ×?×?צ×?×?×?</string>
-  <string name="strict_nodes">צ×?ת×?×? קפ×?× ×?×?</string>
-  <string name="use_only_these_specified_nodes">×?שת×?ש *רק* ×?צ×?ת×?×? ×?צ×?×?× ×?×? ×?×?×?</string>
-  <string name="bridges">×?שר×?×?</string>
-  <string name="use_bridges">×?שת×?ש ×?×?שר×?×?</string>
-  <string name="bridges_obfuscated">×?שר×?×? ×?×¢×?רפ×?×?×?</string>
-  <string name="ip_address_and_port_of_bridges">×?ת×?×?ת ×?-IP ×?×?צ×?×?×? ש×? ×?×?שר×?×?</string>
-  <string name="enter_bridge_addresses">×?×?נס ×?ת×?×?×?ת ×?שר</string>
-  <string name="relays">×?×?סר×?×?</string>
-  <string name="relaying">×?×?ס×?ר</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">×?פשר ×?×?×?ש×?ר ש×?×? ×?×?×?×?ת ת×?נת ×?×?סר ש×?×?× × ×? ×?צ×?×?×?</string>
-  <string name="relay_port">פ×?ר×? ×?×?×?סר</string>
-  <string name="listening_port_for_your_tor_relay">פ×?ר×? ×?×?×?×?×? ×¢×?×?ר Tor relay</string>
-  <string name="enter_or_port"> ×?×?נס ×?צ×?×?ת OR</string>
-  <string name="relay_nickname">×?×?× ×?×? ×?×?×?סר</string>
-  <string name="the_nickname_for_your_tor_relay">×?×?×?× ×?×? ×?×?×?סר Tor ש×?×?</string>
-  <string name="enter_a_custom_relay_nickname">×?×?×? ×?×?× ×?×? ×¢×?×?ר ×?×?סר</string>
-  <string name="reachable_addresses">×?ת×?×?×?ת ×?×?×?ש×? ×?×?</string>
-  <string name="reachable_ports">פ×?ר×?×?×? ×?×?×?ש×? ×?×?</string>
-  <string name="enter_ports">×?×?×? פ×?ר×?×?×?</string>
-  <string name="enable_hidden_services">×?×?ס×?×? ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="enter_localhost_ports_for_hidden_services">×?×?×? פ×?ר×?×?×? ש×? localhost ×¢×?×?ר ש×?ר×?ת×?×? נסתר×?×?</string>
-  <string name="hidden_service_ports">פ×?ר×? ×?ש×?ר×?ת×?×? ×?נסתר×?×?</string>
-  <string name="project_home">×?תר×? ×?פר×?×?ק×?:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">×?רש×?×?×? ש×? Tor</string>
-  <string name="https_torproject_org">https://torproject.org/</string>
-  <string name="third_party_software">ת×?×?× ×?-צ×?-×?׳: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</string>
+    <string name="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
   <string name="something_bad_happened">×?ש×?×? רע ×?תר×?ש. ×?×?×?ק ×?ת ×?×?×?×?×?</string>
-  <string name="hidden_service_on">ש×?ר×?ת נסתר ×?:</string>
-  <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
+    <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
   <string name="unable_to_start_tor">×?×? ×?ס×?×?×? ×?×?ת×?×?×? ×?ת Tor:</string>
-  <string name="unable_to_reset_tor">×?ת×?×? ×?ת ×?×?×?ש×?ר ש×?×?, ×?×?×? ×?פשר×?ת ×?×?פע×?×? ×?×?×?ש ×?ת Tor!</string>
-  <string name="pref_use_sys_iptables_title">×?שת×?ש ×?×?ר×?ר×?ת ×?×?×?×?×? ש×? iptables</string>
-  <string name="pref_use_persistent_notifications">×?ש×?×?ר ת×?×?×? ×?ת ×?×?×?ק×?×? ×?סר×?×? ×?×?×?×? ×?ש×?×?ר×?×?×? ×?×?×?×?ר</string>
-  <string name="notification_using_bridges">×?שר×?×? ×?×?×?פשר×?×?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">שפ×?</string>
-  <string name="set_locale_summary">×?×?ר ×?ת ×?×?ק×?×?×?×?ת ×?×?שפ×? ש×? Orbot</string>
-  <string name="wizard_locale_title">×?×?ר שפ×?</string>
-  <string name="wizard_locale_msg">×?ש×?ר ×?ר×?רת ×?×?×?×? ×?×? ×?×?×?×£ ×?שפ×? ×?× ×?×?×?×?ת</string>
-  <string name="powered_by">×?×?פע×? ×?×?×?צע×?ת Tor</string>
-  <string name="btn_save_settings">ש×?×?רת ×?×?×?ר×?ת</string>
-  <string name="no_internet_connection_tor">×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?; ת×?ר ×?×?ת×?×?...</string>
-  <string name="bandwidth_">ר×?×?×? פס:</string>
-  <string name="down">×?×?×?</string>
-  <string name="up">×?×¢×?×?</string>
-  <string name="pref_disable_network_summary">×?×?×? ×?ת Tor ×?×?שר ×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?</string>
-  <string name="newnym">×?×?×?פת ×?×? ×?×?×?ת Tor ×?×?ש×?!</string>
-  <string name="menu_use_chatsecure">×?פע×? ×?ת ChatSecure</string>
-  <string name="permission_manage_tor_label">× ×?×? Tor</string>
-  <string name="permission_manage_tor_description">×?פשר ×?ת ×?פ×?×?קצ×?×? ×?×? ×?×?×? ×?ש×?×?×? ×?ש×?ר×?ת Tor</string>
-  <string name="install_apps_">×?×?תק×?×? ×?פ×?×?קצ×?×??</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">×?×?×? ×?×?×?×?ר ×?רשת. ×?×?×?×? ×?ת Tor....</string>
+    <string name="no_internet_connection_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="your_tor_public_ips_">×?IPs ×?×?×?צ×?× ×?×?×? ש×?×? ×¢×? Tor:</string>
-  <string name="you_do_not_have_root_access_enabled">×?×?×? ×?×? ×?×?שת ר×?×? ×?×?×?פשרת</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">תצ×?ר×? ×?×?×?×?ת ×?×?×?פע×?×? ×?ת Orbot ×¢×? ×?נת ×?×?×?×?×? ×?ת ×?ש×?× ×?×? ×?×?×?×?ר×?ת.</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="menu_qr">ק×?×? QR</string>
-  <string name="get_bridges_email">×?×?×?\"×?</string>
-  <string name="get_bridges_web">×?תר</string>
-  <string name="activate">×?פע×?</string>
-  <string name="send_email">ש×?×? ×?×?×?\"×?</string>
-  <string name="standard_browser">×?פ×?פ×? ר×?×?×?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ja/strings.xml b/orbotservice/src/main/res/values-ja/strings.xml
index d283168d..f3f39f89 100644
--- a/orbotservice/src/main/res/values-ja/strings.xml
+++ b/orbotservice/src/main/res/values-ja/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbotã?¯ä»?ã?®ã?¢ã??ã?ªã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã??ã??å®?å?¨ã?«ä½¿ã??ã??ã?¨ã??å?¯è?½ã?«ã??ã??ã??ã?ªã?¼ã?®ã??ã?­ã?­ã?·ã?¢ã??ã?ªã?§ã??ã??Orbotã?§ã?¯ã??Torã??ç?¨ã??ã?¦ã??ã?ªã??ã?®ç«¯æ?«ã?®ã??ã?©ã??ã?£ã??ã?¯ã??æ??å?·å??ã??ã??ä¸?ç??中ã?®ã?³ã?³ã??ã?¥ã?¼ã?¿ã?¼ã??中ç¶?ã??ã??ã??ã?¨ã?§ã??ã??ã?®ã??ã?©ã??ã?£ã??ã?¯ã??é? ã??ã?¾ã??ã??Torã?¯ã??ã?ªã?¼ã?®ã?½ã??ã??ã?¦ã?§ã?¢ã?¨ã?ªã?¼ã??ã?³ã?ªã??ã??ã??ã?¯ã?¼ã?¯ã?§ã??ã??ã??ã?¦ã?¼ã?¶ã?¼ã?®è?ªç?±ã?¨ã??ã?©ã?¤ã??ã?·ã?¼ã??è??ã??ã??ç?£è¦?æ´»å??ã??ã??æ©?å¯?ã?®ã??ã?¸ã??ã?¹æ´»å??ã??å?½å®¶ã?«ã??ã??ã??ã?©ã??ã?£ã??ã?¯å??æ??ã??ã??身ã??å®?ã??ã??ã?¨ã??å?©ã??ã?¦ã??ã??ã?¾ã??ã??</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Torã??èµ·å??ã?»å??æ­¢ã??ã??</string>
-  <string name="tor_proxy_service_process">Torã??ã?­ã?¯ã?·ã?µã?¼ã??ã?¹</string>
-  <string name="status_starting_up">Orbotã??é??å§?ã??ã??ã?¦ã??ã?¾ã??...</string>
+    <string name="status_starting_up">Orbotã??é??å§?ã??ã??ã?¦ã??ã?¾ã??...</string>
   <string name="status_activated">Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ?¥ç¶?ã??ã?¦ã??ã?¾ã??</string>
   <string name="status_disabled">\"Orbotã??解é?¤ã??ã??ã?¾ã??ã??</string>
   <string name="status_shutting_down">TorServiceã??çµ?äº?ã??ã?¦ã??ã?¾ã??</string>
   <string name="tor_process_starting">Torã?¯ã?©ã?¤ã?¨ã?³ã??ã??é??å§?ã??ã?¦ã??ã?¾ã??...</string>
   <string name="tor_process_complete">��</string>
-  <string name="tor_process_waiting">ã??å¾?ã?¡ã??ã? ã??ã??</string>
-  <string name="not_anonymous_yet">è­¦å??:ã??ã?®é??ä¿¡ã?¯ã?¾ã? å?¿å??å??ã??ã??ã?¦ã??ã?¾ã??ã??ï¼?ã??HTTP proxy 127.0.0.1:8118ã??ã??ã?? SOCKS4A ã?¾ã??ã?¯ SOCKS5 proxy 127.0.0.1:9050ã??ã??å?©ç?¨ã??ã??ã??ã??ã?«ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³å?´ã?§è¨­å®?ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="menu_home">ã??ã?¼ã? </string>
-  <string name="menu_browse">�覧</string>
-  <string name="menu_settings">設�</string>
-  <string name="menu_log">履歴</string>
-  <string name="menu_info">ã??ã?«ã??</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">ã?¹ã?¿ã?¼ã??</string>
-  <string name="menu_stop">å??æ­¢</string>
-  <string name="menu_about">æ??å ±</string>
-  <string name="menu_promo_apps">ã?¢ã??ã?ªã??å?¥æ??â?¦</string>
-  <string name="main_layout_download">ã??ã?¦ã?³ã?­ã?¼ã??</string>
-  <string name="main_layout_upload">ã?¢ã??ã??ã?­ã?¼ã??</string>
-  <string name="button_help">ã??ã?«ã??</string>
-  <string name="button_close">é??ã??ã??</string>
-  <string name="button_about">ã?«ã?¤ã??ã?¦</string>
-  <string name="button_clear_log">ã?­ã?°ã??å??é?¤ã??ã??</string>
-  <string name="menu_verify">確�</string>
-  <string name="menu_exit">��</string>
-  <string name="menu_scan">ã??ã?ªã??ã?¸QRã??ã?¹ã?­ã?£ã?³</string>
-  <string name="menu_share_bridge">ã??ã?ªã??ã?¸QRã??å?±æ??</string>
-  <string name="press_to_start">- é?·æ?¼ã??ã??ã?¦èµ·å?? -</string>
-  <string name="pref_trans_proxy_group">é??é??ã??ã?­ã?­ã?· (è¦?root)</string>
-  <string name="pref_trans_proxy_title">é??é??ã??ã?­ã?­ã?·</string>
-  <string name="pref_trans_proxy_summary">ã?¢ã??ã?ªã?®è?ªå??Torå??中</string>
-  <string name="pref_transparent_all_title">å?¨ã?¦ã??Torå??</string>
-  <string name="pref_transparent_all_summary">å?¨ã?¦ã?®ã?¢ã??ã?ªã??Torçµ?ç?±ã?§ä½¿ã??</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">è­¦å??:é??常ã?®ã??ã?¼ã??(80,443ç­?)ã??è¿?å??ã??ã??å?¨ã?¦ã??ã??ã??æ??å®?ã?¢ã??ã?ªã??ã?¢ã?¼ã??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="pref_transparent_port_title">ã??ã?¼ã??ä¸?覧</string>
-  <string name="pref_transparent_port_summary">ã??ã?­ã?­ã?·ã??é??ã??ã??ã?¼ã??ã??*è­¦å??*ã??ã??å?¨ã?¦ã??ã??ã??æ??å®?ã?¢ã??ã?ªã??ã??å??ä½?ã??ã?ªã??å ´å??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="pref_transparent_port_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??ç?ªå?·ã??å?¥å??</string>
-  <string name="pref_has_root">ã?«ã?¼ã??ã?¢ã?¯ã?»ã?¹ã?®è¨±å?¯ã??è¦?æ±?ã??ã?¾ã??</string>
-  <string name="pref_has_root_summary">é??é??ã??ã?­ã?­ã?·ã?®ã??ã??ã?«root権é??ã??å¿?è¦?ã?§ã??</string>
-  <string name="status_install_success">Torã??ã?¤ã??ã?ªã?¤ã?³ã?¹ã??ã?¼ã?«ã??æ??å??ã??ã?¾ã??ã??</string>
-  <string name="status_install_fail">Torã??ã?¤ã??ã?ªã??ã?¡ã?¤ã?«ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã?§ã??ã?¾ã??ã??ã?§ã??ã??ã??ã?­ã?°ã??調ã?¹ã?¦ã??é??ç?¥ã??tor-assistants@xxxxxxxxxxxxxxã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="title_error">ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?¨ã?©ã?¼</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbotã?«ã?¤ã??ã?¦</string>
-  <string name="btn_next">次</string>
-  <string name="btn_back">æ?»ã??</string>
-  <string name="btn_finish">��</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">�����</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Orbot詳細</string>
-  <string name="wizard_details_msg">Orbot ã?¯Torã??LibEventã??Privoxyã??å?«ã??ã?ªã?¼ã??ã?³ã?½ã?¼ã?¹ ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã?§ã??ã??ã?­ã?¼ã?«ã?«ã?®HTTPã??ã?­ã?­ã?· (8118) ã?¨SOCKSã??ã?­ã?­ã?· (9050) ã??æ??ä¾?ã??ã?¦Toræ?¥ç¶?ã??ã?¾ã??ã??rootå??ã??ã??ã??端æ?«ã?§ã?¯ã??Orbotã?¯å?¨ã?¦ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??é??ä¿¡ã??Torã??é??ã??ã?¦é??ä¿¡ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??</string>
-  <string name="wizard_permissions_root">権é??ã??å??å¾?å®?äº?</string>
-  <string name="wizard_permissions_stock">Orbotã?®æ¨©é??</string>
-  <string name="wizard_premissions_msg_root">Orbotã??root権é??ã??å??å¾?ã??ã??ã??ã?¨ã??確èª?ã??ã?¾ã??ã??ã??å?¨ã?¦ã?®æ©?è?½ã??å?©ç?¨ã?§ã??ã?¾ã??ã??</string>
-  <string name="wizard_permissions_msg_stock">Orbotã?¯rootå??ã??ã??ã??端æ?«ã?§ã?¯å?¨ã?¦ã?®æ©?è?½ã??æ´»ç?¨ã?§ã??ã?¾ã??ã??ä¸?ã?®ã??ã?¿ã?³ã??æ?¼ã??ã?¦Orbotã?«ç®¡ç??è??権é??ã??ä¸?ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_permissions_no_root">rootå??ã??ã?¦ã??ã?ªã??ã?£ã??ã??ã??ã??ã??ã??ã??rootå??ã??ä½?ã?®ã??ã?¨ã? ã??ã??ã??ã??ã?ªã??æ?¹ã?¯ã??Orbotä¸?ã?§å??ä½?確èª?ã??å??ã??ã?¦ã??ã??ã?¢ã??ã?ªã? ã??ã??使ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_permissions_consent">Superuserã??å?©ç?¨ã??ã??ã?«ç¶?è¡?</string>
-  <string name="wizard_permission_enable_root">Orbotã?«root権é??ã??ä¸?ã??ã??</string>
-  <string name="wizard_configure">Torã??ã?½ã??ã??ã?¦ã?§ã?¢ã?«ä½¿ç?¨ã??ã??設å®?</string>
-  <string name="wizard_configure_msg">Orbotã?§ã?¯å?¨ã?¦ã?®ã?¢ã??ã?ªã?«Torã??ã?­ã?­ã?·ã??é??ã??ã??ã??Torã?¢ã??ã?ªã??使ã??å??ã??ã?®ã?¢ã??ã?ªã??æ??å®?ã?§ã??ã?¾ã??ã??</string>
-  <string name="wizard_configure_all">å?¨ã?¦ã?®ã?¢ã??ã?ªã?«Torã??ã?­ã?­ã?·ã??é??ã??</string>
-  <string name="wizard_configure_select_apps">æ??å®?ã??ã??ã?¢ã??ã?ªã? ã??ã?«Torã??ã?­ã?­ã?·ã??é??ã??</string>
-  <string name="wizard_tips_tricks">Orbotã??æ??å?¹å??ã??ã??ã??ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_msg">以ä¸?ã?®ã?¢ã??ã?ªã?¯Orbotç?¨ã?«ä½?ã??ã??ã?¦ã??ã?¾ã??ã??ã??ã??ã??ã??ã?®ã??ã?¿ã?³ã??æ?¼ã??ã?¨ä»?ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã?§ã??ã?¾ã??ã??Google Playã??ã??ã??å??ã??ã??ã?®ã??æ?¢ã??ã?¾ã??ã??</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android ç?¨ã?®ã?»ã?­ã?¥ã?¢ã?ªã?¤ã?³ã?¹ã?¿ã?³ã??ã?¡ã??ã?»ã?¼ã?¸ã?¯ã?©ã?¤ã?¢ã?³ã??</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Orbotã?§ã?¢ã??ã?ªã??å??ã??ã??ã??ã??ã?®æ??é ?æ?¸</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo æ¤?ç´¢ã?¨ã?³ã?¸ã?³ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_twitter">Twitter proxyã??ã??localhostã??ã?¨8118ç?ªã??ã?¼ã??ã?«å??ã??ã??ã??</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ã?¹ã??ã?¼ã?ªã?¼ã??ä½?æ??ã??ã?¦ã??ã?»ã?­ã?¥ã?ªã??ã?£ã?®ã??ã??Torã?§æ®?ã??ã?¾ã??!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">ã??ã?­ã?­ã?·è¨­å®?</string>
-  <string name="wizard_proxy_help_msg">Androidã?¢ã??ã?ªã??HTTPã??SOCKSã??ã?­ã?­ã?·ã??å?©ç?¨ã?§ã??ã??å ´å??ã??Orbotã??使ã?£ã?¦Toræ?¥ç¶?ã??ã??ã??ã??ã?¨ã??å?¯è?½ã?§ã??ã??\n\n\n ã??ã?¹ã??設å®?ã?¯127.0.0.1ã?¾ã??ã?¯localhostã?§ã??ã??HTTPã?§ã?¯ä½¿ç?¨ã??ã?¼ã??ã?¯8118ã?§ã??ã??SOCKSã?§ã?¯9050ã?§ã??ã??å?¯è?½ã?§ã??ã??ã?°SOCKS4Aã??SOCKS5ã?®å?©ç?¨ã??æ?¨å¥¨ã??ã?¾ã??ã??\n \n\n\n Androidä¸?ã?®ã??ã?­ã?­ã?·ã?«ã?¤ã??ã?¦å­¦ã?³ã??ã??å ´å??ã?¯ http://tinyurl.com/proxyandroid ã?®FAQã??å??ç?§ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_final">Orbotã?®æº?å??ã??å®?äº?ã??ã?¾ã??ã??</string>
-  <string name="wizard_final_msg">ä¸?ç??中ã?§æ?°ç?¾ä¸?人ã??æ§?ã??ã?ªç??ç?±ã?§Torã??å?©ç?¨ã??ã?¦ã??ã?¾ã??ã??\n\nã?¸ã?£ã?¼ã??ã?ªã?¹ã??ã??ã??ã?­ã?¬ã?¼ã??人権å?£ä½?ã??æ³?ç??æ©?é?¢ã??è»?é??ã??ä¼?業ã??ç?¬è£?å?½å®¶ã?®å¸?æ°?ã??æ?®é??ã?®å¸?æ°?ã??â?¦ ã??ã??ã?¦ã??ã?ªã??ã??å??ã??ã??ã??ã?«å?©ç?¨ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??!</string>
-  <string name="wizard_exit_at_first_screen_toast">使ç?¨ã??é??å§?ã??ã??å??ã?«Orbotã??設å®?ã??ã?¦ã??ã? ã??ã??!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Torã??ã??ã??ã?¯ã?¼ã?¯ã?«æ­£å¸¸ã?«æ?¥ç¶?ã??ã?¾ã??ã?? - ã??ã??ã??ã??使ã??ã?®ç«¯æ?«ã??å®?å?¨ã? ã?¨ã?¯é??ã??ã?¾ã??ã??ã??ã??ã??ã?©ã?¦ã?¶ã??ã??ã?¿ã?³ã??使ç?¨ã??ã?¦æ?¥ç¶?ã?®ã??ã?¹ã??ã??ã?§ã??ã?¾ã??ã?? \n\nã??ã??ã?«è©³ç´°ã?¯https://guardianproject.info/apps/orbot ã??å??ç?§ã??ã??ã??ã??help@xxxxxxxxxxxxxxxxxxxx ã?«ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="tor_check">ã??ã?©ã?¦ã?¶ã??é??ã??ã?¦https://check.torproject.org ã?«Toræ?¥ç¶?ã??ã??Orbotã?®è¨­å®?ã??æ??å??ã??ã??ã??ã??試ã??ã?¾ã??ã??</string>
-  <string name="pref_hs_group">Hidden Services</string>
-  <string name="pref_general_group">��</string>
-  <string name="pref_start_boot_title">èµ·å??æ??ã?«Orbotã??å®?è¡?ã??ã??</string>
-  <string name="pref_start_boot_summary">Android端æ?«ã?®èµ·å??æ??ã?«Orbotã??è?ªå??å®?è¡?</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Androidã?§ã??Orbotã?§Torã??使ã??ã?¾ã??!\n\nTorã?¯ã??ã?³ã?³ã??ã?³ã??ã??ã?£ã?«ã?¿ã?ªã?³ã?°ã??ã??ã?©ã??ã?£ã??ã?¯å??æ??ã??ã??ã??ã?¦ã??ã?©ã?¤ã??ã?·ã?¼ã??æ©?å¯?æ??å ±ã??å??人ç??ã?ªé?¢ä¿?ã??è??ã??ã??ã??ã??ã??ã?¯ã?¼ã?¯ç?£è¦?ã??ã??å®?ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n\nã??ã?®ã?¦ã?£ã?¶ã?¼ã??ã?¯ã??使ã??ã?®ç«¯æ?«ã?§Orbotã?¨Torã?®è¨­å®?ã??ã?§ã??ã?¾ã??ã??</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">注æ??</string>
-  <string name="wizard_warning_msg">Orbotã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã??ã? ã??ã?§ã?¯é??ä¿¡ã?¯å?¿å??å??ã??ã??ã?¾ã??ã??ã??\n\nOrbotã??Android端æ?«ã??ã?¢ã??ã?ªã?®å?¨ã?¦ã??æ­£ã??ã??設å®?ã??ã?ªã??ã?¨Torã?¯ä½¿ã??ã?¾ã??ã??ã??</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">許�</string>
-  <string name="wizard_permissions_root_msg1">ã?ªã??ã?·ã?§ã?³ã?¨ã??ã?¦Orbotã?«ã?¹ã?¼ã??ã?¼ã?¦ã?¼ã?¶ã?¼æ¨©é??ã??ä¸?ã??ã??ã??ã?¨ã?§é??é??ã??ã?­ã?­ã?·ã?ªã?©ã?®è¿½å? æ©?è?½ã??使ã??ã?¾ã??ã??</string>
-  <string name="wizard_permissions_root_msg2">ã??ã??ã??å®?è¡?ã??ã?ªã??å ´å??ã??Orbotç?¨ã?«ä½?ã??ã??ã??ã?¢ã??ã?ªã? ã??ã??使ã?£ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="wizard_permissions_no_root_msg">ã??使ã??ã?®ç«¯æ?«ã?¯rootå??ã??ã??ã?¦ã??ã?ªã??ã??ã??rootã?¾ã??ã?¯ã??Superuserã??ã?«ã?¢ã?¯ã?»ã?¹ã?§ã??ã?ªã??ã??ã??ã?§ã??ã?? \n\n代ã??ã??ã?«ã??ã?¡ã?¤ã?³ç?»é?¢ã?®ã??ã?¢ã??ã?ªã??ã?¢ã?¼ã??ã??試ã??ã?¦ã??ã? ã??ã??ã?? </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotã??æ??å?¹å??ã??ã??ã??ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: é??è¨?é?²å¼?æ??å?·ã?«ã??ã??ã?»ã?­ã?¥ã?¢ã?ªã??ã?£ã??ã??ã?¢ã??ã?ª</string>
-  <string name="wizard_tips_orweb">Orfox: Torã??ä»?ã??ã?¦å??ä½?ã??ã??ã??ã?©ã?¤ã??ã?·ã?¼ã??å¼·å??ã??ã??ã??ã?©ã?¦ã?¶</string>
-  <string name="wizard_tips_play">Google Playã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
-  <string name="wizard_tips_fdroid">F-Droidã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
-  <string name="wizard_tips_fdroid_org">https://f-droid.org ã?§å?¨ã?¦ã?®Guardian Projectã?®ã?¢ã??ã?ªã??è¦?ã?¤ã??ã??</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">é??é??ã??ã?­ã?­ã?·</string>
-  <string name="wizard_transproxy_msg">ã??ã??ã?¯ã??ã?ªã??ã?®ã?¢ã??ã?ªã??è?ªå??ç??ã?«Torçµ?ç?±ã?§é??ä¿¡ã??ã??ã?¾ã??ã??</string>
-  <string name="wizard_transproxy_hint">(ä½?ã??è¨?ã?£ã?¦ã??ã??ã?®ã??ã??ã??ã??ã?ªã??ã?¨ã??ã?¯ã??ã??ã??ã??ã?§ã??ã?¯ã??ã?¦ã??ã? ã??ã??)</string>
-  <string name="wizard_transproxy_none">ç?¡ã??</string>
-  <string name="pref_transparent_tethering_title">Torã??ã?¶ã?ªã?³ã?°</string>
-  <string name="pref_transparent_tethering_summary">Toré??é??ã??ã?­ã?¯ã?·ã??Wi-Fiã??USBã??ã?¶ã?ªã?³ã?°ã??ã??ã??ã??ã??ã?¤ã?¹ã?«å¯¾ã??ã?¦æ??å?¹å??(å??èµ·å??ã??å¿?è¦?)</string>
-  <string name="button_grant_superuser">管ç??許å?¯ã?¢ã?¯ã?»ã?¹ã??è¦?æ±?ã??ã?¾ã??</string>
-  <string name="pref_select_apps">ã?¢ã??ã?ªã?±ã?¼ã?·ã?§ã?³ã??é?¸æ??ã??ã?¾ã??</string>
-  <string name="pref_select_apps_summary">Torã??çµ?ç?±ã??ã??ã??ã?¢ã??ã?ªã??é?¸æ??</string>
-  <string name="pref_node_configuration">ã??ã?¼ã??設å®?</string>
-  <string name="pref_node_configuration_summary">ã??注æ??ã??å??é?²è¨­å®?ã??å?¿å??ã?¬ã??ã?«ã??縮å°?ã??ã?¾ã??</string>
-  <string name="pref_entrance_node">å?¥ã??å?£ã??ã?¼ã??</string>
-  <string name="pref_entrance_node_summary">æ??å??ã?®ã??ã??ã??ã?®ã??ã??ã?®ã??ã?¸ã?¿ã?«æ??ç´?ã??ã??ã??ã?¯ã??ã?¼ã? ã??å?½ã?¨IPã?¢ã??ã?¬ã?¹</string>
-  <string name="pref_entrance_node_dialog">å?¥ã??å?£ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="pref_allow_background_starts_title">ã??ã??ã?¯ã?°ã?©ã?¦ã?³ã??ã?®é??å§?ã??許å?¯</string>
-  <string name="pref_allow_background_starts_summary">Orbotã??Torã?¨é?¢é?£ã?µã?¼ã??ã?¹ã??é??å§?ã??ã??ã??ã??ã?«ã??ä»»æ??ã?®ã?¢ã??ã?ªã?«ä¼?ã??ã?¾ã??</string>
-  <string name="button_proxy_all">ã??ã?¹ã?¦ã??ã?­ã?­ã?·</string>
-  <string name="button_proxy_none">ã??ã?­ã?­ã?·ã?ªã??</string>
-  <string name="button_invert_selection">é?¸æ??ã?®å??転</string>
-  <string name="pref_proxy_title">å¤?æ?¹å??ã??ã??ã??ã?¯ã?¼ã?¯ã??ã?­ã?­ã?· (ã?ªã??ã?·ã?§ã?³)</string>
-  <string name="pref_proxy_type_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ç¨®é¡?</string>
-  <string name="pref_proxy_type_summary">HTTP,HTTPS,Socks4,Socks5ã?§ä½¿ç?¨ã??ã??ã??ã?­ã??ã?³ã?«</string>
-  <string name="pref_proxy_type_dialog">ã??ã?­ã?­ã?·ã?®ç¨®é¡?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="pref_proxy_host_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¹ã??</string>
-  <string name="pref_proxy_host_summary">ã??ã?­ã?­ã?·ã?µã?¼ã??ã?®ã??ã?¹ã??å??</string>
-  <string name="pref_proxy_host_dialog">ã??ã?­ã?¯ã?·ã??ã??ã?¹ã??ã??å?¥å??</string>
-  <string name="pref_proxy_port_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??</string>
-  <string name="pref_proxy_port_summary">ã??ã?­ã?­ã?·ã?µã?¼ã??ã?®ã??ã?¼ã??</string>
-  <string name="pref_proxy_port_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="pref_proxy_username_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¼ã??</string>
-  <string name="pref_proxy_username_summary">ã??ã?­ã?­ã?·ã?¦ã?¼ã?¶ã?¼å?? (ã?ªã??ã?·ã?§ã?³)</string>
-  <string name="pref_proxy_username_dialog">ã??ã?­ã?­ã?·ã?®ã?¦ã?¼ã?¶ã?¼å??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="pref_proxy_password_title">å¤?æ?¹å??ã??ã?­ã?­ã?·ã?®ã??ã?¹ã?¯ã?¼ã??</string>
-  <string name="pref_proxy_password_summary">ã??ã?­ã?­ã?·ã?®ã??ã?¹ã?¯ã?¼ã?? (ã?ªã??ã?·ã?§ã?³)</string>
-  <string name="pref_proxy_password_dialog">ã??ã?­ã?­ã?·ã?®ã??ã?¹ã?¯ã?¼ã??ã??å?¥å??ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="status">ç?¶æ??</string>
-  <string name="setting_up_full_transparent_proxying_">å®?å?¨ã?ªé??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
-  <string name="setting_up_app_based_transparent_proxying_">ã?¢ã??ã?ªã??ã?¼ã?¹ã?®é??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
-  <string name="transparent_proxying_enabled">é??é??ã??ã?­ã?­ã?·ã??æ??å?¹</string>
-  <string name="transproxy_enabled_for_tethering_">ã??ã?¶ã?ªã?³ã?°ã?§ã?®é??é??ã??ã?­ã?­ã?·æ??å?¹</string>
-  <string name="warning_error_starting_transparent_proxying_">è­¦å??: é??é??ã??ã?­ã?­ã?·ã?®é??å§?æ??ã?«ã?¨ã?©ã?¼ç?ºç??</string>
-  <string name="transproxy_rules_cleared">é??é??ã??ã?­ã?­ã?·ã??ã?«ã?¼ã?«ã??æ¶?å?»å®?äº?</string>
-  <string name="couldn_t_start_tor_process_">Torã??ã?­ã?»ã?¹ã?®èµ·å??ã?«å¤±æ??:</string>
-  <string name="privoxy_is_running_on_port_">Polipoã??å®?è¡?中ã?®ã??ã?¼ã??: </string>
-  <string name="setting_up_port_based_transparent_proxying_">ã??ã?¼ã??ã??ã?¼ã?¹ã?®é??é??ã??ã?­ã?­ã?·ã??ã?»ã??ã??ã?¢ã??ã??中...</string>
-  <string name="bridge_error">ã??ã?ªã??ã?¸ã??ã?¨ã?©ã?¼</string>
-  <string name="bridge_requires_ip">ã??ã?ªã??ã?¸æ©?è?½ã??å?©ç?¨ã??ã??ã?«ã?¯ã??æ??ä½?ä¸?ã?¤ã?®ã??ã?ªã??ã?¸IPã?¢ã??ã?¬ã?¹ã?®å?¥å??ã??å¿?è¦?ã?§ã??ã??</string>
-  <string name="send_email_for_bridges">gmailã??使ã?£ã?¦ã??æ?¬æ??ã?«ã??get bridgesã??ã?¨æ?¸ã??ã??ã?¡ã?¼ã?«ã??bridges@xxxxxxxxxxxxxxã?«é??ä¿¡ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="error">���</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">ã??ã?ªã??ã?®ReachableAddresses設å®?ã?«ã??ã??ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Torã??ã?­ã?»ã?¹ã?®èµ·å??ã?«å¤±æ??:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">ã??ã?ªã??ã?®ReachableAddresses設å®?ã?«ã??ã??ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??!</string>
   <string name="your_relay_settings_caused_an_exception_">ã??ã?ªã??ã?®ã?ªã?¬ã?¼è¨­å®?ã?«ã??ã??ä¾?å¤?ã??ç?ºç??ã??ã?¾ã??ã??!</string>
-  <string name="exit_nodes">å?ºå?£ã??ã?¼ã??</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">æ??å¾?ã?®ã??ã??ã??ã?®ã??ã??ã?®ã??ã?¸ã?¿ã?«æ??ç´?ã??ã??ã??ã?¯ã??ã?¼ã? ã??å?½ã?¨IPã?¢ã??ã?¬ã?¹</string>
-  <string name="enter_exit_nodes">å?ºå?£ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="exclude_nodes">é?¤å¤?ã??ã?¼ã??</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">é?¤å¤?ã??ã??ã??ã?¸ã?¿ã?«æ??ç´?ã??ã??ã??ã?¯ã??ã?¼ã? ã??å?½ã?¨IPã?¢ã??ã?¬ã?¹</string>
-  <string name="enter_exclude_nodes">é?¤å¤?ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="strict_nodes">Strictã??ã?¼ã??</string>
-  <string name="use_only_these_specified_nodes">ã??ã??ã?«æ??å®?ã??ã??ã??ã?¼ã??ã?®ã?¿ã??使ç?¨</string>
-  <string name="bridges">ã??ã?ªã??ã?¸</string>
-  <string name="use_bridges">ã??ã?ªã??ã?¸ã??使ã??</string>
-  <string name="bridges_obfuscated">Obfuså??ã??ã??ã??ã??ã?ªã??ã?¸</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">代æ?¿å?¥ã??å?£ã??ã?¼ã??ã??æ??å?¹å??</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">設å®?ã??ã??ã??ã?ªã??ã?¸ã??Obfuså??ã??ã??ã??ã??ã?ªã??ã?¸ã?§ã??ã??ã?°æ??å?¹</string>
-  <string name="ip_address_and_port_of_bridges">ã??ã?ªã??ã?¸ã?®IPã?¢ã??ã?¬ã?¹ã?¨ã??ã?¼ã??</string>
-  <string name="enter_bridge_addresses">ã??ã?ªã??ã?¸ã?®ã?¢ã??ã?¬ã?¹ã??å?¥å??</string>
-  <string name="relays">���</string>
-  <string name="relaying">���中</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">ã??ã?®ç«¯æ?«ã??é??å?ºå?£ã?ªã?¬ã?¼ã?«ã??ã??</string>
-  <string name="relay_port">ã?ªã?¬ã?¼ã??ã??ã?¼ã??</string>
-  <string name="listening_port_for_your_tor_relay">ã??ã?®Torã?ªã?¬ã?¼ã?®ã?ªã?¹ã??ã?³ã?°ã??ã?¼ã??</string>
-  <string name="enter_or_port">ORã??ã?¼ã??ã??å?¥å??</string>
-  <string name="relay_nickname">ã?ªã?¬ã?¼ã?®ã??ã??ã?¯ã??ã?¼ã? </string>
-  <string name="the_nickname_for_your_tor_relay">ã??ã?®Torã?ªã?¬ã?¼ã?®ã??ã??ã?¯ã??ã?¼ã? </string>
-  <string name="enter_a_custom_relay_nickname">ã?ªã?¬ã?¼ã?®ã?«ã?¹ã?¿ã? ã??ã??ã?¯ã??ã?¼ã? ã??å?¥å??</string>
-  <string name="reachable_addresses">å?°é??å?¯è?½ã?¢ã??ã?¬ã?¹</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">å?¶é??設å®?ã?®ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¦ã?¯ã?©ã?¤ã?¢ã?³ã??ã?¨ã??ã?¦å®?è¡?</string>
-  <string name="reachable_ports">å?°é??å?¯è?½ã??ã?¼ã??</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">å?¶é??設å®?ã?®ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??é??ã??ã?¦å?°é??å?¯è?½ã?ªã??ã?¼ã??</string>
-  <string name="enter_ports">ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="enable_hidden_services">Hidden Serviceã?®ã??ã?¹ã??ã?£ã?³ã?°</string>
-  <string name="run_servers_accessible_via_the_tor_network">ã??ã??ã?¤ã?¹ä¸?ã?®ã?µã?¼ã??ã?¼ã??Torçµ?ç?±ã?§ã?¢ã?¯ã?»ã?¹å?¯è?½ã?«ã??ã??</string>
-  <string name="enter_localhost_ports_for_hidden_services">Hidden Serviceç?¨ã?®localhostã?®ã??ã?¼ã??ã??å?¥å??</string>
-  <string name="hidden_service_ports">Hidden Serviceã?®ã??ã?¼ã??</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ã??ã?ªã??ã?®Hidden Serviceã?®ã?¢ã??ã?¬ã?¹(è?ªå??ç??æ??ã??ã??ã?¾ã??)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ã??ã??ã??ã?°ã?­ã?°ã?®å?ºå??ã??æ??å?¹å??(é?²è¦§ã?«ã?¯adbã??aLogCatã??å¿?è¦?)</string>
-  <string name="project_home">ã??ã?­ã?¸ã?§ã?¯ã??ã?®ã??ã?¼ã? :</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor ã?©ã?¤ã?»ã?³ã?¹æ??æ?¸</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">第ä¸?è??製ã?®ã?½ã??ã??ã?¦ã?§ã?¢</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">ã?¢ã??ã?ªã??hidden serverã?® port %Sã??ã??Torã??ã??ã??ã?¯ã?¼ã?¯ã?«é??æ?¾ã??ã??ã??ã?¨ã??ã?¦ã??ã?¾ã??ã??ä¿¡é ¼ã?§ã??ã??ã?¢ã??ã?ªã?§ã??ã??ã?°ã??ã??ã?¯å®?å?¨ã?§ã??ã??</string>
-  <string name="found_existing_tor_process">Torã??ã?­ã?»ã?¹ã??ç?ºè¦?</string>
+    <string name="found_existing_tor_process">Torã??ã?­ã?»ã?¹ã??ç?ºè¦?</string>
   <string name="something_bad_happened">ä½?ã??ã??èµ·ã??ã??ã?¾ã??ã??ã??ã?­ã?°ã??確èª?ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="hidden_service_on">hidden service æ??å?¹:</string>
-  <string name="unable_to_read_hidden_service_name">hidden serviceã?®å??å??読込ä¸?è?½</string>
+    <string name="unable_to_read_hidden_service_name">hidden serviceã?®å??å??読込ä¸?è?½</string>
   <string name="unable_to_start_tor">Torã??å®?è¡?ã?§ã??ã?¾ã??ã??ã?§ã??ã??</string>
-  <string name="unable_to_reset_tor">Torã??ã?ªã?»ã??ã??ã?§ã??ã?¾ã??ã??ã??ã??使ã??ã?®ã??ã??ã?¤ã?¹ã??å??èµ·å??ã??ã?¦ã??ã? ã??ã??!</string>
-  <string name="pref_use_sys_iptables_title">ã??ã??ã?©ã?«ã??ã?®lptablesã??使ã??</string>
-  <string name="pref_use_sys_iptables_summary">Orbotã??ã?³ã??ã?«ç??ã?§ã?¯ã?ªã??å??è?µã?®iptablesã??使ã??</string>
-  <string name="error_installing_binares">Torã??ã?¤ã??ã?ªã?®ã?¤ã?³ã?¹ã??ã?¼ã?«ã?¾ã??ã?¯ã?¢ã??ã??ã?°ã?¬ã?¼ã??ã?¯ä¸?å?¯è?½ã?§ã??ã??ã??</string>
-  <string name="pref_use_persistent_notifications">Orbotã??æ?¥ç¶?中ã?¯ã?¢ã?¤ã?³ã?³ã??常ã?«ã??ã?¼ã?«ã??ã?¼ã?«è¡¨ç¤º</string>
-  <string name="pref_use_persistent_notifications_title">é??ç?¥ã??常ã?«æ??å?¹å??</string>
-  <string name="pref_use_expanded_notifications">æ?¡å¼µé??ç?¥ã?§ã??Torã?®å?ºå?£ã?®å?½ã?¨IPã??表示ã??ã?¾ã??</string>
-  <string name="pref_use_expanded_notifications_title">æ?¡å¼µé??ç?¥</string>
-  <string name="notification_using_bridges">ã??ã?ªã??ã?¸ã??æ??å?¹ã?§ã??ï¼?</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">��</string>
-  <string name="set_locale_summary">Orbotã?®å?°å??ã?¨è¨?èª?ã??é?¸æ??</string>
-  <string name="wizard_locale_title">è¨?èª?ã??é?¸æ??</string>
-  <string name="wizard_locale_msg">ä»?ã?®è¨?èª?ã??å¤?æ?´ã??ã??ã??ã??ã??ã?®ã?¾ã?¾ã?«ã??ã??</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">設å®?ã??ä¿?å­?</string>
-  <string name="no_internet_connection_tor">ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?ªã??ã??Torã?¯å¾?æ©?中ã?§ã??...</string>
-  <string name="bandwidth_">帯å??å¹?:</string>
-  <string name="down">ã??ã?¦ã?³</string>
-  <string name="up">ã?¢ã??ã??</string>
-  <string name="pref_disable_network_title">ã??ã??ã??ã?¯ã?¼ã?¯ã?ªã??æ??ã?ªã?¼ã??ã?¹ã?ªã?¼ã??</string>
-  <string name="pref_disable_network_summary">ã??ã??ã??æ?¥ç¶?ã??ã?ªã??æ?? Tor ã??ã?¹ã?ªã?¼ã??ã??ã??ã??</string>
-  <string name="newnym">æ?°ã??ã?ª Tor ã?®èº«å??ã?«å??ã??æ?¿ã??ã?¾ã??ã??ã??</string>
-  <string name="menu_verify_browser">ã??ã?©ã?¦ã?¶</string>
-  <string name="menu_use_chatsecure">ChatSecure ã??使ç?¨</string>
-  <string name="permission_manage_tor_label">Tor ã??管ç??</string>
-  <string name="permission_manage_tor_description">ã??ã?®ã?¢ã??ã?ªã?? Tor ã?µã?¼ã??ã?¹ã??ã?³ã?³ã??ã?¼ã?«ã?§ã??ã??ã??ã??ã?«ã??ã??</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox ã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¦ã??ã?ªã??ã??ã??ã?§ã??ã??ã??ã??ã?«ã?¤ã??ã?¦å?©ã??ã??å¿?è¦?ã?§ã??ã??ã??ã??ã??ã??ã?¯ã??ã? ã??ã?©ã?¦ã?¶ã??é??ã??ã?¹ã??ã?§ã??ã??ï¼?</string>
-  <string name="install_apps_">ã?¢ã??ã?ªã??ã?¤ã?³ã?¹ã??ã?¼ã?«ã??ã?¾ã??ã??ï¼?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">ã??ã??ã??ã?¯ã?¼ã?¯æ?¥ç¶?ã??ã??ã??ã?¾ã??ã??ã??Torã?¯ã?¹ã?ªã?¼ã??ã??ã?¾ã??â?¦</string>
+    <string name="no_internet_connection_tor">ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ?¥ç¶?ã?ªã??ã??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="wizard_tips_martus">Mobile Martus - Benetech 人権æ??æ?¸ã?¢ã??ã?ª</string>
-  <string name="your_tor_public_ips_">ã??ã?ªã??ã?®Torå?¬é??IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Orbotã?§å??é¡?ã??ç?ºç??ã??ã??å ´å??ã?¯ã??Android-&gt;設å®?-&gt;ã?¢ã??ã?ª ã?§ã??ã??ã?®ã?¢ã??ã?ªã??ç?¡å?¹ã?«ã??ã?¦ã??ã? ã??ã??: </string>
-  <string name="app_conflict">ã?¢ã??ã?ªã?®ç«¶å??</string>
-  <string name="pref_transproxy_refresh_title">é??é??ã??ã?­ã?­ã?·è?ªå??ã?ªã??ã?¬ã??ã?·ã?¥</string>
-  <string name="pref_transproxy_refresh_summary">ã??ã??ã??ã?¯ã?¼ã?¯ã?®ç?¶æ??ã??å¤?å??ã??ã??ã?¨ã??ã??é??é??ã??ã?­ã?­ã?·ã?®ã?«ã?¼ã?«ã??å??é?©ç?¨ã??ã?¾ã??</string>
-  <string name="pref_transproxy_flush_title">é??é??ã??ã?­ã?­ã?·å¼·å?¶å??é?¤</string>
-  <string name="pref_transproxy_flush_summary">ã??ã??ã??ã?¿ã??ã??ã??ã??ã?¨ã??ä»?ã??ã??ã??ã?¹ã?¦ã?®é??é??ã??ã?­ã?­ã?· ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?¼ã?«ã??ã??ã?©ã??ã?·ã?¥ã??ã?¾ã??</string>
-  <string name="transparent_proxy_rules_flushed_">é??é??ã??ã?­ã?­ã?·ã?®ã?«ã?¼ã?«ã??ã??ã?©ã??ã?·ã?¥ã??ã?¾ã??ã??!</string>
-  <string name="you_do_not_have_root_access_enabled">ROOT ã?¢ã?¯ã?»ã?¹ã??æ??å?¹ã?§ã?¯ã??ã??ã?¾ã??ã??</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">å¤?æ?´ã??ã??設å®?ã??æ??å?¹ã?«ã??ã??ã??ã??ã?«ã??Orbotã??å??æ­¢ã??ã?¦é??å§?ã??ã??å¿?è¦?ã??ã??ã??ã??ã??ã??ã??ã?¾ã??ã??ã??</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">ã??ã?ªã??ã?¸ã??æ?´æ?°ã??ã?¾ã??ã??</string>
-  <string name="restart_orbot_to_use_this_bridge_">å¤?æ?´ã??æ??å?¹ã?«ã??ã??ã?«ã?¯Orbotã??å??èµ·å??ã??ã?¦ã??ã? ã??ã??</string>
-  <string name="menu_qr">QRã?³ã?¼ã??</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">ã?¢ã??ã?¤ã?«ã??ã??ã??ã?¯ã?¼ã?¯ã??ç©?極ç??ã?«Torã??ã??ã?­ã??ã?¯ã??ã??å ´å??ã??ã??ã?ªã??ã?¸ã??使ç?¨ã??ã?¦ã??ã??ã??ã?¯ã?¼ã?¯ã?«ã?¢ã?¯ã?»ã?¹ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n\nã??ã?ªã??ã?¸ã??æ??å?¹ã?«ã??ã??ã??ã??ã??ä¸?ã?®ã??ã??ã??ã??ã?®ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="bridge_mode">ã??ã?ªã??ã?¸ ã?¢ã?¼ã??</string>
-  <string name="get_bridges_email">���</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">ã?¢ã?¯ã??ã?£ã??å??</string>
-  <string name="apps_mode">ã?¢ã??ã?ª VPN ã?¢ã?¼ã??</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Androidã?®VPNæ©?è?½ã??使ç?¨ã??ã?¦ã??ã??ã??ã?¤ã?¹ä¸?ã?®ã??ã?¹ã?¦ã?®ã?¢ã??ã?ªã??Torã??ã??ã??ã?¯ã?¼ã?¯ã??ä»?ã??ã??ã??ã??ã?«ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??\n\nå??*è­¦å??* ã??ã??ã?¯æ?°ã??ã??ã??å®?é¨?ç??ã?ªæ©?è?½ã?§ã??ã??ã??ã??ã??ã?¤ã??ã?®ã?±ã?¼ã?¹ã?§è?ªå??ç??ã?«èµ·å??ã??ã?ªã??ã??ã?¨ã??ã?¾ã??ã?¯å??æ­¢ã??ã??ã??ã?¨ã??ã??ã??ã?¾ã??ã??ã??ã??ã?¯å?¿å??ã?®ã??ã??ã?«ä½¿ç?¨ã??ã?ªã??ã?§ã??ã? ã??ã??ã??ã??ã?¡ã?¤ã?¢ã?¦ã?©ã?¼ã?«ã??ã??ã?£ã?«ã?¿ã?¼ã??é??ã??ã??ã??ã?«ã?®ã?¿ä½¿ç?¨ã??ã?¦ã??ã? ã??ã??ã??</string>
-  <string name="send_email">ã?¡ã?¼ã?«é??ä¿¡</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">ã??ã?ªã??ã?¯ã??ã?¡ã?¼ã?«ã??ã?¦ã?§ã??ã??ä»?ã??ã?¦ã??ã?¾ã??ã?¯ã??ã?ªã??ã?¸QRã?³ã?¼ã??ã??ã?¹ã?­ã?£ã?³ã??ã?¦ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??å??å¾?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??è¦?æ±?ã??ã??ã??ã??ã??ä¸?ã?®ã??ã?¡ã?¼ã?«ã??ã?¾ã??ã?¯ã??ã?¦ã?§ã??ã??ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??ã??\n\nã?¢ã??ã?¬ã?¹ã??å?¥æ??ã??ã??ã??ã??ã??ã??ã??Orbot設å®?ã?®ã??ã??ã?ªã??ã?¸ã??設å®?ã?«ã?³ã??ã?¼&amp; è²¼ã??ä»?ã??ã??ã?¦ã??Orbotã??å??èµ·å??ã??ã?¾ã??ã??</string>
-  <string name="install_orweb">Orfoxã??ã?¤ã?³ã?¹ã??ã?¼ã?«</string>
-  <string name="standard_browser">æ¨?æº?ã??ã?©ã?¦ã?¶</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注: æ¨?æº?ã?®Torã??ã?ªã??ã?¸ã?¯ã??Intel X86/ATOM ã??ã??ã?¤ã?¹ä¸?ã?§ã?®ã?¿å??ä½?ã??ã?¾ã??</string>
-  <string name="vpn_default_world">ã?¯ã?¼ã?«ã??</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-kn-rIN/strings.xml b/orbotservice/src/main/res/values-kn-rIN/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-kn-rIN/strings.xml
+++ b/orbotservice/src/main/res/values-kn-rIN/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-kn/strings.xml b/orbotservice/src/main/res/values-kn/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-kn/strings.xml
+++ b/orbotservice/src/main/res/values-kn/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ko/strings.xml b/orbotservice/src/main/res/values-ko/strings.xml
index 765b5720..148b7d15 100644
--- a/orbotservice/src/main/res/values-ko/strings.xml
+++ b/orbotservice/src/main/res/values-ko/strings.xml
@@ -1,214 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor ì??ì?? ë°? ì¤?ì§?</string>
-  <string name="tor_proxy_service_process">Tor í??ë¡?ì?? ì??ë¹?ì?¤</string>
-  <string name="status_starting_up">Orbot ì??ì?? ì¤?â?¦</string>
+    <string name="status_starting_up">Orbot ì??ì?? ì¤?â?¦</string>
   <string name="status_activated">Tor ë?¤í?¸ì??í?¬ì?? ì?°ê²°ë?¨</string>
   <string name="status_disabled">Orbotì?´ ë¹?í??ì?±í??ë??ì?´ ì??ì?µë??ë?¤</string>
   <string name="tor_process_starting">Tor í?´ë?¼ì?´ì?¸í?¸ ì??ì?? ì¤?â?¦</string>
   <string name="tor_process_complete">ì??ë£?.</string>
-  <string name="tor_process_waiting">ë??기 ì¤?.</string>
-  <string name="not_anonymous_yet">경고: ê·?í??ì?? í?¸ë??í?½ì?? ì??ì§? ì?µëª?ì?´ ì??ë??ë??ë?¤! HTTP í??ë¡?ì?? 127.0.0.1:8118 ë??ë?? SOCKS4A ë??ë?? SOCKS5 í??ë¡?ì?? 127.0.0.1:9050ì?? ì?¬ì?©í??ì?¬ ì??ì?© í??ë¡?ê·¸ë?¨ì?? 구ì?±í??ì?­ì??ì?¤</string>
-  <string name="menu_home">í??</string>
-  <string name="menu_browse">í??ì??</string>
-  <string name="menu_settings">��</string>
-  <string name="menu_log">ë¡?ê·¸</string>
-  <string name="menu_info">ë??ì??ë§?</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">ì??ì??</string>
-  <string name="menu_stop">��</string>
-  <string name="menu_about">ì ?ë³´</string>
-  <string name="main_layout_download">ë?¤ì?´ë¡?ë??</string>
-  <string name="main_layout_upload">ì??ë¡?ë??</string>
-  <string name="button_help">ë??ì??ë§?</string>
-  <string name="button_close">�기</string>
-  <string name="button_about">ì ?ë³´</string>
-  <string name="button_clear_log">�그 ��기</string>
-  <string name="menu_verify">í??ì?¸</string>
-  <string name="menu_exit">��</string>
-  <string name="menu_scan">ë¸?릿ì§? QRì½?ë?? ì?¤ìº?í??기</string>
-  <string name="menu_share_bridge">ë¸?릿ì§? QRì½?ë?? ê³µì? í??기</string>
-  <string name="press_to_start">- 길ê²? ë??ë?¬ì?? ì??ì??í??기 -</string>
-  <string name="pref_trans_proxy_group">í?¬ëª?í?? í??ë¡?ì?? (루í?? í??ì??)</string>
-  <string name="pref_trans_proxy_title">í?¬ëª?í?? í??ë¡?ì??</string>
-  <string name="pref_trans_proxy_summary">ì?±ì?? ì??ë??ì ?ì?¸ í? ë¥´í??</string>
-  <string name="pref_transparent_all_title">모ë?? í? ë¥´í??</string>
-  <string name="pref_transparent_all_summary">í? ë¥´ë¥¼ í?µí?? 모ë?  ì??ì?© í??ë¡?ê·¸ë?¨ì?? ë??í?? í??ë¡?ì?? í?¸ë??í?½</string>
-  <string name="pref_transparent_port_fallback_title">ë??ì²´ í??ë¡?ì?? í?¬í?¸</string>
-  <string name="pref_transparent_port_fallback_summary">경고 : í??í?? í?¬í?¸(80,443 ë?±)ë§? ì??í??. ì ?ì²´ 모ë??ë?? ì?± 모ë??ê°? ì??ë??í??ì§? ì??ì?? ê²½ì?°ì??ë§? ì?¬ì?©í?  ê²?.</string>
-  <string name="pref_transparent_port_title">�� 목�</string>
-  <string name="pref_transparent_port_summary">í??ë¡?ì?? ì²?리í?  í?¬í?¸ 목ë¡?. ë§?ì?½ ì ?ì²´ 모ë??ë?? ì?± 모ë??ê°? ì??ë??í??ì§? ì??ì?? ê²½ì?°ì??ë§? ì?¬ì?©í?  ê²?.</string>
-  <string name="pref_transparent_port_dialog">í??ë¡?ì?? í?¬í?¸ ì??ë ¥</string>
-  <string name="pref_has_root">루í?¸ ê¶?í??ì?? ë??í?? ì ?ê·¼ í??ì??</string>
-  <string name="pref_has_root_summary">ëª?ë°±í?? í??ë¡?ì??를 ì??í?´ 루í?¸ ê¶?í?? ì??구</string>
-  <string name="status_install_success">Tor ë°?ì?´ë??리ê°? ì?±ê³µì ?ì?¼ë¡? ì?¤ì¹?ë??ì??ì?µë??ë?¤!</string>
-  <string name="status_install_fail">í? ë¥´ ë°?ì?´ë??리 í??ì?¼ì?? ì?¤ì¹?í?  ì?? ì??ì?µë??ë?¤. ë¡?그를 í??ì?¸í?´ 주ì??ê³  tor-assistants@xxxxxxxxxxxxxx ì?? ì??ë ¤ 주ì?­ì??ì?¤.</string>
-  <string name="title_error">ì? í??리ì¼?ì?´ì?? ì?¤ë¥?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot ì ?ë³´</string>
-  <string name="btn_next">ë?¤ì??</string>
-  <string name="btn_back">��</string>
-  <string name="btn_finish">�침</string>
-  <string name="btn_okay">í??ì?¸</string>
-  <string name="btn_cancel">ì·¨ì??</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Orbotì?? ë??í?? ëª?ëª? ì??ì?¸ì?¬í?­</string>
-  <string name="wizard_details_msg">Orbotì?? Torì??, LibEvent, Polipo를 í??ì?¬í?? ì?¤í??ì??ì?¤ ì?´í??리ì¼?ì?´ì??ì??ë??ë?¤. ë?¤ì?´ ì?±ì?? Tor ë?¤í?¸ì??í?¬ë¡? ì?°ê²°ë??ë?? HTTP í??ë¡?ì?? (8118)ì?? SOCKS í??ë¡?ì?? (9050) ì?? ì ?ê³µí?©ë??ë?¤. Orbotì?? ë??í??, 루í??ë?? í?°ì?? ê²½ì?°, 모ë?  í?¸ë??í?½ì?? Tor를 í?µí?  ì?? ì??ë??ë¡? í?©ë??ë?¤.</string>
-  <string name="wizard_permissions_root">ì?¬ì?© ê¶?í?? ë¶?ì?¬</string>
-  <string name="wizard_permissions_stock">Orbot ì?¬ì?© ê¶?í??</string>
-  <string name="wizard_premissions_msg_root">ì??ë²½í?©ë??ë?¤! Orbotì?? ì??í?´ 루í?¸ ê¶?í??ì?´ í??ì?±í??ë??ê²?ì?? ê°?ì§?í??ì?µë??ë?¤. ì?°ë¦¬ë?? ì?´ í??ì?? í??ëª?í??ê²? ì?¬ì?©í?  ê²?ì??ë??ë?¤.</string>
-  <string name="wizard_permissions_msg_stock">ì?´ê²?ì?? í??ì??ê°? ì??ë?? ë°?ë©´, ê·?í??ì?? ì?¥ì¹?ê°? 루í?¸ ê¶?í??ì?? ê°?ì§?ê³  ì??ë?¤ë©´ Orbotì?? ë?? ê°?ë ¥í?? ë??구ê°? ë?  ì?? ì??ì?µë??ë?¤. Orbotì??ê²? ì??í?¼ì? ì ? ê¶?í??ì?? ë¶?ì?¬í??려면 ì??ë?? ë²?í?¼ì?? ë??르ì?­ì??ì?¤.</string>
-  <string name="wizard_permissions_no_root">루í?¸ ê¶?í??ì?? ê°?ì§?ê³  ì??ì§? ì??ê±°ë?? 무ì??ì?? ë§?í??ë?? ê²?ì?¸ì§? 모르겠ë?¤ë©´, Orbotê³¼ ë??ì??í??ë?? ì? í??리ì¼?ì?´ì??ë§?ì?? ì?¬ì?©í??ì?­ì??ì?¤.</string>
-  <string name="wizard_permissions_consent">ë?´ì?©ì?? ì?´í?´í??ì??ì?¼ë©°, ì??í?¼ì? ì ? ê¶?í?? ì??ì?´ ê³?ì?? ì§?í??í?©ë??ë?¤.</string>
-  <string name="wizard_permission_enable_root">Orbotì??ê²? 루í?¸ê¶?í?? ë¶?ì?¬</string>
-  <string name="wizard_configure">í? ë¥´í?? ì?¤ì ?</string>
-  <string name="wizard_configure_msg">Orbotì?? 모ë?  ì? í??리ì¼?ì?´ì?? ë??ë?? ì? í??ë?? ì? í??리ì¼?ì?´ì??ì?? Tor를 í?µí?´ í?µì? í??ë??ë¡? í?  ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_configure_all">모ë?  ì?±ì?? í? ë¥´ í??ë¡?ì??ë¡? ì?°ê²°í??기</string>
-  <string name="wizard_configure_select_apps">Tor를 ì??í?´ ê°?ê°?ì?? ì?± ì? í??</string>
-  <string name="wizard_tips_tricks">Orbotì?´ í??ì?±í??ë?? ì?±</string>
-  <string name="wizard_tips_msg">ì??ë??ì?? ì?±ì?? Orbotê³¼ ì??ë??ë??ë??ë¡? ê°?ë°?ë??ì??ì?µë??ë?¤. ì§?ê¸? ì?¤ì¹?í??려면 ê°?ê°?ì?? ë²?í?¼ì?? ë??르ì?­ì??ì?¤. ë??ë?? ë??ì¤?ì?? Google Play, GuardianProject.info, F-Droid.org ì??ì?? ì°¾ì?? ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - ì??ë??ë¡?ì?´ë??를 ì??í?? ì??ì ?í?? ì?¸ì?¤í?´í?¸ ë©?ì?¸ì§? í?´ë?¼ì?´ì?¸í?¸</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Orbotê³¼ ì??ë??í??ë??ë¡? ì?±ì?? ì?¤ì ?í??ë?? ë°©ë²?ì?? ë°°ì?°ê¸°</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo ê²?ì?? ì??ì§? ì?±</string>
-  <string name="wizard_tips_twitter">í?¸ì??í?° í??ë¡?ì??를 localhost:8118ë¡? ì?¤ì ?</string>
-  <string name="wizard_tips_story_maker">StoryMaker - ì?¤í? ë¦¬ë?? ë?¹ì? ì?´ ë§?ë?¤ê³  ë³´ì??ì?? Torì?? ë§?기ì?¸ì??!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">í??ë¡?ì?? ì?¤ì ?</string>
-  <string name="wizard_final">Orbotì?´ ì¤?ë¹?ë??ì??ì?µë??ë?¤!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Orbotì?´ ì ?ì??ì ?ì?¼ë¡? ì?¤ì ?ë??ì??ê³  Torì?? ì?°ê²°ë??ì??ë??ì§? í??ì?¸í??기 ì??í?´ https://check.torproject.org ì?? ê·?í??ì?? ì?¹ ë¸?ë?¼ì?°ì ?ì?? ì?´ ê²?ì??ë??ë?¤.</string>
-  <string name="pref_hs_group">ì?¨ê²¨ì§? ì??ë¹?ì?¤ í?¸ì?¤í??</string>
-  <string name="pref_general_group">��</string>
-  <string name="pref_start_boot_title">ë¶?í?? í?? Orbot ì??ì??</string>
-  <string name="pref_start_boot_summary">ì??ë??ë¡?ì?´ë?? ì?¥ì¹?ê°? ì??ì??í?  ë?? ì??ë??ì ?ì?¼ë¡? Orbotì?? ì??ì??í??ê³  Torì?? ì?°ê²°í?©ë??ë?¤</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">경고</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">ê¶?í??</string>
-  <string name="wizard_permissions_root_msg1">í?¬ëª? í??ë¡?ì?? ê°?ì?? ê³ ê¸? 기ë?¥ì?? í??ì?±í??í??기 ì??í?´ ê·?í??ë?? ì? í??ì ?ì?¼ë¡? Orbotì??ê²? \'ì??í?¼ì? ì ?\' ê¶?í??ì?? ì¤? ì?? ì??ì?µë??ë?¤.</string>
-  <string name="wizard_permissions_root_msg2">ì?´ê²?ì?? ì??í??ì§? ì??ì?¼ì? ë?¤ë©´, Orbotê³¼ ì??ë??í??ë??ë¡? ë§?ë?¤ì?´ì§? ì?±ë§?ì?? ì?¬ì?©í??ì?­ì??ì?¤.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbotì?? ì?¬ì?©í??ë?? ì?±</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ì?¤í?? ë?? ë ?ì½?ë?? ì??í?¸í??를 ì ?ì?©í?? ì??ì ?í?? ì±?í?? ì?±</string>
-  <string name="wizard_tips_play">구ê¸? í??ë ?ì?´ì??ì?? 모ë?  ê°?ë??ì?¸ í??ë¡?ì ?í?¸ ì?± 찾기</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">í?¬ëª? í??ë¡?ì??</string>
-  <string name="wizard_transproxy_msg">ì?´ê²?ì?? ì?´ë? í?? ì?¤ì ? ì??ì?´ë?? ê·?í??ì?? ì?±ì?´ ì??ë??ì ?ì?¼ë¡? í? ë¥´ ë?¤í?¸ì??í?¬ë¥¼ í?µí?´ ì??ë??í??ë??ë¡? í?´ ì¤?ë??ë?¤.</string>
-  <string name="wizard_transproxy_hint">(ì?? ë?´ì?©ì?? ì?´í?´í?  ì?? ì??ë?¤ë©´ ì?´ê²?ì?? ì? í??í?´ì£¼ì?­ì??ì?¤.)</string>
-  <string name="wizard_transproxy_none">ì??ì??</string>
-  <string name="pref_transparent_tethering_title">í? ë¥´ í??ë??ë§?</string>
-  <string name="pref_transparent_tethering_summary">í??ë??ë§? ë?? ì??ì?´í??ì?´ì?? USB ì?¥ì¹?ì?? í? ë¥´ í?¬ëª? í??ë¡?ì?? í??ì?±í?? (ì?¬ì??ì?? í??ì??)</string>
-  <string name="button_grant_superuser">ì??í?¼ì? ì ? ê¶?í?? ì??ì²­</string>
-  <string name="pref_select_apps">ì?± ì? í??</string>
-  <string name="pref_select_apps_summary">Tor를 í?µí?? í?µì? ì?? ì?¬ì?©í?  ì?± ì? í??</string>
-  <string name="pref_node_configuration">ë?¸ë?? ì?¤ì ?</string>
-  <string name="pref_node_configuration_summary">ê·?í??ì?? ì?µëª?ì?±ì?? ê°?ì??ì??í?¬ ì?? ì??ë?? ê³ ê¸? ì?¤ì ?ì?´ ì??ì?µë??ë?¤.</string>
-  <string name="pref_entrance_node">ì??구 ë?¸ë??</string>
-  <string name="pref_entrance_node_summary">첫ë²?째 Hopì?? ì??í??í??ê±°í??린í?¸, ë³?ì¹­, ë??ë?¼ì?? 주ì??</string>
-  <string name="pref_entrance_node_dialog">ì??구 ë?¸ë?? ì??ë ¥</string>
-  <string name="pref_proxy_title">ì?¸ë¶? ë?¤í?¸ì??í?¬ í??ë¡?ì?? (ì? í??)</string>
-  <string name="pref_proxy_type_title">ì?¸ë¶? í??ë¡?ì?? ì? í??</string>
-  <string name="pref_proxy_type_summary">í??ë¡?ì?? ì??ë²?를 ì??í?? ì?¬ì?©ë??ë?? í??ë¡?í? ì½? : HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">í??ë¡?ì?? í??ì?? ì??ë ¥</string>
-  <string name="pref_proxy_host_title">ì?¸ë¶? í??ë¡?ì?? í?¸ì?¤í?¸</string>
-  <string name="pref_proxy_host_summary">í??ë¡?ì?? ì??ë²? í?¸ì?¤í?¸ë?¤ì??</string>
-  <string name="pref_proxy_host_dialog">í??ë¡?ì?? í?¸ì?¤í?¸ ì??ë ¥</string>
-  <string name="pref_proxy_port_title">ì?¸ë¶? í??ë¡?ì?? í?¬í?¸</string>
-  <string name="pref_proxy_port_summary">ì??ë²? í?¬í?¸ ì??ë ¥</string>
-  <string name="pref_proxy_port_dialog">í??ë¡?ì?? í?¬í?¸ ì??ë ¥</string>
-  <string name="pref_proxy_username_title">ì?¸ë¶? í??ë¡?ì?? ì?¬ì?©ì??ëª?</string>
-  <string name="pref_proxy_username_summary">í??ë¡?ì?? ì?¬ì?©ì??ëª? (ì? í??)</string>
-  <string name="pref_proxy_username_dialog">í??ë¡?ì?? ì?¬ì?©ì??ëª? ì??ë ¥</string>
-  <string name="pref_proxy_password_title">ì?¸ë¶? í??ë¡?ì?? ë¹?ë°?ë²?í?¸</string>
-  <string name="pref_proxy_password_summary">í??ë¡?ì?? ë¹?ë°?ë²?í?¸ (ì? í??)</string>
-  <string name="pref_proxy_password_dialog">í??ë¡?ì?? ë¹?ë°?ë²?í?¸ ì??ë ¥</string>
-  <string name="status">ì??í??</string>
-  <string name="setting_up_full_transparent_proxying_">ì ?ì²´ í?¬ëª? í??ë¡?ì?? ì?¤ì ?ì¤?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">ì?±ì?? 기ë°?í?? í?¬ëª? í??ë¡?ì?? ì?¤ì ?ì¤?...</string>
-  <string name="transparent_proxying_enabled">í?¬ëª? í??ë¡?ì?? í??ì?±í??ë?¨</string>
-  <string name="transproxy_enabled_for_tethering_">í??ë??ë§?ì?? ì??í?? TransProxy í??ì?±í??ë?¨</string>
-  <string name="warning_error_starting_transparent_proxying_">경고 : í?¬ëª? í??ë¡?ì?? ì??ì?? ì?¤ë¥?</string>
-  <string name="transproxy_rules_cleared">TransProxy ê·?ì¹? 모ë?? ì?­ì ?ë?¨</string>
-  <string name="couldn_t_start_tor_process_">Tor í??ë¡?ì?¸ì?¤ ì??ì?? ë¶?ê°?ë?¥:  </string>
-  <string name="setting_up_port_based_transparent_proxying_">í?¬í?¸ì?? 기ë°?í?? í?¬ëª? í??ë¡?ì?? ì?¤ì ?</string>
-  <string name="bridge_error">�릿� ��</string>
-  <string name="bridge_requires_ip">ë¸?릿ì§? 기ë?¥ì?? ì?¬ì?©í??기 ì??í?´ì??, ìµ?ì??í?? 1ê°? ì?´ì??ì?? ë¸?릿ì§? IP 주ì??ê°? í??ì??í?©ë??ë?¤.</string>
-  <string name="send_email_for_bridges">ë©?ì?¼ 본문ì?? get bridgesë?¼ê³  ì ?ì?´ì?? Gmailë¡? bridges@xxxxxxxxxxxxxxì?? ë©?ì?¼ì?? ë³´ë?´ì?­ì??ì?¤.</string>
-  <string name="error">��</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">ê·?í??ì?? ReachableAddress ì?¤ì ?ì?? ì??ì?¸ë¥¼ ë°?ì??ì??ì¼°ì?µë??ë?¤!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor í??ë¡?ì?¸ì?¤ ì??ì?? ë¶?ê°?ë?¥:  </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">ê·?í??ì?? ReachableAddress ì?¤ì ?ì?? ì??ì?¸ë¥¼ ë°?ì??ì??ì¼°ì?µë??ë?¤!</string>
   <string name="your_relay_settings_caused_an_exception_">ê·?í??ì?? ì¤?ê³?ì??ë²? ì?¤ì ?ì?? ì??ì?¸ë¥¼ ë°?ì??ì??ì¼°ì?µë??ë?¤!</string>
-  <string name="exit_nodes">ì¶?구 ë?¸ë??</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">ë§?ì§?ë§? Hopì?? ì??í??í??ê±°í??린í?¸, ë³?ì¹­, ë??ë?¼ì?? 주ì??</string>
-  <string name="enter_exit_nodes">ì¶?구 ë?¸ë?? ì??ë ¥</string>
-  <string name="exclude_nodes">ì°¨ë?¨í?  ë?¸ë??</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">ì°¨ë?¨í?  í??ê±°í??린í?¸, ë³?ì¹­, ë??ë?¼ì?? 주ì??</string>
-  <string name="enter_exclude_nodes">ì°¨ë?¨í?  ë?¸ë?? ì??ë ¥</string>
-  <string name="strict_nodes">ë?¸ë?? ì? í??</string>
-  <string name="use_only_these_specified_nodes">ì?´ í?¹ì ?í?? ë?¸ë??*ë§?* ì?¬ì?©í?©ë??ë?¤.</string>
-  <string name="bridges">ì¤?ê³?ì??ë²?</string>
-  <string name="use_bridges">ì¤?ê³?ì??ë²? ì?¬ì?©</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor ë?¤í?¸ì??í?¬ë¡? ë?¤ì?´ê°?ë?? ë??ì??ì?? ì??구 ë?¸ë?? í??ì?±í??</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">ì?¤ì ?ë?? bridgeê°? obfsproxy bridgeë©´ í??ì?±í??</string>
-  <string name="ip_address_and_port_of_bridges">ì¤?ê³?ì??ë²?ì?? IP 주ì??ì?? </string>
-  <string name="enter_bridge_addresses">ì¤?ê²?ì??ë²? 주ì?? ì??ë ¥</string>
-  <string name="relays">ì¤?ê³?ì??ë²?</string>
-  <string name="relaying">��</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">ê·?í??ì?? ì?¥ì¹?를 ì¶?구ê°? ì??ë?? ì¤?ê³?ì??ë²?ë¡? í??ì?±í??</string>
-  <string name="relay_port">�� ��</string>
-  <string name="listening_port_for_your_tor_relay">ê·?í??ì?? Tor ì¤?ê³?ì??ë²?를 ì??í?? Listening í?¬í?¸</string>
-  <string name="enter_or_port">OR í?¬í?¸ ì??ë ¥</string>
-  <string name="relay_nickname">ì¤?ê³?ì??ë²? ë³?ëª?</string>
-  <string name="the_nickname_for_your_tor_relay">ê·?í??ì?? ì¤?ê³?ì??ë²?를 ì??í?? ë³?ëª?</string>
-  <string name="enter_a_custom_relay_nickname">ì??ì??ì?? ì¤?ê³?ì??ë²? ë³?ëª?ì?? ì??ë ¥</string>
-  <string name="reachable_addresses">ë??ë?¬ ê°?ë?¥í?? 주ì??</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">ì??격í?? ì ?ì±?ì?? ê°?ì§? ë°©í??ë²½ ë?¤ì??ì?? í?´ë?¼ì?´ì?¸í?¸ ê°?ë??</string>
-  <string name="reachable_ports">ë??ë?¬ ê°?ë?¥í?? í?¬í?¸</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">ì??격í?? ë°©í??ë²½ ë?¤ì??ì?? ì ?ê·¼ ê°?ë?¥í?? í?¬í?¸</string>
-  <string name="enter_ports">í?¬í?¸ ì??ë ¥</string>
-  <string name="enable_hidden_services">í??ë?  ì??ë¹?ì?¤ í?¸ì?¤í??</string>
-  <string name="run_servers_accessible_via_the_tor_network">ì?¥ì¹? ë?´ì?? ì??ë²?ê°? Tor ë?¤í?¸ì??í?¬ë¥¼ í?µí?´ ì ?ê·¼ ê°?ë?¥í??ë??ë¡? í??ì?©</string>
-  <string name="enter_localhost_ports_for_hidden_services">í??ë?  ì??ë¹?ì?¤ë¥¼ ì??í?? localhost í?¬í?¸ ì??ë ¥</string>
-  <string name="hidden_service_ports">í??ë?  ì??ë¹?ì?¤ í?¬í?¸</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ê·?í??ì?? í??ë?  ì??ë¹?ì?¤ë¥¼ ì??í?? 주ì??í??ë?? ì?´ë¦?(ì??ë??ì?¼ë¡? ì??ì?±ë?¨)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ë??ë²?ê·¸ ë¡?ê·¸ ì¶?ë ¥ í??ì?±í?? (보기 ì??í?´ì??ë?? adbë?? aLogCatì?? ì?¬ì?©í?´ì?¼ í?¨)</string>
-  <string name="project_home">í??ë¡?ì ?í?¸ í?? í??ì?´ì§?:</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="hidden_service_request">ì?±ì?´ Tor ë?¤í?¸ì??í?¬ë¡? í??ë?  ì??ë²? í?¬í?¸ë¥¼ ì?´ê³  ì?¶ì?´í?©ë??ë?¤. ì?±ì?? 믿ë??ë?¤ë©´ ì??ì ?í?©ë??ë?¤.</string>
-  <string name="found_existing_tor_process">ì¡´ì?¬í??ê³  ì??ë?? Tor í??ë¡?ì?¸ì?¤ ë°?견</string>
+    <string name="found_existing_tor_process">ì¡´ì?¬í??ê³  ì??ë?? Tor í??ë¡?ì?¸ì?¤ ë°?견</string>
   <string name="something_bad_happened">ì?´ë?¤ ë??ì?? ê²?ì?´ ë°?ì??. ë¡?ê·¸ í??ì?¸í??ì?¸ì??.</string>
-  <string name="hidden_service_on">í??ë?  ì??ë¹?ì?¤ 목ë¡? :</string>
-  <string name="unable_to_read_hidden_service_name">í??ë?  ì??ë¹?ì?¤ ì?´ë¦?ì?? ì?½ì?? ì?? ì??ì??</string>
+    <string name="unable_to_read_hidden_service_name">í??ë?  ì??ë¹?ì?¤ ì?´ë¦?ì?? ì?½ì?? ì?? ì??ì??</string>
   <string name="unable_to_start_tor">Tor ì??ì?? ë¶?ê°?ë?¥</string>
-  <string name="pref_use_sys_iptables_title">기본 iptables ��</string>
-  <string name="pref_use_sys_iptables_summary">Orbotì?? ë??ë´?ë?? ê²? ë??ì? ì?? ë¹?í?¸ì?¸ë?? iptables ë°?ì?´ë??리 ì?¬ì?©</string>
-  <string name="error_installing_binares">Tor ë°?ì?´ë??리ë?? ì?¤ì¹?ë??ê±°ë?? ì??ê·¸ë ?ì?´ë?? ë?  ì?? ì??ì??ì?µë??ë?¤.</string>
-  <string name="pref_use_persistent_notifications">Orbotì?´ ì?°ê²°ë??ì??ì?? ë?? í?´ë°?ì?? ì??ì?´ì½? ë³´ì?´ê¸°</string>
-  <string name="pref_use_persistent_notifications_title">í?­ì?? ì¼?ì§? ì??림</string>
-  <string name="notification_using_bridges">bridge í??ì?±í??ë?¨</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Orbotì?? ì??í?? ë¡?ì¼?ì?¼ê³¼ ì?¸ì?´ ì? í??</string>
-  <string name="wizard_locale_title">ì?¸ì?´ ì? í??</string>
-  <string name="wizard_locale_msg">기본ê°?ì?¼ë¡? ë??ê±°ë?? í??ì?¬ ì?¸ì?´ ë°?꾸기</string>
-  <string name="btn_save_settings">�� ��</string>
-  <string name="bandwidth_">ë??ì?­í?­:</string>
-  <string name="down">ì??ë??ë¡?</string>
-  <string name="up">ì??ë¡?</string>
-  <string name="pref_disable_network_title">ë?¤í?¸ì??í?¬ê°? ì??ì?? ë??ì?? ì??ë?? ì?¬ë¦½</string>
-  <string name="pref_disable_network_summary">ì?¸í?°ë?·ì?´ ë¶?ê°?ë?¥í??ë?¤ë©´ Tor를 ì?¬ë¦½ 모ë??ë¡? ë??ì?­ì??ì?¤</string>
-  <string name="newnym">ì??ë¡?ì?´ Tor ì? ì??ì?¼ë¡? ì ?í??ë??ì??ì?µë??ë?¤!</string>
-  <string name="menu_use_chatsecure">ChatSecure  ��</string>
-  <string name="permission_manage_tor_label">Tor �리</string>
-  <string name="permission_manage_tor_description">Tor ì??ë¹?ì?¤ë¥¼ ì ?ì?´í??기 ì??í?´ ì?´ ì?±ì?? í??ì?±í??í??ì?­ì??ì?¤</string>
-  <string name="install_apps_">ì?±ì?? ì?¤ì¹?í? ê¹?ì???</string>
-  <string name="menu_vpn">VPN</string>
+    <string name="newnym">ì??ë¡?ì?´ Tor ì? ì??ì?¼ë¡? ì ?í??ë??ì??ì?µë??ë?¤!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ky/strings.xml b/orbotservice/src/main/res/values-ky/strings.xml
index 89c837cc..05e2b960 100644
--- a/orbotservice/src/main/res/values-ky/strings.xml
+++ b/orbotservice/src/main/res/values-ky/strings.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_settings">ЫÑ?аÑ?Ñ?оолоÑ?</string>
-  <string name="menu_info">Ð?аÑ?дам</string>
-  <string name="menu_about">Ð?Ñ?огÑ?амма жөнүндө</string>
-  <string name="button_help">Ð?аÑ?дам</string>
-  <string name="button_about">Ð?Ñ?огÑ?амма жөнүндө</string>
-  <string name="menu_exit">ЧÑ?гÑ?Ñ?</string>
-  <string name="btn_cancel">Ð?йнÑ?Ñ?</string>
-  <!--Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -15,7 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Ð?бал</string>
-  <string name="error">Ð?аÑ?а</string>
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-lt-rLT/strings.xml b/orbotservice/src/main/res/values-lt-rLT/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-lt-rLT/strings.xml
+++ b/orbotservice/src/main/res/values-lt-rLT/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-lt/strings.xml b/orbotservice/src/main/res/values-lt/strings.xml
index b9253dd9..938fc431 100644
--- a/orbotservice/src/main/res/values-lt/strings.xml
+++ b/orbotservice/src/main/res/values-lt/strings.xml
@@ -1,28 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_browse">Naršyti</string>
-  <string name="menu_settings">Nustatymai</string>
-  <string name="menu_info">Pagalba</string>
-  <string name="menu_about">Apie</string>
-  <string name="button_help">Pagalba</string>
-  <string name="button_close">Uždaryti</string>
-  <string name="button_about">Apie</string>
-  <string name="menu_exit">IÅ¡eiti</string>
-  <string name="btn_back">Atgal</string>
-  <string name="btn_cancel">Atsisakyti</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy nustatymai</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Ä®spÄ?jimas</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Joks</string>
-  <string name="status">Statusas</string>
-  <string name="error">Klaida</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">IÅ¡saugoti nustatymus</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-lv/strings.xml b/orbotservice/src/main/res/values-lv/strings.xml
index 33eb1852..14e80906 100644
--- a/orbotservice/src/main/res/values-lv/strings.xml
+++ b/orbotservice/src/main/res/values-lv/strings.xml
@@ -2,277 +2,29 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot ir starpniekserveru bezmaksas lietotne, kas sniedz iespÄ?ju citÄ?m lietotnÄ?m droÅ¡Ä?k lietot internetu. Orbot izmanto Tor, lai Å¡ifrÄ?tu JÅ«su interneta datplÅ«smu, tad to paslÄ?pj, pÄ?rsÅ«tot to caur daudziem datoriem visÄ? pasaulÄ?. Tor ir bezmaksas programmatÅ«ra un atvÄ?rts tÄ«kls, kas palÄ«dz Jums aizsargÄ?ties pret tÄ«kla uzraudzÄ«bas veidu - datplÅ«smas analÄ«zi -, ar kuras palÄ«dzÄ«bu tiek apdraudÄ?ta personiskÄ? brÄ«vÄ«ba un privÄ?tums, konfidenciÄ?las lietiÅ¡Ä·as darbÄ«bas un attiecÄ«bas, kÄ? arÄ« valsts droÅ¡Ä«ba.  </string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">startÄ?t un apturÄ?t Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startÄ?...</string>
+    <string name="status_starting_up">Orbot startÄ?...</string>
   <string name="status_activated">Izveidots savienojums ar tīklu Tor</string>
   <string name="status_disabled">Orbot ir deaktivÄ?ts</string>
   <string name="tor_process_starting">StartÄ? Tor klientu...</string>
   <string name="tor_process_complete">pabeidz.</string>
-  <string name="tor_process_waiting">gaida.</string>
-  <string name="not_anonymous_yet">BRĪDINÄ?JUMS: JÅ«su datplÅ«sma vÄ?l nav anonÄ«ma! LÅ«dzu konfigurÄ?jiet savas lietotnes, lai tÄ?s izmantotu HTTP starpnieku 127.0.0.1:8118 vai SOCKS4A , vai SOCKS5 starpnieku 127.0.0.1:9050</string>
-  <string name="menu_home">MÄ?jas</string>
-  <string name="menu_browse">PÄ?rlÅ«kot</string>
-  <string name="menu_settings">Iestatījumi</string>
-  <string name="menu_log">ŽurnÄ?ls</string>
-  <string name="menu_info">Palīdzība</string>
-  <string name="menu_start">StartÄ?t</string>
-  <string name="menu_stop">ApturÄ?t</string>
-  <string name="menu_about">Par</string>
-  <string name="main_layout_download">LejupielÄ?de</string>
-  <string name="main_layout_upload">AugÅ¡upielÄ?de</string>
-  <string name="button_help">Palīdzība</string>
-  <string name="button_close">AizvÄ?rt</string>
-  <string name="button_about">Par</string>
-  <string name="button_clear_log">NotÄ«rÄ«t žurnÄ?lu</string>
-  <string name="menu_verify">PÄ?rbaudÄ«t</string>
-  <string name="menu_exit">Iziet</string>
-  <string name="menu_scan">SkenÄ?t BridgeQR</string>
-  <string name="menu_share_bridge">Koplietot BridgeQR</string>
-  <string name="press_to_start">Lai startÄ?tu, nospiediet ilgi</string>
-  <string name="pref_trans_proxy_group">PÄ?rredzama starpniekoÅ¡ana (nepiecieÅ¡amas saknes pilnvaras)</string>
-  <string name="pref_trans_proxy_title">PÄ?rredzama starpniekoÅ¡ana</string>
-  <string name="pref_trans_proxy_summary">LietotÅ?u automÄ?tiska torificÄ?Å¡ana</string>
-  <string name="pref_transparent_all_title">Tor\'Ä?t visu</string>
-  <string name="pref_transparent_all_summary">Visu lietotÅ?u starpnieku datplÅ«sma caur Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porta starpnieka atkÄ?pnorÄ?de</string>
-  <string name="pref_transparent_port_fallback_summary">BRĪDINÄ?JUMS: Apiet parastos portus (80., 443., u.tml.). *IZMANTOJIET VIENĪGI* ja nestrÄ?dÄ? \'All\' vai \'App\' režīmi.</string>
-  <string name="pref_transparent_port_title">Portu saraksts</string>
-  <string name="pref_transparent_port_summary">Saraksts portiem uz starpnieku. *IZMANTOJIET VIENĪGI* ja nestrÄ?dÄ? \'All\' vai \'App\' režīmi.</string>
-  <string name="pref_transparent_port_dialog">Ievadiet portus uz starpnieku</string>
-  <string name="pref_has_root">Pieprasīt piekļuves saknes tiesības</string>
-  <string name="pref_has_root_summary">PieprasÄ«t piekļuves saknes tiesÄ«bas pÄ?rredzamai starniekoÅ¡anai</string>
-  <string name="status_install_success">SekmÄ«gi instalÄ?tas Tor binÄ?rÄ?s datnes!</string>
-  <string name="status_install_fail">Nebija iespÄ?jams instalÄ?t Tor binÄ?rÄ?s datnes. LÅ«dzu pÄ?rbaudiet žurnÄ?lu, un informÄ?jiet tor-assistants@xxxxxxxxxxxxxx </string>
-  <string name="title_error">Lietojumprogrammas kļūda</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Par Orbot</string>
-  <string name="btn_next">TÄ?lÄ?k</string>
-  <string name="btn_back">Atpakaļ</string>
-  <string name="btn_finish">Beigt</string>
-  <string name="btn_okay">Labi</string>
-  <string name="btn_cancel">Atcelt</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">VairÄ?k informÄ?cijas par Orbot</string>
-  <string name="wizard_details_msg">Orbot ir atvÄ?rta koda lietojumprogramma, kura ietver Tor, LibEvent un Polipo. Programma nodroÅ¡ina vietÄ?ju HTTP starpniekseveri (8118) un SOCKS starpniekserveri (9050) uz Tor tÄ«klu. TurklÄ?t saknes tiesÄ«bu lÄ«menÄ« strÄ?dÄ?joÅ¡Ä? ierÄ«cÄ?, Orbot spÄ?j pÄ?rsÅ«tÄ«t visu interneta datplÅ«smu caur Tor.</string>
-  <string name="wizard_permissions_root">Tiesības piešķirtas</string>
-  <string name="wizard_permissions_stock">Orbot tiesības</string>
-  <string name="wizard_premissions_msg_root">Ä»oti labi! MÄ?s konstatÄ?jÄ?m, ka Orbot\'am ir iespÄ?jotas saknes tiesÄ«bas. MÄ?s apdomÄ«gi izmantosim Å¡Ä«s tiesÄ«bas.</string>
-  <string name="wizard_permissions_msg_stock">Lai gan tas nav obligÄ?ti, Orbot kļūst par vÄ?l ietekmÄ«gÄ?ku rÄ«ku, ja JÅ«su ierÄ«cei ir saknes piekļuves tiesÄ«bas. Izmantojiet zemÄ?k atrodoÅ¡os pogu, lai pieÅ¡Ä·irtu Orbot\'am Ä«paÅ¡u spÄ?ku!  </string>
-  <string name="wizard_permissions_no_root">Ja Jums nav saknes piekļuves tiesÄ«bu vai Jums nav nojausmas par ko te ir runa, pÄ?rliecinieties, ka izmantojat lietotnes, kuras paredzÄ?tas darbam ar Orbot.</string>
-  <string name="wizard_permissions_consent">Es saprotu un vÄ?los turpinÄ?t bez superlietotÄ?ja tiesÄ«bÄ?m.</string>
-  <string name="wizard_permission_enable_root">Piešķirt Orbot saknes tiesības</string>
-  <string name="wizard_configure">KonfigurÄ?t torifikÄ?ciju</string>
-  <string name="wizard_configure_msg">Orbot sniedz iespÄ?ju marÅ¡rutÄ?t visu lietojumu datplÅ«smu caur Tor\'u vai izvÄ?lÄ?ties lietojumprogrammas tÄ?s norÄ?dot individuÄ?li.</string>
-  <string name="wizard_configure_all">Visas lietotnes izmantot starpniecÄ«bas režīmÄ? caur Tor</string>
-  <string name="wizard_configure_select_apps">IzvÄ?lÄ?ties individuÄ?las lietotnes Tor\'am</string>
-  <string name="wizard_tips_tricks">Orbot-iespÄ?jotas lietotnes</string>
-  <string name="wizard_tips_msg">ZemÄ?k norÄ?dÄ«tÄ?s lietotnes ir izveidotas darbam ar Orbot. NoklikÅ¡Ä·iniet katru no pogÄ?m, lai instalÄ?tu tÅ«liÅ?, vai varat tÄ?s uzmeklÄ?t vÄ?lÄ?k Android TirgÅ«.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - DroÅ¡s Android\'a tÅ«lÄ«tÄ?jÄ?s ziÅ?ojumapmaiÅ?as klients</string>
-  <string name="wizard_tips_proxy">Starpnieka iestatÄ«jumi - Uzzini kÄ? konfigurÄ?t lietotnes, lai tÄ?s strÄ?dÄ?tu ar Orbot</string>
-  <string name="wizard_tips_duckgo">MeklÄ?tÄ?jprogrammas Duckduckgo lietotne</string>
-  <string name="wizard_tips_twitter">Twitter atbalsta http starpnieku \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Sagatavojiet stÄ?stu un, lai uzlabotu droÅ¡Ä«bu, atstÄ?jiet to Tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Starpnieka iestatījumi</string>
-  <string name="wizard_proxy_help_msg">Ja JÅ«su lietotÄ? Android lietotne spÄ?j nodroÅ¡inÄ?t HTTP vai SOCKS starpniekserveri, tad varat to nokonfigurÄ?t tÄ?, lai tÄ? savienotos ar Orbot un lietotu Tor. ViesotÄ?ja iestatÄ«jumi ir 127.0.0.1 vai â??localhostâ??. HTTP porta iestatÄ«jums ir 8118. SOCKS starpniekserveris ir 9050. PÄ?c iespÄ?jas izmantojiet SOCKS4A vai SOCKS5. Uzziniet vairÄ?k par starpniekoÅ¡anu Android platformÄ? un tÄ«mekļa vietnÄ? lasiet atbildes, kuras sagatavotas biežÄ?k uzdotiem jautÄ?jumiem jeb FAQ: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot ir gatavs darbam!</string>
-  <string name="wizard_final_msg">Miljoniem ļaužu visÄ? pasaulÄ? lieto Tor dažÄ?diem mÄ?rÄ·iem. ŽurnÄ?listi un emuÄ?ru autori, cilvÄ?ktiesÄ«bu aizstÄ?vji, likumsargi, karavÄ«ri, korporÄ?cijas, apspiestÄ«bÄ? dzÄ«vojuÅ¡i iedzÄ«votÄ?ji, un vienkÄ?rÅ¡i parasti cilvÄ?ki ... un tagad arÄ« JÅ«s esat tam gatavs!</string>
-  <string name="wizard_exit_at_first_screen_toast">LÅ«dzu nokonfigurÄ?jiet Orbot pirms sÄ?kat to lietot!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Å Ä« darbÄ«ba tÄ«mekļa pÄ?rlÅ«kÄ? atvÄ?rs https://check.torproject.org , lai redzÄ?tu vai Orbot ir konfigurÄ?ts un esat izveidojies savienojumu ar Tor.</string>
-  <string name="pref_hs_group">SlÄ?ptu pakalpojumu viesoÅ¡ana</string>
-  <string name="pref_general_group">VispÄ?rÄ«gi</string>
-  <string name="pref_start_boot_title">StartÄ?t Orbot, kad ielÄ?dÄ?jas</string>
-  <string name="pref_start_boot_summary">AutomÄ?tiski startÄ?t Orbot, un veidot savienojumu ar Tor, kad JÅ«su Android ierÄ«ce ielÄ?dÄ?jas</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot ieved Tor Android\'u pasaulÄ?! Tor palÄ«dz aizsargÄ?ties pret satura filtrÄ?Å¡anu, datplÅ«smas analÄ«zi un tÄ«kla novÄ?roÅ¡anu, kuras apdraud privÄ?tumu, konfidenciÄ?lu informÄ?ciju un personiskÄ?s attiecÄ«bas. Å is vednis palÄ«dzÄ?s JÅ«su iekÄ?rtÄ? nokonfigurÄ?t Orbot\'u un Tor\'u.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">BrÄ«dinÄ?jums</string>
-  <string name="wizard_warning_msg">Pati Orbot instalÄ?Å¡ana vÄ?l nepadarÄ«s anonÄ«mu JÅ«su mobilo datplÅ«smu.\n\nJums pareizi jÄ?nokonfigurÄ? Orbot, sava ierÄ«ce un citas lietotnes, lai sekmÄ«gi lietotu Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Tesības</string>
-  <string name="wizard_permissions_root_msg1">PÄ?c izvÄ?les variet pieÅ¡Ä·irt Orbot\'am \'SuperlietotÄ?ja\' piekļuves tiesÄ«bas, lai iespÄ?ju lietpratÄ«gus lÄ«dzekļus, tÄ?dus kÄ? Transparent Proxying jeb PÄ?rredzamÄ? .</string>
-  <string name="wizard_permissions_root_msg2">Ja nevÄ?laties Å¡o darÄ«t, lÅ«dzu, pÄ?rliecinieties, ka izmantojat lietotnes, kuras paredzÄ?tas darbam ar Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Å Ä·iet, ka JÅ«su ierÄ«ce nav saknÄ?ta vai arÄ« nenodroÅ¡ina saknes jeb superlietotÄ?ja piekļuvi.\n\nLÅ«dzu pamÄ?Ä£iniet citÄ?di - galvenajÄ? ekrÄ?nÄ? lietojiet režīmu â??Lietotnesâ??.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot\'a iespÄ?jotas lietotnes</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: PadarÄ«t tÄ?rzÄ?Å¡anas lietotni droÅ¡Ä?ku ar Off-the-Record Å¡ifrÄ?Å¡anu</string>
-  <string name="wizard_tips_play">Visas Guardian Project\'a lietotnes atrodamas Google Play\'Ä?</string>
-  <string name="wizard_tips_fdroid">Atrodiet visas Guardian Project lietotnes F-Droid\'Ä?</string>
-  <string name="wizard_tips_fdroid_org">Atrodiet visas Guardian Project lietotnes https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">PÄ?rredzama starpniekoÅ¡ana</string>
-  <string name="wizard_transproxy_msg">Å is ļauj JÅ«su lietotnÄ?m automÄ?tiski, bez jebkÄ?das papildu konfigurÄ?cijas darboties caur Tor tÄ«klu.</string>
-  <string name="wizard_transproxy_hint">(AtzÄ«mÄ?jiet Å¡o kastÄ«ti gadÄ«jumÄ? ja Jums nav ne mazÄ?kÄ?s nojausmas par to, ko mÄ?s te runÄ?jam)</string>
-  <string name="wizard_transproxy_none">Neviens</string>
-  <string name="pref_transparent_tethering_title">Tor valgošana</string>
-  <string name="pref_transparent_tethering_summary">IespÄ?jot Tor PÄ?rredzamo starpniekoÅ¡anu Wi-Fi\'m un USB valgoÅ¡anas ierÄ«cÄ?m (nepiecieÅ¡ams pÄ?rstartÄ?t)</string>
-  <string name="button_grant_superuser">PieprasÄ«t superlietotÄ?ja piekļuvi</string>
-  <string name="pref_select_apps">IzvÄ?lÄ?ties lietotnes</string>
-  <string name="pref_select_apps_summary">IzvÄ?lÄ?ties lietotnes, lai marÅ¡rutÄ?tu caur Tor</string>
-  <string name="pref_node_configuration">Mezglu konfigurÄ?cija</string>
-  <string name="pref_node_configuration_summary">Å ie it lietpratÄ«gie iestatÄ«jumi, kuri var samazinÄ?t JÅ«su anonimitÄ?ti</string>
-  <string name="pref_entrance_node">Ieejas mezgli</string>
-  <string name="pref_entrance_node_summary">Ciparvirknes, segvÄ?rdi, valstis un adreses pirmajam lÄ?kumam</string>
-  <string name="pref_entrance_node_dialog">Ievadiet ieejas mezglus</string>
-  <string name="button_proxy_all">Lietot starpniekserveri visam</string>
-  <string name="button_proxy_none">Nekam nelietot starpniekserveri</string>
-  <string name="button_invert_selection">MainÄ«t atlasi uz pretÄ?jo</string>
-  <string name="pref_proxy_title">TÄ«kla Ä?rejoÅ¡ais starpnieks (neobligÄ?ts)</string>
-  <string name="pref_proxy_type_title">Ä?rvÄ?rstÄ? starpnieka tips</string>
-  <string name="pref_proxy_type_summary">Starpnieka serverim izmantojamais protokols: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Ievadiet starpnieka tipu</string>
-  <string name="pref_proxy_host_title">Ä?rvÄ?rstÄ? starpnieka viesotÄ?js</string>
-  <string name="pref_proxy_host_summary">Starpniekservera mitinÄ?tÄ?jvÄ?rds</string>
-  <string name="pref_proxy_host_dialog">Ievadiet starpnieka viesotÄ?ju</string>
-  <string name="pref_proxy_port_title">Ä?rvÄ?rstÄ? starpnieka ports</string>
-  <string name="pref_proxy_port_summary">Starpniekservera ports</string>
-  <string name="pref_proxy_port_dialog">Ievadiet starpnieka portu</string>
-  <string name="pref_proxy_username_title">Ä?rvÄ?rstÄ? starpnieka lietotÄ?jvÄ?rds</string>
-  <string name="pref_proxy_username_summary">Starpnieka lietotÄ?jvÄ?rds (neobligÄ?ts)</string>
-  <string name="pref_proxy_username_dialog">IevadÄ«t starpnieka lietotÄ?jvardu</string>
-  <string name="pref_proxy_password_title">Ä?rvÄ?rstÄ? starpnieka parole</string>
-  <string name="pref_proxy_password_summary">Starpnieka parole (neobligÄ?ti)</string>
-  <string name="pref_proxy_password_dialog">Ievadīt starpnieka paroli</string>
-  <string name="status">Statuss</string>
-  <string name="setting_up_full_transparent_proxying_">Iestata pilnÄ«bÄ? pÄ?rredzamu starpniekoÅ¡anu...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Iestata lietotÅ?u nodroÅ¡inÄ?tu starpniekoÅ¡anu...</string>
-  <string name="transparent_proxying_enabled">PÄ?rredzama starpniekoÅ¡ana IESPÄ?JOTA</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy iespÄ?jots valgoÅ¡anai!</string>
-  <string name="warning_error_starting_transparent_proxying_">BRĪDINÄ?JUMS: kļūda uzsÄ?kot pÄ?rredzamu starpniekoÅ¡anu!</string>
-  <string name="transproxy_rules_cleared">TransProxy kÄ?rtulas notÄ«rÄ«tas</string>
-  <string name="couldn_t_start_tor_process_">NeizdevÄ?s palaist Tor\'a procesu:</string>
-  <string name="privoxy_is_running_on_port_">Polipo strÄ?dÄ? caur portu: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Iestata portu nodroÅ¡inÄ?tu pÄ?rredzamu starpniekoÅ¡anu...</string>
-  <string name="bridge_error">Tilta kļūda</string>
-  <string name="bridge_requires_ip">Lai izmantotu tilta lÄ«dzekli, jÄ?ievada vismaz viena tilta IP adrese.</string>
-  <string name="send_email_for_bridges">No Gmail konta sÅ«tiet e-pastu uz bridges@xxxxxxxxxxxxxx ar rindu \"get bridges\" e-pasta ziÅ?ojuma korpusÄ?.</string>
-  <string name="error">Kļūda</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">JÅ«su ReachableAddresses iestatÄ«jumi izraisÄ«ja izÅ?Ä?muma stÄ?vokli!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">NeizdevÄ?s palaist Tor\'a procesu:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">JÅ«su ReachableAddresses iestatÄ«jumi izraisÄ«ja izÅ?Ä?muma stÄ?vokli!</string>
   <string name="your_relay_settings_caused_an_exception_">JÅ«su retranslatora iestatÄ«jumi izraisÄ«ja izÅ?Ä?muma situÄ?ciju!</string>
-  <string name="exit_nodes">Izejas mezgli</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">PÄ?dÄ?jÄ? lÄ?kuma ciparvirknes, segvÄ?rdi, valstis un adreses</string>
-  <string name="enter_exit_nodes">Ievadiet izejas mezglus</string>
-  <string name="exclude_nodes">Neiekļautie mezgli</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">IzslÄ?dzamÄ?s ciparvirknes, segvÄ?rdi, valstis un adreses</string>
-  <string name="enter_exclude_nodes">Ievadīt Neiekļaujamos mezglus</string>
-  <string name="strict_nodes">Precīzie mezgli</string>
-  <string name="use_only_these_specified_nodes">Izmantojiet *vienÄ«gi* Å¡os norÄ?dÄ«tos mezglus</string>
-  <string name="bridges">Tilti</string>
-  <string name="use_bridges">Lietot tiltus</string>
-  <string name="bridges_obfuscated">NomaskÄ?tie tilti</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">IespÄ?jot alternatÄ«vus tÄ«kla Tor ieejas mezglus </string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">IespÄ?jot, ja konfigurÄ?tie tilti ir nomaskÄ?tie tilti</string>
-  <string name="ip_address_and_port_of_bridges">Tiltu ports un IP addrese</string>
-  <string name="enter_bridge_addresses">Ievadiet tiltu adreses</string>
-  <string name="relays">Retranslatori</string>
-  <string name="relaying">RetranslÄ?Å¡ana</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">IespÄ?jot JÅ«su iekÄ?rtu par bezapstÄ?jas retranslatoru</string>
-  <string name="relay_port">Retranslatora ports</string>
-  <string name="listening_port_for_your_tor_relay">JÅ«su Tor retranslatora klausÄ«Å¡anÄ?s ports</string>
-  <string name="enter_or_port">Ievadiet OR portu</string>
-  <string name="relay_nickname">Retranslatora segvÄ?rds</string>
-  <string name="the_nickname_for_your_tor_relay">JÅ«su Tor\'a retranslatora segvÄ?rds</string>
-  <string name="enter_a_custom_relay_nickname">Ievadiet brÄ«vi izraudzÄ«tu rertranslatora segvÄ?rdu</string>
-  <string name="reachable_addresses">SasniedzamÄ?s adreses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">IzpildÄ«t kÄ? klientprogrammu aiz ugunsmÅ«ra, kurÅ¡ nodroÅ¡ina ierobežojoÅ¡u kÄ?rtÄ«bu</string>
-  <string name="reachable_ports">Sasniedzamie porti</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Porti, kuri sasniedzami otrpus ierobežojoša ugunsmūra</string>
-  <string name="enter_ports">Ievadiet portus</string>
-  <string name="enable_hidden_services">SlÄ?ptu pakalpojumu viesoÅ¡ana</string>
-  <string name="run_servers_accessible_via_the_tor_network">ļaut no tÄ«kla Tor piekļūt serverim, kurÅ¡ ir ierÄ«cÄ?.  </string>
-  <string name="enter_localhost_ports_for_hidden_services">ievadiet slÄ?pto pakalpojumu localhost portus</string>
-  <string name="hidden_service_ports">SlÄ?ptu pakalpojumu porti</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">JÅ«su slÄ?ptÄ? pakalpojuma adresÄ?jams vÄ?rds (tiek Ä£enerÄ?ts automÄ?tiski)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">iespÄ?jot atkļūdoÅ¡anas žurnÄ?lu izvadei (jÄ?lieto adb vai aLogCat , lai skatÄ«tu)</string>
-  <string name="project_home">Projekta mÄ?jas:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor licence</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Trešo personu programmatūra:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Lietotne vÄ?las atvÄ?rt slÄ?ptu servera portu %S uz tÄ«klu Tor. Tas ir droÅ¡i, ja uzticaties lietotnei.</string>
-  <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
+    <string name="found_existing_tor_process">Atrada esošu Tor procesu...</string>
   <string name="something_bad_happened">Nav labi. PÄ?rbaudiet žurnÄ?lu</string>
-  <string name="hidden_service_on">SlÄ?pts pakalpojums uz:</string>
-  <string name="unable_to_read_hidden_service_name">NespÄ?j lasÄ«t slÄ?pta pakalpojuma nosaukumu</string>
+    <string name="unable_to_read_hidden_service_name">NespÄ?j lasÄ«t slÄ?pta pakalpojuma nosaukumu</string>
   <string name="unable_to_start_tor">Nevar startÄ?t Tor:</string>
-  <string name="unable_to_reset_tor">NespÄ?ja atiestatÄ«t Tor, sÄ?knÄ?jiet ierÄ«ci atkÄ?rtoti!</string>
-  <string name="pref_use_sys_iptables_title">Izmantot noklusÄ?juma Iptables</string>
-  <string name="pref_use_sys_iptables_summary">lietot iebÅ«vÄ?to binÄ?ro datni iptables nevis to, kura ir Orbot komplektÄ?cijÄ?</string>
-  <string name="error_installing_binares">Tor binÄ?rÄ?s datnes nebija iespÄ?jams ne instalÄ?t, ne jauninÄ?t.</string>
-  <string name="pref_use_persistent_notifications">VienmÄ?r paturÄ?t ikonu rÄ«kjoslÄ?, kad Orbot ir savienots</string>
-  <string name="pref_use_persistent_notifications_title">VienmÄ?r ieslÄ?gtie paziÅ?ojumi</string>
-  <string name="pref_use_expanded_notifications">RÄ?dÄ«t paplaÅ¡inÄ?tus paziÅ?ojumus, kur norÄ?dÄ«ts IP un Tor izejas valsts</string>
-  <string name="pref_use_expanded_notifications_title">PaplaÅ¡inÄ?ti paziÅ?ojumi</string>
-  <string name="notification_using_bridges">Tilti ir iespÄ?joti!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Valoda</string>
-  <string name="set_locale_summary">Iestatiet Orbot lokalizÄ?ciju un valodu</string>
-  <string name="wizard_locale_title">IzvÄ?lÄ?ties valodu</string>
-  <string name="wizard_locale_msg">AtstÄ?jiet noklusÄ?juma vÄ?rtÄ«bas, vai pÄ?rslÄ?dziet paÅ¡reizÄ?jo valodu.</string>
-  <string name="powered_by">strÄ?dÄ? ar Tor</string>
-  <string name="btn_save_settings">SaglabÄ?t iestatÄ«jumus</string>
-  <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstÄ?vÄ?...</string>
-  <string name="bandwidth_">Joslas platums:</string>
-  <string name="down">lejup</string>
-  <string name="up">augšup</string>
-  <string name="pref_disable_network_title">Neizmantot tÄ«kla automÄ?tiskÄ? miega režīmu</string>
-  <string name="pref_disable_network_summary">Kad nav interneta, pÄ?rslÄ?gt Tor\'u uz miega režīmu</string>
-  <string name="newnym">JÅ«s pÄ?rslÄ?dzÄ?ties uz jaunu Tor\'a identitÄ?ti!</string>
-  <string name="menu_use_chatsecure">Lietot ChatSecure</string>
-  <string name="permission_manage_tor_label">PÄ?rvaldÄ«t Tor\'u</string>
-  <string name="permission_manage_tor_description">IespÄ?jot Å¡o lietotni kontrolÄ?t pakalpojumu Tor</string>
-  <string name="install_apps_">Vai instalÄ?t lietotnes?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nav tīkla savienojuma. Tor\'am iestata miega režīmu...</string>
+    <string name="no_internet_connection_tor">Nav interneta savienojuma; Tor ir gaidstÄ?vÄ?...</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="wizard_tips_martus">Mobile Martus - Benetech\'a cilvÄ?ktiesÄ«bu dokumentÄ?cijas lietotne</string>
-  <string name="your_tor_public_ips_">JÅ«su Tor publiskÄ?s IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">LÅ«dzu atspÄ?jojiet Å¡o lietotni Android-&gt;Settings-&gt;Apps , ja rodas ar Orbot saistÄ«tas problÄ?mas: </string>
-  <string name="app_conflict">LietotÅ?u konflikts</string>
-  <string name="pref_transproxy_refresh_title">PÄ?rredzamÄ? starpniekservera automÄ?tiska atsvaidzinÄ?Å¡ana</string>
-  <string name="pref_transproxy_refresh_summary">Kad mainÄ?s tÄ«kla stÄ?voklis, atkÄ?rtoti lietot PÄ?rredzamÄ? starpniekserva kÄ?rtulas</string>
-  <string name="pref_transproxy_flush_title">PÄ?rredzamÄ? starpniekservera  PIESPIEDU NOÅ?EMÅ ANA</string>
-  <string name="pref_transproxy_flush_summary">Pieskarties te, lai TŪLĪT iztÄ«rÄ«tu visas pÄ?rredzamÄ? starpniekservera tÄ«kla kÄ?rtulas</string>
-  <string name="transparent_proxy_rules_flushed_">PÄ?rredzamÄ? starpniekservera kÄ?rtulas ir iztÄ«rÄ«tas!</string>
-  <string name="you_do_not_have_root_access_enabled">SAKNES piekļuve nav iespÄ?jota</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Lai iestatÄ«jumu maiÅ?a tiktu iespÄ?jota, Jums var nÄ?kties apturÄ?t un startÄ?t Orbot.</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Tilti ir atjauninÄ?ti</string>
-  <string name="restart_orbot_to_use_this_bridge_">LÅ«dzu pÄ?rstartÄ?jiet Orbot, lai iespÄ?jotu izmaiÅ?as</string>
-  <string name="menu_qr">QR kodi</string>
-  <string name="bridge_mode">Tiltu režīms</string>
-  <string name="get_bridges_email">E-pasts</string>
-  <string name="get_bridges_web">TÄ«meklis</string>
-  <string name="activate">AktivizÄ?t</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">JÅ«s varat iespÄ?jot visas savas ierÄ«ces lietotnes strÄ?dÄ?t Tor tÄ«klÄ?, izmantojot Android VPN raksturiezÄ«mi.\n\n*BRĪDINÄ?JUMS* Å Ä« ir jauna, eksperimentÄ?la raksturiezÄ«me un dažos gadÄ«jumos tÄ? var nesÄ?kt darbu automÄ?tiski, bet citos tÄ? var pati pÄ?rtraukt darboties. To NEVAJAG izmantot anonimitÄ?tes nodroÅ¡inÄ?Å¡anai, bet to var izmantot VIENĪGI lai strÄ?dÄ?tu caur ugunsmÅ«riem un filtriem.</string>
-  <string name="send_email">Nosūtīt e-pastu</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">JÅ«s varat saÅ?emt tiltu adreses e-pastÄ?, tÄ«meklÄ« vai skenÄ?jot tiltu QR kodu. ZemÄ?k atlasiet â??E-pastsâ?? vai â??TÄ«meklisâ??, lai pieprasÄ«tu tiltu adreses. Kad esat saÅ?Ä?mis adreses, tad tÄ?s iekopÄ?jiet un ielÄ«mÄ?jiet Orbot iestatÄ«jumu preferencÄ?s â??Tiltiâ?? un pÄ?rstartÄ?jiet.</string>
-  <string name="standard_browser">Standarta pÄ?rlÅ«ks</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">PIEZĪME: Uz Intel X86/ATOM ierÄ«cÄ?m darbosies tikai standarta Tor tilti</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-mk/strings.xml b/orbotservice/src/main/res/values-mk/strings.xml
index 4d48678a..b92e6344 100644
--- a/orbotservice/src/main/res/values-mk/strings.xml
+++ b/orbotservice/src/main/res/values-mk/strings.xml
@@ -2,277 +2,29 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot е Ñ?лободна пÑ?окÑ?и апликаÑ?иÑ?а коÑ?а им овозможÑ?ва на дÑ?Ñ?гиÑ?е апликаÑ?ии да го коÑ?иÑ?Ñ?аÑ? инÑ?еÑ?неÑ?оÑ? побезбедно. Orbot коÑ?иÑ?Ñ?и Tor за Ñ?иÑ?Ñ?иÑ?аÑ?е на инÑ?еÑ?неÑ?-Ñ?ообÑ?аÑ?аÑ?оÑ?, а поÑ?оа го Ñ?окÑ?ива и го доÑ?Ñ?авÑ?ва пÑ?екÑ? неколкÑ? компÑ?Ñ?Ñ?еÑ?и во Ñ?елиоÑ? Ñ?веÑ?. Tor е Ñ?лободен Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ?а Ñ?е Ñ?пÑ?авÑ?ва Ñ?о вид надзоÑ? на мÑ?ежаÑ?а коÑ?а Ñ?Ñ?еÑ?и на лиÑ?наÑ?а Ñ?лобода и пÑ?иваÑ?ноÑ?Ñ?а, довеÑ?ливи деловни акÑ?ивноÑ?Ñ?и и одноÑ?и, и дÑ?жавнаÑ?а безбедноÑ?Ñ? познаÑ?а како анализа на Ñ?ообÑ?аÑ?аÑ?оÑ?.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ? и Ñ?Ñ?опиÑ?аÑ? Ñ?а Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва...</string>
+    <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва...</string>
   <string name="status_activated">Ð?овÑ?зан на мÑ?ежаÑ?а на Tor</string>
   <string name="status_disabled">Ð?Ñ?боÑ? е деакÑ?ивиÑ?ан</string>
   <string name="tor_process_starting">СÑ?аÑ?Ñ?Ñ?ваÑ?е на клиенÑ?оÑ? на Tor...</string>
   <string name="tor_process_complete">завÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">Ñ?екаÑ?е.</string>
-  <string name="not_anonymous_yet">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?аÑ?иоÑ? Ñ?ообÑ?аÑ?аÑ? Ñ?è Ñ?Ñ?Ñ?е не е анонимен! Ð?оÑ?Ñ?ебно е да ги конÑ?игÑ?Ñ?иÑ?аÑ?е Ð?аÑ?иÑ?е апликаÑ?ии за да го коÑ?иÑ?Ñ?аÑ? пÑ?окÑ?иÑ?о за HTTP, 127.0.0.1:8118, или пÑ?окÑ?иÑ?о за SOCKS4A или SOCKS5, 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?ома</string>
-  <string name="menu_browse">Ð?Ñ?елиÑ?Ñ?Ñ?ваÑ?е</string>
-  <string name="menu_settings">Ð?оÑ?Ñ?авки</string>
-  <string name="menu_log">Ð?невник</string>
-  <string name="menu_info">Ð?омоÑ?</string>
-  <string name="menu_start">СÑ?аÑ?Ñ?Ñ?ваÑ?</string>
-  <string name="menu_stop">СÑ?опиÑ?аÑ?</string>
-  <string name="menu_about">Ð?а</string>
-  <string name="main_layout_download">Ð?Ñ?еземи</string>
-  <string name="main_layout_upload">Ð?Ñ?икаÑ?и</string>
-  <string name="button_help">Ð?омоÑ?</string>
-  <string name="button_close">Ð?аÑ?воÑ?и</string>
-  <string name="button_about">Ð?а</string>
-  <string name="button_clear_log">Ð?збÑ?иÑ?и дневник</string>
-  <string name="menu_verify">Ð?Ñ?овеÑ?и</string>
-  <string name="menu_exit">Ð?злез</string>
-  <string name="menu_scan">СкениÑ?аÑ? BridgeQR</string>
-  <string name="menu_share_bridge">Сподели BridgeQR</string>
-  <string name="press_to_start">- пÑ?иÑ?Ñ?иÑ?ни подолго за Ñ?Ñ?аÑ?Ñ? -</string>
-  <string name="pref_trans_proxy_group">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е (баÑ?а root пÑ?иÑ?Ñ?ап)</string>
-  <string name="pref_trans_proxy_title">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?Ñ?ко Ñ?оÑ?иÑ?иÑ?иÑ?аÑ?е на апликаÑ?ииÑ?е</string>
-  <string name="pref_transparent_all_title">ЦелоÑ?но Ñ?оÑ?иÑ?иÑ?иÑ?аÑ?е</string>
-  <string name="pref_transparent_all_summary">Ð?Ñ?окÑ?иÑ?аÑ? го Ñ?ообÑ?аÑ?аÑ?оÑ? на Ñ?иÑ?е апликаÑ?ии пÑ?екÑ? Tor</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?вна поÑ?Ñ?а за пÑ?окÑ?и</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?збегни ги Ñ?еÑ?Ñ?о коÑ?иÑ?Ñ?ениÑ?е поÑ?Ñ?и (80, 443, иÑ?н). *USE ONLY* ако Ñ?ежимиÑ?е \'All\' или \'App\' не Ñ?абоÑ?аÑ?.</string>
-  <string name="pref_transparent_port_title">Ð?иÑ?Ñ?а на поÑ?Ñ?и</string>
-  <string name="pref_transparent_port_summary">Ð?иÑ?Ñ?а на поÑ?Ñ?и за пÑ?окÑ?и. *USE ONLY* ако Ñ?ежимиÑ?е \'All\' или \'App\' не Ñ?абоÑ?аÑ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?неÑ?еÑ?е поÑ?Ñ?и за пÑ?окÑ?и</string>
-  <string name="pref_has_root">Ð?аÑ?аÑ?е за пÑ?иÑ?Ñ?ап до root</string>
-  <string name="pref_has_root_summary">Ð?аÑ?аÑ?е за пÑ?иÑ?Ñ?ап до root за Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="status_install_success">Ð?звÑ?Ñ?ниÑ?е пÑ?огÑ?ами за Tor Ñ?е Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ани!</string>
-  <string name="status_install_fail">Ð?звÑ?Ñ?ниÑ?е Ñ?аÑ?лови на Tor не можаÑ? да Ñ?е инÑ?Ñ?алиÑ?ааÑ?. Ð?Ñ?овеÑ?еÑ?е во дневникоÑ? и извеÑ?Ñ?еÑ?е нè на tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?пликаÑ?иÑ?ка гÑ?еÑ?ка</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?а Ð?Ñ?боÑ?</string>
-  <string name="btn_next">Следно</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?Ñ?аÑ?</string>
-  <string name="btn_okay">Ð?о Ñ?ед</string>
-  <string name="btn_cancel">Ð?Ñ?кажи</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Ð?еколкÑ? деÑ?али за Ð?Ñ?боÑ?</string>
-  <string name="wizard_details_msg">Orbot е апликаÑ?иÑ?а Ñ?о оÑ?воÑ?ен код коÑ?а ги Ñ?одÑ?жи Tor, LibEvent и Polipo. Ð?безбедÑ?ва локален HTTP пÑ?окÑ?и (8118) и SOCKS пÑ?окÑ?и (9050) во мÑ?ежаÑ?а на Tor. Orbot, иÑ?Ñ?о Ñ?ака, има опÑ?иÑ?а каÑ? оÑ?новниоÑ? Ñ?Ñ?ед да го иÑ?пÑ?аÑ?а Ñ?елиоÑ? инÑ?еÑ?неÑ?-Ñ?ообÑ?аÑ?аÑ? пÑ?екÑ? Tor.</string>
-  <string name="wizard_permissions_root">Ð?озволаÑ?а е издадена</string>
-  <string name="wizard_permissions_stock">Ð?озволи на Orbot</string>
-  <string name="wizard_premissions_msg_root">Ð?длиÑ?но! Ð?Ñ?кÑ?ивме дека овозможивÑ?е root пÑ?иÑ?Ñ?ап за Orbot. Ð?нимаÑ?елно Ñ?е Ñ?а коÑ?иÑ?Ñ?име оваа опÑ?иÑ?а.</string>
-  <string name="wizard_permissions_msg_stock">Ð?ако не е задолжиÑ?елно, Orbot може да Ñ?Ñ?ане помоÑ?на алаÑ?ка доколкÑ? ваÑ?иоÑ? Ñ?Ñ?ед има root пÑ?иÑ?Ñ?ап. Со копÑ?еÑ?о подолÑ? Orbot може да добие Ñ?Ñ?пеÑ?-моÑ?.</string>
-  <string name="wizard_permissions_no_root">Ð?ко немаÑ?е root пÑ?иÑ?Ñ?ап или ако не Ñ?азбиÑ?аÑ?е за Ñ?Ñ?о збоÑ?Ñ?ваме, оÑ?игÑ?Ñ?аÑ?Ñ?е Ñ?е дека коÑ?иÑ?Ñ?иÑ?е апликаÑ?ии кои Ñ?Ñ?о Ñ?абоÑ?аÑ? Ñ?о Orbot.</string>
-  <string name="wizard_permissions_consent">РазбиÑ?ам и Ñ?акам да пÑ?одолжам без админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?ивилегии</string>
-  <string name="wizard_permission_enable_root">Ð?одели root за Orbot</string>
-  <string name="wizard_configure">Ð?онÑ?игÑ?Ñ?аÑ?иÑ?а на Ñ?оÑ?иÑ?иÑ?иÑ?аÑ?еÑ?о</string>
-  <string name="wizard_configure_msg">Orbot пÑ?екÑ? Tor овозможÑ?ва да Ñ?е Ñ?Ñ?Ñ?иÑ?а Ñ?елиоÑ? Ñ?ообÑ?аÑ?аÑ? на Ñ?иÑ?е апликаÑ?ии или на Ñ?екоÑ?а апликаÑ?иÑ?а одделно.</string>
-  <string name="wizard_configure_all">Ð?Ñ?окÑ?иÑ?аÑ? ги Ñ?иÑ?е апликаÑ?ии пÑ?екÑ? Tor</string>
-  <string name="wizard_configure_select_apps">Ð?збеÑ?и поÑ?ебни апликаÑ?ии за Tor</string>
-  <string name="wizard_tips_tricks">Ð?пликаÑ?ии кои го поддÑ?жÑ?вааÑ? Orbot</string>
-  <string name="wizard_tips_msg">Ð?пликаÑ?ииÑ?е подолÑ? Ñ?е кÑ?еиÑ?ани да Ñ?абоÑ?аÑ? Ñ?о Orbot. Ð?Ñ?иÑ?иÑ?ни го Ñ?екое копÑ?е за инÑ?Ñ?алаÑ?иÑ?а или може да Ñ?е наÑ?даÑ? на Google Play, на веб-локаÑ?иÑ?аÑ?а GuardianProject.info  или пÑ?екÑ? F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?езбедноÑ?ен инÑ?Ñ?анÑ? клиенÑ? за Ñ?азговоÑ? за Android</string>
-  <string name="wizard_tips_proxy">Ð?оÑ?Ñ?авки за пÑ?окÑ?и - Ð?ознаÑ? како да Ñ?е конÑ?игÑ?Ñ?иÑ?ааÑ? апликаÑ?ииÑ?е да Ñ?абоÑ?аÑ? Ñ?о Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo апликаÑ?иÑ?а за пÑ?ебаÑ?Ñ?ваÑ?е</string>
-  <string name="wizard_tips_twitter">Ð?одеÑ?еÑ?е Twitter пÑ?окÑ?и на компÑ?Ñ?Ñ?еÑ?оÑ? \"localhost\" и поÑ?Ñ?а 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Ð?апÑ?ави пÑ?иказна и оÑ?Ñ?ави Ñ?а неÑ?зинаÑ?а безбедноÑ?Ñ? на Tor!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?оÑ?Ñ?авки за пÑ?окÑ?и</string>
-  <string name="wizard_proxy_help_msg">Ð?околкÑ? Android апликаÑ?иÑ?аÑ?а Ñ?Ñ?о Ñ?е коÑ?иÑ?Ñ?и поддÑ?жÑ?ва HTTP или SOCKS пÑ?окÑ?и, Ñ?огаÑ? може да Ñ?е конÑ?игÑ?Ñ?иÑ?а да Ñ?е повÑ?зе Ñ?о Orbot и да коÑ?иÑ?Ñ?и Tor.\n\n\n Ð?оÑ?Ñ?авкиÑ?е за компÑ?Ñ?Ñ?еÑ?оÑ? Ñ?е 127.0.0.1 или \"localhost\". Ð?а HTTP подеÑ?Ñ?ваÑ?аÑ?а на поÑ?Ñ?а Ñ?е 8118. Ð?а SOCKS пÑ?окÑ?иÑ?о е 9050. Ð?околкÑ? е возможно Ñ?Ñ?еба да Ñ?е коÑ?иÑ?Ñ?и SOCKS4A или SOCKS5.\n \n\n\n Ð?оже да дознаеÑ?е повеÑ?е за пÑ?окÑ?иÑ?аÑ?е на Android пÑ?екÑ? ЧÐ?Ð? на: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot е Ñ?пÑ?емен!</string>
-  <string name="wizard_final_msg">Ð?илиони лÑ?Ñ?е низ Ñ?елиоÑ? Ñ?веÑ? го коÑ?иÑ?Ñ?аÑ? Tor за Ñ?азлиÑ?ни пÑ?иÑ?ини.\n\nÐ?овинаÑ?и и блогеÑ?и, боÑ?Ñ?и за Ñ?овекови пÑ?ава, адвокаÑ?и, воÑ?ниÑ?и, коÑ?поÑ?аÑ?ии, гÑ?аÑ?аниÑ?е на Ñ?епÑ?еÑ?ивниÑ?е Ñ?ежими и обиÑ?ниÑ?е гÑ?аÑ?ани ... а од Ñ?ега и вие!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?е молиме конÑ?игÑ?Ñ?иÑ?аÑ?Ñ?е го Ð?Ñ?боÑ? пÑ?ед да запоÑ?неÑ?е да го коÑ?иÑ?Ñ?иÑ?е!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Ð?ва Ñ?е Ñ?а оÑ?воÑ?и Ñ?Ñ?Ñ?аниÑ?аÑ?а https://check.torproject.org во Ð?аÑ?иоÑ? веб-пÑ?елиÑ?Ñ?Ñ?ваÑ? за да видеÑ?е дали Orbot е пÑ?авилно конÑ?игÑ?Ñ?иÑ?ан и дали Ñ?Ñ?е повÑ?зани на ТоÑ?.</string>
-  <string name="pref_hs_group">СкÑ?иени Ñ?еÑ?виÑ?и за Ñ?оÑ?Ñ?иÑ?аÑ?е</string>
-  <string name="pref_general_group">Ð?пÑ?Ñ?о</string>
-  <string name="pref_start_boot_title">СÑ?аÑ?Ñ?Ñ?ваÑ? го Orbot за бÑ?Ñ?иÑ?аÑ?е</string>
-  <string name="pref_start_boot_summary">Ð?вÑ?омаÑ?Ñ?ки Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ? го Orbot и повÑ?зи го Tor кога Ñ?воÑ?оÑ? Android Ñ?Ñ?ед Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot го овозможÑ?ва Tor за Android!\n\nTor помага пÑ?оÑ?ив Ñ?илÑ?Ñ?иÑ?аÑ?е на Ñ?одÑ?жинаÑ?а, анализа на Ñ?ообÑ?аÑ?аÑ?оÑ? и надзоÑ? на мÑ?ежаÑ?а кои Ñ?Ñ?еÑ?аÑ? на пÑ?иваÑ?ноÑ?Ñ?а, довеÑ?ливи инÑ?омаÑ?ии и лиÑ?ни одноÑ?и.\n\nÐ?воÑ? волÑ?ебник помага за конÑ?игÑ?Ñ?аÑ?иÑ?а на Orbot и Tor на ваÑ?иоÑ? Ñ?Ñ?ед.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?нимание</string>
-  <string name="wizard_warning_msg">Само инÑ?Ñ?алиÑ?аÑ?е на Orbot нема авÑ?омаÑ?Ñ?ки да го анонимизиÑ?а ваÑ?иоÑ? мобилен Ñ?ообÑ?аÑ?аÑ?.\n\nÐ?оÑ?аÑ?е пÑ?авилно да ги конÑ?игÑ?Ñ?иÑ?аÑ?е Orbot, ваÑ?иоÑ? Ñ?Ñ?едоÑ? и дÑ?Ñ?ги апликаÑ?ии, за да Ñ?Ñ?пеÑ?но го коÑ?иÑ?Ñ?иÑ?е Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?озволи</string>
-  <string name="wizard_permissions_root_msg1">Ð?пÑ?ионално може да Ñ?е добие админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?иÑ?Ñ?ап за Orbot коÑ? овозможÑ?ва напÑ?едни Ñ?Ñ?нкÑ?ии, како Ñ?Ñ?о е Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е.</string>
-  <string name="wizard_permissions_root_msg2">Ð?околкÑ? не Ñ?акаÑ?е да го напÑ?авиÑ?е ова, оÑ?игÑ?Ñ?аÑ?Ñ?е Ñ?е дека ваÑ?иÑ?е апликаÑ?ии Ñ?абоÑ?аÑ? Ñ?о Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Ð?аÑ?иоÑ? Ñ?Ñ?ед не е оÑ?новен или не дозволÑ?ва пÑ?иÑ?Ñ?ап до оÑ?новен Ñ?Ñ?ед или админиÑ?Ñ?Ñ?аÑ?оÑ?Ñ?ки пÑ?иÑ?Ñ?ап.\n\nÐ?Ñ?обаÑ?Ñ?е го Ñ?ежимоÑ? \'Ð?пликаÑ?ии\' на главниоÑ? екÑ?ан.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?пликаÑ?ии кои го поддÑ?жÑ?вааÑ? Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Ð?езбедноÑ?на апликаÑ?иÑ?а за Ñ?азговоÑ? Ñ?о енкÑ?ипÑ?иÑ?а \'Off-the-Record\' </string>
-  <string name="wizard_tips_play">Ð?аÑ?ди ги Ñ?иÑ?е Guardian Project апликаÑ?ии на Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?аÑ?ди ги Ñ?иÑ?е Guardian Project апликаÑ?ии на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?аÑ?ди ги Ñ?иÑ?е Guardian Project апликаÑ?ии на https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="wizard_transproxy_msg">Ð?ва овозможÑ?ва ваÑ?иÑ?е апликаÑ?ии авÑ?омаÑ?Ñ?ки да Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?вааÑ? пÑ?екÑ? мÑ?ежаÑ?а Tor без конÑ?игÑ?Ñ?аÑ?иÑ?а.</string>
-  <string name="wizard_transproxy_hint">(СелекÑ?иÑ?аÑ?Ñ?е го ова поле ако не Ñ?азбиÑ?аÑ?е за Ñ?Ñ?о збоÑ?Ñ?ваме)</string>
-  <string name="wizard_transproxy_none">Ð?иÑ?Ñ?о</string>
-  <string name="pref_transparent_tethering_title">Tor повÑ?зÑ?ваÑ?е</string>
-  <string name="pref_transparent_tethering_summary">Ð?возможи Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е на Tor за Ñ?Ñ?еди повÑ?зани пÑ?екÑ? Wi-Fi и USB  (баÑ?а Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аÑ?е)</string>
-  <string name="button_grant_superuser">Ð?аÑ?аÑ?е за пÑ?иÑ?Ñ?ап до админиÑ?Ñ?Ñ?аÑ?оÑ? на Ñ?иÑ?Ñ?емоÑ?</string>
-  <string name="pref_select_apps">Ð?збеÑ?еÑ?е апликаÑ?ии</string>
-  <string name="pref_select_apps_summary">Ð?дбеÑ?и апликаÑ?ии кои Ñ?е Ñ?е повÑ?зÑ?вааÑ? пÑ?екÑ? ТоÑ?</string>
-  <string name="pref_node_configuration">Ð?онÑ?игÑ?Ñ?аÑ?иÑ?а на Ñ?азол</string>
-  <string name="pref_node_configuration_summary">Ð?ва Ñ?е напÑ?едниÑ?е поÑ?Ñ?авÑ?ваÑ?а кои можаÑ? да Ñ?а намалаÑ? ваÑ?аÑ?а анонимноÑ?Ñ?</string>
-  <string name="pref_entrance_node">Ð?лезни Ñ?азли</string>
-  <string name="pref_entrance_node_summary">Ð?Ñ?пеÑ?аÑ?оÑ?и од пÑ?Ñ?Ñ?и, пÑ?екаÑ?и, земÑ?и и адÑ?еÑ?и за пÑ?виоÑ? Ñ?кок.</string>
-  <string name="pref_entrance_node_dialog">Ð?неÑ?еÑ?е влезни Ñ?азли</string>
-  <string name="button_proxy_all">Се за пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="button_proxy_none">Ð?иÑ?Ñ?о за пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="button_invert_selection">Ð?Ñ?евÑ?Ñ?и го избоÑ?оÑ?</string>
-  <string name="pref_proxy_title">Ð?злезен пÑ?окÑ?и на мÑ?ежаÑ?а (незадолжиÑ?елно)</string>
-  <string name="pref_proxy_type_title">Тип на излезен пÑ?окÑ?и</string>
-  <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол за коÑ?иÑ?Ñ?еÑ?е на пÑ?окÑ?и-Ñ?еÑ?веÑ?: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Ð?неÑ?еÑ?е го Ñ?ипоÑ? на пÑ?оÑ?ки</string>
-  <string name="pref_proxy_host_title">Ð?злезен домаÑ?ин на пÑ?окÑ?и</string>
-  <string name="pref_proxy_host_summary">Ð?ме на домаÑ?ин на Ñ?еÑ?веÑ?оÑ? на пÑ?окÑ?и</string>
-  <string name="pref_proxy_host_dialog">Ð?неÑ?еÑ?е домаÑ?ин на пÑ?окÑ?и</string>
-  <string name="pref_proxy_port_title">Ð?злезна поÑ?Ñ?а на пÑ?окÑ?и</string>
-  <string name="pref_proxy_port_summary">Ð?оÑ?Ñ?а на Ñ?еÑ?веÑ?оÑ? на пÑ?окÑ?и</string>
-  <string name="pref_proxy_port_dialog">Ð?неÑ?еÑ?е поÑ?Ñ?а на пÑ?окÑ?и</string>
-  <string name="pref_proxy_username_title">KоÑ?иÑ?ниÑ?ко име на излезен пÑ?окÑ?и</string>
-  <string name="pref_proxy_username_summary">Ð?оÑ?иÑ?ниÑ?ко име на пÑ?окÑ?и (незадолжиÑ?елно)</string>
-  <string name="pref_proxy_username_dialog">Ð?неÑ?еÑ?е коÑ?иÑ?ниÑ?ко име на пÑ?окÑ?и</string>
-  <string name="pref_proxy_password_title">Ð?озинка на излезен пÑ?окÑ?и</string>
-  <string name="pref_proxy_password_summary">Ð?озинка на пÑ?окÑ?и (незадолжиÑ?елно)</string>
-  <string name="pref_proxy_password_dialog">Ð?неÑ?еÑ?е лозинка на пÑ?окÑ?и</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?оÑ?Ñ?авÑ?ваÑ?е на Ñ?елоÑ?но Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?оÑ?Ñ?авÑ?ваÑ?е Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е базиÑ?ано на апликаÑ?иÑ?а...</string>
-  <string name="transparent_proxying_enabled">TÑ?анÑ?паÑ?енÑ?ноÑ?о пÑ?окÑ?иÑ?аÑ?е е Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy е овозможен за повÑ?зÑ?ваÑ?е!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: Ð?Ñ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?е на Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е!</string>
-  <string name="transproxy_rules_cleared">Ð?збÑ?иÑ?ани пÑ?авила за TransProxy </string>
-  <string name="couldn_t_start_tor_process_">Ð?е може да Ñ?е запоÑ?не Tor-пÑ?оÑ?еÑ?оÑ?:</string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?абоÑ?и на поÑ?Ñ?а: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?оÑ?Ñ?авÑ?ваÑ?е на Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е базиÑ?ано на поÑ?Ñ?а...</string>
-  <string name="bridge_error">Ð?Ñ?еÑ?ка во моÑ?Ñ?оÑ?</string>
-  <string name="bridge_requires_ip">Ð?а да Ñ?а коÑ?иÑ?Ñ?иÑ?е Ñ?Ñ?нкÑ?иÑ?аÑ?а на моÑ?Ñ?оÑ?, моÑ?аÑ?е да внеÑ?еÑ?е баÑ?ем една Ð?Ð?-адÑ?еÑ?а на моÑ?Ñ?.</string>
-  <string name="send_email_for_bridges">Ð?Ñ?пÑ?аÑ?еÑ?е е-поÑ?Ñ?а од ваÑ?аÑ?а gmail Ñ?меÑ?ка на bridges@xxxxxxxxxxxxxx Ñ?о Ñ?одÑ?жина \"get bridges\".</string>
-  <string name="error">Ð?Ñ?еÑ?ка</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?иÑ?е поÑ?Ñ?авки за доÑ?Ñ?апниÑ?е адÑ?еÑ?и пÑ?едизвикаа гÑ?еÑ?ка!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ð?е може да Ñ?е запоÑ?не Tor-пÑ?оÑ?еÑ?оÑ?:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?иÑ?е поÑ?Ñ?авки за доÑ?Ñ?апниÑ?е адÑ?еÑ?и пÑ?едизвикаа гÑ?еÑ?ка!</string>
   <string name="your_relay_settings_caused_an_exception_">Ð?аÑ?иÑ?е поÑ?Ñ?авки за Ñ?еле пÑ?едизвикаа гÑ?еÑ?ка!</string>
-  <string name="exit_nodes">Ð?злезни Ñ?азли</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ð?Ñ?пеÑ?аÑ?оÑ?и од пÑ?Ñ?Ñ?и, пÑ?екаÑ?и, земÑ?и и адÑ?еÑ?и за поÑ?ледниоÑ? Ñ?кок.</string>
-  <string name="enter_exit_nodes">Ð?неÑ?еÑ?е излезни Ñ?азли</string>
-  <string name="exclude_nodes">Ð?Ñ?клÑ?Ñ?и Ñ?азли</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ð?Ñ?пеÑ?аÑ?оÑ?и од пÑ?Ñ?Ñ?и, пÑ?екаÑ?и, земÑ?и и адÑ?еÑ?и кои Ñ?Ñ?еба да Ñ?е иÑ?клÑ?Ñ?аÑ?</string>
-  <string name="enter_exclude_nodes">Ð?неÑ?еÑ?е ги Ñ?азлиÑ?е кои Ñ?Ñ?еба да Ñ?е иÑ?клÑ?Ñ?аÑ?</string>
-  <string name="strict_nodes">Ð?адолжиÑ?елни Ñ?азли</string>
-  <string name="use_only_these_specified_nodes">Ð?оÑ?иÑ?Ñ?еÑ?е ги *Ñ?амо* овие наведени Ñ?азли</string>
-  <string name="bridges">Ð?оÑ?Ñ?ови</string>
-  <string name="use_bridges">Ð?оÑ?иÑ?Ñ?и моÑ?Ñ?ови</string>
-  <string name="bridges_obfuscated">СкÑ?иени моÑ?Ñ?ови</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?возможи алÑ?еÑ?наÑ?ивни влезни Ñ?азли во мÑ?ежаÑ?а Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?возможи, ако моÑ?Ñ?овиÑ?е Ñ?е Ñ?кÑ?иени моÑ?Ñ?ови</string>
-  <string name="ip_address_and_port_of_bridges">Ð?Ð?-адÑ?еÑ?а и поÑ?Ñ?а на моÑ?Ñ?овиÑ?е</string>
-  <string name="enter_bridge_addresses">Ð?неÑ?еÑ?е адÑ?еÑ?и на моÑ?Ñ?овиÑ?е</string>
-  <string name="relays">Релеа</string>
-  <string name="relaying">Ð?Ñ?енеÑ?Ñ?ваÑ?е</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Ð?возможи го Ñ?Ñ?едоÑ? да биде Ñ?еле без излез </string>
-  <string name="relay_port">Ð?оÑ?Ñ?а на Ñ?еле</string>
-  <string name="listening_port_for_your_tor_relay">Ð?оÑ?Ñ?а за Ñ?лÑ?Ñ?аÑ?е на ваÑ?иоÑ? Ñ?еле на Tor</string>
-  <string name="enter_or_port">Ð?неÑ?еÑ?е OR поÑ?Ñ?а</string>
-  <string name="relay_nickname">Ð?азив на Ñ?елеÑ?о</string>
-  <string name="the_nickname_for_your_tor_relay">Ð?азив на ваÑ?еÑ?о Ñ?еле за Tor</string>
-  <string name="enter_a_custom_relay_nickname">Ð?неÑ?еÑ?е пÑ?оизволно име за Ñ?елеÑ?о</string>
-  <string name="reachable_addresses">Ð?оÑ?Ñ?апни адÑ?еÑ?и</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">СÑ?аÑ?Ñ?Ñ?ваÑ?Ñ?е го како клиенÑ? зад безбедноÑ?ен Ñ?ид Ñ?о огÑ?аниÑ?ени полиÑ?и</string>
-  <string name="reachable_ports">Ð?оÑ?Ñ?апни поÑ?Ñ?и</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?и доÑ?Ñ?апни зад Ñ?еÑ?Ñ?Ñ?екÑ?ивен заÑ?Ñ?иÑ?ен Ñ?ид(firewall)</string>
-  <string name="enter_ports">Ð?неÑ?еÑ?е поÑ?Ñ?и</string>
-  <string name="enable_hidden_services">СкÑ?иени Ñ?еÑ?виÑ?и за Ñ?оÑ?Ñ?иÑ?аÑ?е</string>
-  <string name="run_servers_accessible_via_the_tor_network"> Ð?возможи on-device Ñ?еÑ?веÑ?оÑ? да Ñ?е пÑ?иÑ?Ñ?апи пÑ?екÑ? мÑ?ежаÑ?а на Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ð?неÑ?и ги поÑ?Ñ?иÑ?е за localhost за Ñ?кÑ?иени Ñ?еÑ?виÑ?и </string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?и на Ñ?кÑ?иени Ñ?еÑ?виÑ?и</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ð?оÑ?Ñ?апно име за ваÑ?иоÑ? Ñ?кÑ?иен Ñ?еÑ?виÑ? (Ñ?е генеÑ?иÑ?а авÑ?омаÑ?Ñ?ки)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ð?кÑ?ивиÑ?аÑ? го дневникоÑ? за оÑ?Ñ?Ñ?Ñ?анÑ?ваÑ?е гÑ?еÑ?ки за излез (за да Ñ?е пÑ?икаже моÑ?а да Ñ?е коÑ?иÑ?Ñ?и adb или aLogCat)</string>
-  <string name="project_home">Ð?оÑ?еÑ?на Ñ?Ñ?Ñ?аниÑ?а:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ð?иÑ?енÑ?а за Tor </string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">СоÑ?Ñ?веÑ? од дÑ?Ñ?г пÑ?оизводиÑ?ел:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Ð?пликаÑ?иÑ?а Ñ?ака да оÑ?воÑ?и Ñ?кÑ?иена поÑ?Ñ?а на Ñ?еÑ?веÑ?оÑ? %S на мÑ?ежаÑ?а на Tor. Ð?ва е безбедно, ако и\' веÑ?Ñ?ваÑ? на апликаÑ?иÑ?аÑ?а.</string>
-  <string name="found_existing_tor_process">Ð?Ñ?онаÑ?ден поÑ?Ñ?оеÑ?ки Tor-пÑ?оÑ?еÑ? ...</string>
+    <string name="found_existing_tor_process">Ð?Ñ?онаÑ?ден поÑ?Ñ?оеÑ?ки Tor-пÑ?оÑ?еÑ? ...</string>
   <string name="something_bad_happened">Ð?аÑ?Ñ?ана гÑ?еÑ?ка. Ð?Ñ?овеÑ?еÑ?е во дневникоÑ?</string>
-  <string name="hidden_service_on">Ð?клÑ?Ñ?ен е Ñ?кÑ?иениоÑ? Ñ?еÑ?виÑ?:</string>
-  <string name="unable_to_read_hidden_service_name">не може да Ñ?е пÑ?оÑ?иÑ?а имеÑ?о на Ñ?кÑ?иениоÑ? Ñ?еÑ?виÑ?</string>
+    <string name="unable_to_read_hidden_service_name">не може да Ñ?е пÑ?оÑ?иÑ?а имеÑ?о на Ñ?кÑ?иениоÑ? Ñ?еÑ?виÑ?</string>
   <string name="unable_to_start_tor">Tor не може да Ñ?е Ñ?Ñ?аÑ?Ñ?Ñ?ва:</string>
-  <string name="unable_to_reset_tor">РеÑ?Ñ?аÑ?Ñ?иÑ?аÑ?Ñ?е го ваÑ?иоÑ? Ñ?Ñ?ед, Tor не може да Ñ?е Ñ?еÑ?еÑ?иÑ?а! </string>
-  <string name="pref_use_sys_iptables_title">Ð?оÑ?иÑ?Ñ?и Ñ?Ñ?андаÑ?ден Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Ð?оÑ?иÑ?Ñ?и ги вгÑ?адениÑ?е бинаÑ?ни Ð?Ð? Ñ?абели намеÑ?Ñ?о Ñ?аа Ñ?Ñ?о оди Ñ?о Orbot</string>
-  <string name="error_installing_binares">Ð?звÑ?Ñ?ниÑ?е даÑ?оÑ?еки на Tor не можаÑ? да Ñ?е инÑ?Ñ?алиÑ?ааÑ? или надгÑ?адаÑ?</string>
-  <string name="pref_use_persistent_notifications">СекогаÑ? Ñ?Ñ?ваÑ?Ñ?е ja иконаÑ?а во ленÑ?аÑ?а Ñ?о алаÑ?ки кога Orbot е повÑ?зан</string>
-  <string name="pref_use_persistent_notifications_title">Ð?звеÑ?Ñ?Ñ?ваÑ?а Ñ?екогаÑ? вклÑ?Ñ?ени</string>
-  <string name="pref_use_expanded_notifications">Ð?Ñ?икажи пÑ?оÑ?иÑ?ено извеÑ?Ñ?Ñ?ваÑ?е Ñ?о излезнаÑ?а земÑ?а и Ð?Ð? на Tor</string>
-  <string name="pref_use_expanded_notifications_title">Ð?Ñ?оÑ?иÑ?и извеÑ?Ñ?Ñ?ваÑ?а</string>
-  <string name="notification_using_bridges">Ð?клÑ?Ñ?ени моÑ?Ñ?ови!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ð?азик</string>
-  <string name="set_locale_summary">Ð?збеÑ?и локални поÑ?Ñ?авки и Ñ?азик за Orbot</string>
-  <string name="wizard_locale_title">Ð?збеÑ?и Ñ?азик</string>
-  <string name="wizard_locale_msg">Ð?Ñ?Ñ?ави го Ñ?Ñ?андаÑ?дниоÑ? или пÑ?омени го поÑ?Ñ?оеÑ?киоÑ? Ñ?азик</string>
-  <string name="powered_by">Ð?возможено од Tor</string>
-  <string name="btn_save_settings">СоÑ?Ñ?ваÑ? поÑ?Ñ?авки</string>
-  <string name="no_internet_connection_tor">Ð?ема инÑ?еÑ?неÑ?-вÑ?Ñ?ка; Tor е во миÑ?Ñ?ваÑ?е...</string>
-  <string name="bandwidth_">Ð?Ñ?оÑ?ок:</string>
-  <string name="down">долÑ?</string>
-  <string name="up">гоÑ?е</string>
-  <string name="pref_disable_network_title">Ð?ема Auto-Sleep на мÑ?ежаÑ?а</string>
-  <string name="pref_disable_network_summary">СÑ?ави го ТоÑ? на sleep кога инÑ?еÑ?неÑ?оÑ? не е доÑ?Ñ?апен</string>
-  <string name="newnym">Се пÑ?еÑ?Ñ?ливÑ?е на нов иденÑ?иÑ?еÑ? на Tor!</string>
-  <string name="menu_use_chatsecure">Ð?оÑ?иÑ?Ñ?и ChatSecure</string>
-  <string name="permission_manage_tor_label">УпÑ?авÑ?ваÑ? Ñ?о Tor</string>
-  <string name="permission_manage_tor_description">Ð?озволи оваа апликаÑ?иÑ?а да го Ñ?пÑ?авÑ?ва Ñ?о Ñ?еÑ?виÑ?оÑ? на Tor</string>
-  <string name="install_apps_">Ð?нÑ?Ñ?алиÑ?аÑ? апликаÑ?ии?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?ема мÑ?ежно повÑ?зÑ?ваÑ?е. СÑ?авеÑ?е го ТоÑ? на Ñ?ежимоÑ? на Ñ?пиеÑ?е...</string>
+    <string name="no_internet_connection_tor">Ð?ема инÑ?еÑ?неÑ?-вÑ?Ñ?ка; 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_">Ð?Ñ?ежноÑ?о повÑ?зÑ?ваÑ?е е добÑ?о. Ð?о бÑ?ди Tor...</string>
   <string name="updating_settings_in_tor_service">ажÑ?Ñ?иÑ?аÑ?е на поÑ?Ñ?авкиÑ?е во Ñ?еÑ?виÑ?оÑ? Tor </string>
-  <string name="pref_socks_title">Tor SOCKS</string>
-  <string name="pref_socks_summary">Ð?оÑ?Ñ?а на коÑ?а ТоÑ? и\' го нÑ?ди Ñ?воÑ?оÑ? SOCKS-пÑ?окÑ?и (Ñ?Ñ?андаÑ?дно: 9050 или 0 за да Ñ?е иÑ?клÑ?Ñ?и)</string>
-  <string name="pref_socks_dialog">KонÑ?игÑ?Ñ?иÑ?аÑ?е на поÑ?Ñ?аÑ?а за SOCKS</string>
-  <string name="pref_transport_title">Tor TransProxy поÑ?Ñ?а</string>
-  <string name="pref_transport_summary">Ð?оÑ?Ñ?а на коÑ?а Tor и го нÑ?ди Ñ?воÑ?оÑ? Ñ?Ñ?анÑ?паÑ?енÑ?ен пÑ?окÑ?и (Ñ?Ñ?андаÑ?дно: 9040 или 0 за да Ñ?е иÑ?клÑ?Ñ?и)</string>
-  <string name="pref_transport_dialog">KонÑ?игÑ?Ñ?иÑ?аÑ?е на поÑ?Ñ?аÑ?а за TransProxy</string>
-  <string name="pref_dnsport_title">DNS-поÑ?Ñ?а за Tor </string>
-  <string name="pref_dnsport_summary">Ð?оÑ?Ñ?а на коÑ?а Tor го нÑ?ди DNS (Ñ?Ñ?андаÑ?дно: 5400 или 0 за да Ñ?е иÑ?клÑ?Ñ?и)</string>
-  <string name="pref_dnsport_dialog">конÑ?игÑ?Ñ?иÑ?аÑ?е на DNS-поÑ?Ñ?аÑ?а </string>
-  <string name="pref_torrc_title">Ð?Ñ?оизволно конÑ?игÑ?Ñ?иÑ?аÑ?е на torrc</string>
-  <string name="pref_torrc_summary">СÐ?Ð?Ð? Ð?Ð? Ð?Ð?СÐ?Ð?РТÐ?: внеÑ?еÑ?е диÑ?екÑ?ни команди за конÑ?игÑ?Ñ?иÑ?аÑ?е на torrc</string>
-  <string name="pref_torrc_dialog">Ð?Ñ?оизволен torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus - Benetech апликаÑ?иÑ?а за докÑ?менÑ?иÑ?аÑ?е на Ñ?овековиÑ?е пÑ?ава</string>
-  <string name="your_tor_public_ips_">Ð?аÑ?аÑ?а Ñ?авна Ð?Ð? за Tor</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?е молиме иÑ?клÑ?Ñ?еÑ?е Ñ?а оваа апликаÑ?иÑ?а во Android-&gt;Settings-&gt;Apps ако имаÑ?е пÑ?облем Ñ?о Orbot:</string>
-  <string name="app_conflict">Ð?онÑ?ликÑ? Ñ?о апликаÑ?иÑ?аÑ?а</string>
-  <string name="pref_transproxy_refresh_title">Ð?вÑ?омаÑ?Ñ?ко оÑ?вежÑ?ваÑ?е на Transproxy </string>
-  <string name="pref_transproxy_refresh_summary">Ð?Ñ?имени ги повÑ?оÑ?но пÑ?авилаÑ?а за TransProxy кога Ñ?е менÑ?ва Ñ?оÑ?Ñ?оÑ?баÑ?а на мÑ?ежаÑ?а</string>
-  <string name="pref_transproxy_flush_title">Ð?РÐ?СÐ?Ð?Ð?Ð? Ð?ТСТРÐ?Ð?УÐ?Ð?Ð?Ð? на Transproxy </string>
-  <string name="pref_transproxy_flush_summary">Ð?опÑ?еÑ?е овде за да Ñ?е избÑ?иÑ?аÑ? Ñ?иÑ?е transproxy пÑ?авила на мÑ?ежаÑ?а СÐ?Ð?Ð? </string>
-  <string name="transparent_proxy_rules_flushed_">Ð?збÑ?иÑ?ани Ñ?Ñ?анÑ?паÑ?енÑ?ни пÑ?окÑ?и пÑ?авила</string>
-  <string name="you_do_not_have_root_access_enabled">Ð?емаÑ?е вклÑ?Ñ?ено пÑ?иÑ?Ñ?ап до коÑ?ен</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?оже би Ñ?е Ñ?Ñ?еба да Ñ?е Ñ?Ñ?опиÑ?а и Ñ?Ñ?аÑ?Ñ?Ñ?ва Orbot за да бидаÑ? овозможени пÑ?омениÑ?е во поÑ?Ñ?авкиÑ?е.</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Ð?жÑ?Ñ?иÑ?ани моÑ?Ñ?ови</string>
-  <string name="restart_orbot_to_use_this_bridge_">Ð?е молиме Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аÑ?Ñ?е го Orbot за да Ñ?е овозможаÑ? пÑ?омениÑ?е</string>
-  <string name="menu_qr">QR-кодови</string>
-  <string name="bridge_mode">Режим на Ñ?абоÑ?а на моÑ?Ñ?оÑ?</string>
-  <string name="get_bridges_email">Ð?-поÑ?Ñ?а</string>
-  <string name="get_bridges_web">Ð?еб</string>
-  <string name="activate">Ð?кÑ?ивиÑ?аÑ?</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?ожеÑ?е да ги овозможиÑ?е Ñ?иÑ?е апликаÑ?ии на ваÑ?иоÑ? Ñ?Ñ?ед да Ñ?абоÑ?аÑ? низ мÑ?ежаÑ?а Tor коÑ?иÑ?Ñ?еÑ?Ñ?и VPN-Ñ?Ñ?нкÑ?иÑ?а на Ð?ндÑ?оид.\n\n*Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?* нова, екÑ?пеÑ?именÑ?ална Ñ?Ñ?нкÑ?иÑ?а и во некои Ñ?лÑ?Ñ?аи нема да Ñ?Ñ?аÑ?Ñ?Ñ?ва авÑ?омаÑ?Ñ?ки, или може да Ñ?е Ñ?Ñ?опиÑ?а. Ð?е Ñ?Ñ?еба да Ñ?е коÑ?иÑ?Ñ?и за анонимноÑ?Ñ?, и СÐ?Ð?Ð? да Ñ?е коÑ?иÑ?Ñ?и за минÑ?ваÑ?е низ заÑ?Ñ?иÑ?ни Ñ?идови и Ñ?илÑ?Ñ?и.</string>
-  <string name="send_email">Ð?Ñ?пÑ?аÑ?и е-поÑ?Ñ?а</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">AдÑ?еÑ?а на моÑ?Ñ?ови можеÑ?е да добиваÑ?е пÑ?екÑ? е-поÑ?Ñ?а, веб или Ñ?о Ñ?кениÑ?аÑ?е на QR код. Ð?збеÑ?еÑ?е подолÑ? \'Ð?-поÑ?Ñ?а\' или \'Web\', за да побаÑ?аÑ?е адÑ?еÑ?а за моÑ?Ñ?оÑ?. \n\nÐ?Ñ?како Ñ?е Ñ?а добиеÑ?е адÑ?еÑ?аÑ?а, копиÑ?аÑ?Ñ?е го &amp; и залепеÑ?е го во делоÑ? \"Ð?оÑ?Ñ?ови\" во подеÑ?Ñ?ваÑ?еÑ?о на Orbot и Ñ?еÑ?Ñ?аÑ?Ñ?иÑ?аÑ?Ñ?е.</string>
-  <string name="standard_browser">СÑ?андаÑ?ден пÑ?елиÑ?Ñ?Ñ?ваÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?Ð?Ð?Ð?Ð?Ð?ШÐ?Ð?: Само Ñ?Ñ?андаÑ?дниÑ?е моÑ?Ñ?ови на Tor Ñ?Ñ?нкÑ?иониÑ?ааÑ? на Ñ?Ñ?едиÑ?е Intel X86/ATOM</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ml/strings.xml b/orbotservice/src/main/res/values-ml/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-ml/strings.xml
+++ b/orbotservice/src/main/res/values-ml/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-mn/strings.xml b/orbotservice/src/main/res/values-mn/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-mn/strings.xml
+++ b/orbotservice/src/main/res/values-mn/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-mr-rIN/strings.xml b/orbotservice/src/main/res/values-mr-rIN/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-mr-rIN/strings.xml
+++ b/orbotservice/src/main/res/values-mr-rIN/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ms-rMY/strings.xml b/orbotservice/src/main/res/values-ms-rMY/strings.xml
index c9cecc16..e89a46d2 100644
--- a/orbotservice/src/main/res/values-ms-rMY/strings.xml
+++ b/orbotservice/src/main/res/values-ms-rMY/strings.xml
@@ -1,196 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mula dan henti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot telah dimulakan..</string>
+    <string name="status_starting_up">Orbot telah dimulakan..</string>
   <string name="status_activated">Bersambung ke rangkaian Tor</string>
   <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
   <string name="tor_process_starting">Memulakan klien Tor..</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Rumah</string>
-  <string name="menu_browse">Carian</string>
-  <string name="menu_settings">Tetapan</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_start">Mula</string>
-  <string name="menu_stop">Henti</string>
-  <string name="menu_about">Tentang</string>
-  <string name="main_layout_download">Muat turun</string>
-  <string name="main_layout_upload">Muat naik</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Padam Log</string>
-  <string name="menu_verify">Semak</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
-  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Telus</string>
-  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
-  <string name="pref_transparent_all_title">Tor segalanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
-  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
-  <string name="pref_transparent_port_title">Senarai Port</string>
-  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
-  <string name="status_install_success">Tor berjaya dipasang!</string>
-  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ralat Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Seterusnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Tamat</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Batal</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Maklumat Orbot</string>
-  <string name="wizard_permissions_root">Kebenaran disahkan</string>
-  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
-  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
-  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torification</string>
-  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
-  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
-  <string name="wizard_tips_msg">Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market.</string>
-  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Enjin Carian</string>
-  <string name="wizard_tips_twitter">Tetapkan proxy twitter kepada hos \"localhost\" dan pada port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Tetapan proxy</string>
-  <string name="wizard_final">Orbot sudah sedia!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
-  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
-  <string name="pref_general_group">Umum</string>
-  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
-  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Amaran</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">kebenaran</string>
-  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
-  <string name="wizard_tips_play">Cari semua projek Guardian di Google play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Telus</string>
-  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
-  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
-  <string name="wizard_transproxy_none">Tiada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wi-Fi dan USB Devices terikat (memerlukan restart)</string>
-  <string name="button_grant_superuser">Minta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Nod</string>
-  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
-  <string name="pref_entrance_node">Nod Kemasukan</string>
-  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
-  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
-  <string name="pref_proxy_title">Laluan keluar jaringan proxy (tambahan)</string>
-  <string name="pref_proxy_type_title">Jenis Proxy</string>
-  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
-  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
-  <string name="pref_proxy_host_title">Hos Proxy</string>
-  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
-  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
-  <string name="pref_proxy_port_title">Port Proxy</string>
-  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
-  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
-  <string name="pref_proxy_username_title">Laluan keluar kata nama proxy</string>
-  <string name="pref_proxy_username_summary">Kata nama proxy (tambahan)</string>
-  <string name="pref_proxy_username_dialog">Masukkan kata nama proxy</string>
-  <string name="pref_proxy_password_title">Laluan keluar kata laluan proxy</string>
-  <string name="pref_proxy_password_summary">Kata laluan proxy (tambahan)</string>
-  <string name="pref_proxy_password_dialog">Masukkan kata laluan proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
-  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
-  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
-  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
-  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
-  <string name="bridge_error">Ralat jambatan</string>
-  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
-  <string name="send_email_for_bridges">Hantar e-mel kepada bridges@xxxxxxxxxxxxxx dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
-  <string name="error">Ralat</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
   <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
-  <string name="exit_nodes">Keluar Nod</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
-  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
-  <string name="exclude_nodes">Keluarkan Nod</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
-  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
-  <string name="strict_nodes">Nod Ketat</string>
-  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
-  <string name="bridges">Jambatan</string>
-  <string name="use_bridges">Guna Jambatan</string>
-  <string name="bridges_obfuscated">Jambatan Keliru</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
-  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
-  <string name="enter_or_port">Masukkan port OR</string>
-  <string name="relay_nickname">Nama samaran relay</string>
-  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
-  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
-  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
-  <string name="reachable_ports">Port yang dapat dicapai</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
-  <string name="enter_ports">Masukkan port</string>
-  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
-  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
-  <string name="hidden_service_ports">Port servis tersembunyi</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
-  <string name="project_home">Rumah Projek(s):</string>
-  <string name="the_tor_license">Lesen Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="hidden_service_request">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
-  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+    <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-  <string name="hidden_service_on">port tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
-  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
-  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
-  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
-  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
-  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
-  <string name="btn_save_settings">Simpan Tetapan</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ms/strings.xml b/orbotservice/src/main/res/values-ms/strings.xml
index 8e56f6a1..d1335f26 100644
--- a/orbotservice/src/main/res/values-ms/strings.xml
+++ b/orbotservice/src/main/res/values-ms/strings.xml
@@ -1,200 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">mula dan henti Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot telah dimulakan..</string>
+    <string name="status_starting_up">Orbot telah dimulakan..</string>
   <string name="status_activated">Bersambung ke rangkaian Tor</string>
   <string name="status_disabled">\"Orbot telah dinyah-aktifkan</string>
   <string name="status_shutting_down">Orbot sedang ditutup</string>
   <string name="tor_process_starting">Memulakan klien Tor..</string>
   <string name="tor_process_complete">selesai.</string>
-  <string name="tor_process_waiting">menunggu.</string>
-  <string name="not_anonymous_yet">AMARAN: Trafik anda tidak anonymous lagi! Sila tetapkan aplikasi anda untuk menggunakan proxy HTTP 127.0.0.1:8118 atau proxy SOCKS4A atau SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Rumah</string>
-  <string name="menu_browse">Carian</string>
-  <string name="menu_settings">Tetapan</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Bantuan</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Mula</string>
-  <string name="menu_stop">Henti</string>
-  <string name="menu_about">Tentang</string>
-  <string name="button_help">Bantuan</string>
-  <string name="button_close">Tutup</string>
-  <string name="button_about">Tentang</string>
-  <string name="button_clear_log">Padam Log</string>
-  <string name="menu_verify">Semak</string>
-  <string name="menu_exit">Keluar</string>
-  <string name="press_to_start">- Tekan lama untuk mulakan - </string>
-  <string name="pref_trans_proxy_group">Proxy Telus (Memerlukan akses Root)</string>
-  <string name="pref_trans_proxy_title">Proxy Telus</string>
-  <string name="pref_trans_proxy_summary">Tetapan Automatik Tor pada Apps</string>
-  <string name="pref_transparent_all_title">Tor segalanya</string>
-  <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi yang melalui Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port proxy undur</string>
-  <string name="pref_transparent_port_fallback_summary">AMARAN: memintasi port biasa (80, 443, dll). * CUMA GUNA * jika mod \'Semua\' atau \'App\' idak berfungsi.</string>
-  <string name="pref_transparent_port_title">Senarai Port</string>
-  <string name="pref_transparent_port_summary">Senarai port untuk proxy. *GUNA HANYA* jika mod \'Semua\' atau \'App\' tidak berfungsi</string>
-  <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
-  <string name="pref_has_root">Minta Akses Root</string>
-  <string name="pref_has_root_summary">Minta akses root untuk proxy telus</string>
-  <string name="status_install_success">Tor berjaya dipasang!</string>
-  <string name="status_install_fail">Fail Tor gagal dipasang. Sila semak log dan maklumkan kepada tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ralat Aplikasi</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
-  <string name="btn_next">Seterusnya</string>
-  <string name="btn_back">Kembali</string>
-  <string name="btn_finish">Tamat</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Batal</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Maklumat Orbot</string>
-  <string name="wizard_details_msg">Orbot merupakan aplikasi sumber terbuka yang mengandungi Tor, LibEvent dan Privoxy. Ia menyediakan seorang proksi HTTP tempatan (8118) dan proksi SOCKS (9050) ke dalam rangkaian Tor. Orbot juga mempunyai keupayaan, pada peranti berakar umbi, untuk menghantar semua trafik internet melalui Tor.</string>
-  <string name="wizard_permissions_root">Kebenaran disahkan</string>
-  <string name="wizard_permissions_stock">Kebenaran Orbot</string>
-  <string name="wizard_premissions_msg_root">Bagus! Kami mendapati anda ada akses root yang dibenarkan untuk Orbot. Kami akan gunakan kuasa ini dengan bijak.</string>
-  <string name="wizard_permissions_msg_stock">Walaupun ia tidak diperlukan, Orbot boleh menjadi alat yang berguna jika peranti anda mempunyai akses root. Guna butang di bawah untuk memberi Orbot superpower!</string>
-  <string name="wizard_permissions_no_root">Jika anda tidak mempunyai akses root atau tidak tahu mengenai ini, cuma pastikan anda menggunakan aplikasi yang boleh digunakan dengan Orbot.</string>
-  <string name="wizard_permissions_consent">Saya faham dan mahu teruskan tanpa Superuser</string>
-  <string name="wizard_permission_enable_root">Beri akses Root pada Orbot</string>
-  <string name="wizard_configure">Konfigurasi Torification</string>
-  <string name="wizard_configure_msg">Orbot memberi anda pilihan untuk menghala semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi untuk digunakan secara individual.</string>
-  <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
-  <string name="wizard_configure_select_apps">Pilih Aplikasi Untuk Tor</string>
-  <string name="wizard_tips_tricks">Aplikasi Yang Dibenar Menggunakan Orbot</string>
-  <string name="wizard_tips_msg">Aplikasi di bawah dibangunkan untuk digunakan bersama Orbot. Klik setiap butang untuk pasang sekarang, atau anda boleh cari nanti di Android Market.</string>
-  <string name="wizard_tips_otrchat">Gibberbot - Klien mesej ringkas selamat untuk Android</string>
-  <string name="wizard_tips_proxy">Tetapan Proksi - Belajar bagaimana untuk mengkonfigurasi aplikasi untuk bekerja dengan Orbot</string>
-  <string name="wizard_proxy_help_info">Tetapan proxy</string>
-  <string name="wizard_proxy_help_msg">Jika aplikasi Android yang anda gunakan boleh menyokong penggunaan proksi HTTP atau SOCKS, kemudian anda boleh menatarajah untuk menyambung kepada Orbot dan menggunakan Tor. â??\nâ??\nâ??\n    Tetapan tuan rumah adalah 127.0.0.1 atau \"localhost\". Untuk HTTP, tetapan pelabuhan 8118. Untuk SOCKS, proksi adalah 9050. Anda harus menggunakan SOCKS4A atau socks5 jika boleh. â??\n    â??\nâ??\nâ??\n    Anda boleh mengetahui lebih lanjut tentang proxying pada Android melalui FAQ di: http://tinyurl.com/proxyandroid â??</string>
-  <string name="wizard_final">Orbot sudah sedia!</string>
-  <string name="wizard_final_msg">Beratus-ratus ribu orang di seluruh dunia menggunakan Tor untuk pelbagai sebab-sebab yang luas. â??\nâ??\nWartawan dan blogger, pembela hak asasi manusia, pegawai penguatkuasa undang-undang, tentera, perbadanan, rakyat rejim menindas, dan warganegara sahaja, biasa â?¦ dan kini anda bersedia untuk, juga!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Anda telah berjaya disambungkan kepada rangkaian Tor - tetapi ini bukanlah bermakna peranti anda adalah selamat. Anda boleh menggunakan pilihan \'Check\' daripada menu untuk menguji pelayar anda. â??\nâ??\nMelawat kami pada https://guardianproject.info/apps/orbot atau menghantar e-mel ke help@xxxxxxxxxxxxxxxxxxxx untuk mengetahui lebih lanjut.</string>
-  <string name="tor_check">Ini akan membuka pelayar web anda untuk https://check.torproject.org untuk melihat jika Orbot mungkin ditetapkan dan anda disambungkan kepada Tor.</string>
-  <string name="pref_hs_group">Perkhidmatan tersembunyi</string>
-  <string name="pref_general_group">Umum</string>
-  <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string>
-  <string name="pref_start_boot_summary">Mula Orbot secara automatik dan sambung Tor ketika peranti Android boot</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot membawa Tor untuk Android! â??\nâ??\nTor membantu anda mempertahankan terhadap penapisan kandungan, analisis dan pengawasan trafik rangkaian yang mengancam privasi, maklumat sulit dan hubungan peribadi. â??\nâ??\nWizard ini akan membantu anda mengkonfigurasi Orbot dan Tor pada peranti anda.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Amaran</string>
-  <string name="wizard_warning_msg">Hanya memasang Orbot tidak secara automatik akan anonymize trafik mudah alih anda. â??\nâ??\nAnda betul mesti menatarajah Orbot, peranti anda dan aplikasi lain untuk berjaya menggunakan Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">kebenaran</string>
-  <string name="wizard_permissions_root_msg1">Anda juga boleh memberikan akses Orbot \'SuperUser\' untuk membolehkan ciri-ciri yang maju, seperti Proxying Telus.</string>
-  <string name="wizard_permissions_root_msg2">Jika anda tidak mahu berbuat demikian, sila pastikan untuk menggunakan aplikasi yang dibuat untuk bekerjasama dengan Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Peranti anda tidak perlu berakar umbi atau menyediakan \'SuperUser\' akses. â??\nâ??\nDalam untuk anda mendapat manfaat daripada Tor, anda akan perlu menggunakan aplikasi yang dibina untuk bekerja dengan Orbot, atau yang HTTP sokongan atau tetapan proksi SOCKS. â??\n</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplikasi yang membenarkan Orbot</string>
-  <string name="wizard_tips_gibberbot">Gibberbot: sembang app selamat dengan Penyulitan Off-the-Rekod</string>
-  <string name="wizard_tips_orweb">Orweb: Privasi ditambah penyemak imbas yang bekerja melalui Tor</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Telus</string>
-  <string name="wizard_transproxy_msg">Ini membolehkan aplikasi anda secara automatik melalui rangkaian Tor tanpa apa apa konfigurasi</string>
-  <string name="wizard_transproxy_hint">(Tanda kotak ini jika anda belen)</string>
-  <string name="wizard_transproxy_none">Tiada</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Membolehkan Proxying Telus Tor untuk Wi-Fi dan USB Devices terikat (memerlukan restart)</string>
-  <string name="button_grant_superuser">Minta Akses Superuser</string>
-  <string name="pref_select_apps">Pilih Aplikasi</string>
-  <string name="pref_select_apps_summary">Pilih Aplikasi untuk dihalakan melalui Tor</string>
-  <string name="pref_node_configuration">Konfigurasi Nod</string>
-  <string name="pref_node_configuration_summary">Ini ialah tetapan lanjutan yang boleh mengurangkan kadar anonymity anda</string>
-  <string name="pref_entrance_node">Nod Kemasukan</string>
-  <string name="pref_entrance_node_summary">Cap jari, nama samaran, negara, dan alamat untuk lompatan pertama</string>
-  <string name="pref_entrance_node_dialog">Masukkan Nod Kemasukan</string>
-  <string name="pref_proxy_type_title">Jenis Proxy</string>
-  <string name="pref_proxy_type_summary">Protokol untuk digunakan pada pelayan proxy: HTTP,HTTPS,Socks4,Socks5</string>
-  <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
-  <string name="pref_proxy_host_title">Hos Proxy</string>
-  <string name="pref_proxy_host_summary">Nama hos pelayan proxy</string>
-  <string name="pref_proxy_host_dialog">Masukkan Hos Proxy</string>
-  <string name="pref_proxy_port_title">Port Proxy</string>
-  <string name="pref_proxy_port_summary">Port pelayan proxy</string>
-  <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Tetapkan proxy telus secara keseluruhan</string>
-  <string name="setting_up_app_based_transparent_proxying_">Tetapkan proxy telus berdasarkan aplikasi</string>
-  <string name="transparent_proxying_enabled">Proxy telus dibolehkan</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy dibolehkan untuk Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">AMARAN: ralat semasa memulakan proxy telus!</string>
-  <string name="transproxy_rules_cleared">Peraturan TransProxy dipadam</string>
-  <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
-  <string name="privoxy_is_running_on_port_">Privoxy sedang berjalan pada port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Menetap proxy telus berdasarkan port..</string>
-  <string name="bridge_error">Ralat jambatan</string>
-  <string name="bridge_requires_ip">Untuk menggunakan ciri jambatan, anda mesti masukkan sekurang-kurangnya satu alamat IP jambatan.</string>
-  <string name="send_email_for_bridges">Hantar e-mel kepada bridges@xxxxxxxxxxxxxx dengan garisan \"jambatan\" dengan sendirinya dalam badan mel dari akaun gmail.</string>
-  <string name="error">Ralat</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tidak boleh memulakan proses Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Tetapan ReachableAddresses anda menyebabkan pengecualian!</string>
   <string name="your_relay_settings_caused_an_exception_">Tetapan relay anda menyebabkan pengecualian!</string>
-  <string name="exit_nodes">Keluar Nod</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Cap jari, nama samaran, negara, dan alamat untuk lompatan terakhir</string>
-  <string name="enter_exit_nodes">Masukkan Nod Keluar</string>
-  <string name="exclude_nodes">Keluarkan Nod</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Cap jari, nama samaran, negara dan alamat untuk dikeluarkan</string>
-  <string name="enter_exclude_nodes">Masukkan Nod Keluar</string>
-  <string name="strict_nodes">Nod Ketat</string>
-  <string name="use_only_these_specified_nodes">Guna *hanya* nod-nod ini</string>
-  <string name="bridges">Jambatan</string>
-  <string name="use_bridges">Guna Jambatan</string>
-  <string name="bridges_obfuscated">Jambatan Keliru</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Membolehkan nod pintu masuk ganti ke Rangkaian Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Benarkan jika konfigurasi jambatan adalah jambatan keliru</string>
-  <string name="ip_address_and_port_of_bridges">Alamat IP dan pelabuhan jambatan</string>
-  <string name="enter_bridge_addresses">Masukkan Alamat Jambatan</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Membolehkan peranti anda untuk menjadi geganti bukan keluar</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Mendapatkan port untuk tetapan relay Tor anda</string>
-  <string name="enter_or_port">Masukkan port OR</string>
-  <string name="relay_nickname">Nama samaran relay</string>
-  <string name="the_nickname_for_your_tor_relay">Nama samaran ini untuk relay Tor anda</string>
-  <string name="enter_a_custom_relay_nickname">Masukkan nama samaran gantian untuk relay</string>
-  <string name="reachable_addresses">Alamat yang dapat dicapai</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalan sebagai klien dibelakang firewall dengan peraturan ketat</string>
-  <string name="reachable_ports">Port yang dapat dicapai</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Port yang dapat dicapai dibelakang firewall dengan kawalan ketat</string>
-  <string name="enter_ports">Masukkan port</string>
-  <string name="enable_hidden_services">Benarkan Servis Tersembunyi</string>
-  <string name="run_servers_accessible_via_the_tor_network">Jalankan pelayan boleh diakses melalui rangkaian Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Masuk port localhost untuk servis tersembunyi</string>
-  <string name="hidden_service_ports">Port servis tersembunyi</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Nama beralamat untuk servis tersembunyi anda (dijana secara automatik)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">benarkan log debug pada output (mesti guna adb atau aLogCat untuk lihat)</string>
-  <string name="project_home">Rumah Projek(s):</string>
-  <string name="project_urls">https://www.torproject.org/docs/androidâ;?? https://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Lesen Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="hidden_service_request">Satu aplikasi mahu membuka port tersembunyi %S pada rangkaian Tor. Ia selamat jika anda percaya pada aplikasi itu.</string>
-  <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
+    <string name="found_existing_tor_process">Proses Tor sedia ada ditemui..</string>
   <string name="something_bad_happened">Sesuatu yang buruk berlaku. Semak log.</string>
-  <string name="hidden_service_on">port tersembunyi pada:</string>
-  <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
+    <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama servis tersembunyi</string>
   <string name="unable_to_start_tor">Tidak dapat memulakan Tor:</string>
-  <string name="pref_use_sys_iptables_title">Guna default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Guna binari built-in iptables daripada yang didatangkan bundle dengan Orbot</string>
-  <string name="error_installing_binares">Tor binari tidak boleh dipasang atau dinaiktaraf</string>
-  <string name="pref_use_persistent_notifications">Sentiasa biar ikon pada toolbar apabila Orbot bersambung</string>
-  <string name="pref_use_persistent_notifications_title">Sentiasa On Notifikasi</string>
-  <string name="notification_using_bridges">Jambatan dibenarkan!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Tetapan Tempatan</string>
-  <string name="set_locale_summary">Pilihan tempatan dan bahasa untuk Orbot</string>
-  <string name="wizard_locale_title">Pilih Bahasa</string>
-  <string name="wizard_locale_msg">Biar default atau ubah ke bahasa sekarang</string>
-  <string name="powered_by">Dijana oleh Projek Tor</string>
-  <string name="btn_save_settings">Simpan Tetapan</string>
-  <string name="menu_vpn">Apps</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-my/strings.xml b/orbotservice/src/main/res/values-my/strings.xml
index 07ab4759..b80fb51c 100644
--- a/orbotservice/src/main/res/values-my/strings.xml
+++ b/orbotservice/src/main/res/values-my/strings.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">á??á??á?ºá?? á??á?¬á??á?»á??á?ºá??á?¾á?¬</string>
-  <string name="menu_browse">á??á?½á??á?ºá?·á??á?¼á??á?ºá?·á??á??á?º</string>
-  <string name="menu_settings">á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸</string>
-  <string name="menu_info">á?¡á??á?°á?¡á??á?®</string>
-  <string name="menu_about">á?¡á??á?¼á?±á?¬á??á?ºá?¸</string>
-  <string name="button_help">á?¡á??á?°á?¡á??á?®</string>
-  <string name="button_close">á??á?­á??á?ºá??á??á?º</string>
-  <string name="button_about">á?¡á??á?¼á?±á?¬á??á?ºá?¸</string>
-  <string name="menu_exit">á??á?½á??á?ºá??á??á?º</string>
-  <string name="btn_back">á??á?±á?¬á??á?ºá??á?­á?¯á?·</string>
-  <string name="btn_cancel">á??á?»á??á?ºá??á?­á??á?ºá?¸á??á??á?º</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">á??á??á?±á?¬á??á?ºá??á?® á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">á??á?±á??á?¯á??á?»</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">á??á??á?­á??á?±á?¸á??á?»á??á?º</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">á??á?¬á??á?¾á??á??á?¾á?­</string>
-  <string name="status">á?¡á??á?±á?¡á??á?¬á?¸</string>
-  <string name="error">á??á?»á?­á?¯á?·á??á?½á??á?ºá?¸á??á?»á??á?º</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">á??á?»á?­á??á?ºá??á?¾á?­á??á?»á??á?ºá??á?»á?¬á?¸á??á?­á?¯ á??á?­á??á?ºá?¸á??á??á?ºá?¸á??á??á?º</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-nb/strings.xml b/orbotservice/src/main/res/values-nb/strings.xml
index cd48c319..8dbc71be 100644
--- a/orbotservice/src/main/res/values-nb/strings.xml
+++ b/orbotservice/src/main/res/values-nb/strings.xml
@@ -2,257 +2,29 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot er en gratis proxy app som gjør det mulig for andre apps å bruke internett mer sikkert. Orbot bruker Tor for å kryptere din Internettrafikk, og skjuler da din trafikk ved å sende trafikken gjennom en lang rekke datamaskiner over hele verden. Tor er et gratis dataprogram, og et åpent nettverk som hjelper deg å forsvare deg mot en form for nettverksovervåking som truer din personlige frihet og privatliv, konfidensiell bedriftsvirksomhet og relasjoner, og statlig sikkerhet kjent som trafikkanalyse.</string>
-  <string name="internal_web_url">https://torproject.org</string>
-  <string name="default_web_url">https://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start, og stopp Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot starter...</string>
+    <string name="status_starting_up">Orbot starter...</string>
   <string name="status_activated">Koblet til Tor-nettverket</string>
   <string name="status_disabled">Orbot er deaktivert</string>
   <string name="tor_process_starting">Starter Tor klient...</string>
   <string name="tor_process_complete">fullført.</string>
-  <string name="tor_process_waiting">venter.</string>
-  <string name="not_anonymous_yet">ADVARSEL: Trafikken din er enda ikke anonym! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118, eller SOCKS4A, eller SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Hjem</string>
-  <string name="menu_browse">Surfe</string>
-  <string name="menu_settings">Innstillinger</string>
-  <string name="menu_log">Logg</string>
-  <string name="menu_info">Hjelp</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stopp</string>
-  <string name="menu_about">Om</string>
-  <string name="main_layout_download">Nedlast</string>
-  <string name="main_layout_upload">Last opp</string>
-  <string name="button_help">Hjelp</string>
-  <string name="button_close">Steng</string>
-  <string name="button_about">Om</string>
-  <string name="button_clear_log">Tøm logg</string>
-  <string name="menu_verify">Kontroller</string>
-  <string name="menu_exit">Avslutt</string>
-  <string name="press_to_start">- langt trykk for å starte -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Krever Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatisk Torifisering av applikasjoner</string>
-  <string name="pref_transparent_all_title">Tor alt</string>
-  <string name="pref_transparent_all_summary">Proxy trafikk for alle applikasjoner via Tor</string>
-  <string name="pref_transparent_port_fallback_title">Tilbakestill proxyport</string>
-  <string name="pref_transparent_port_fallback_summary">ADVARSEL: Omgår vanlige porter (80, 443, osv). *BRUKES KUN* hvis \'alle\', eller \'Applikasjon\'-modus ikke virker.</string>
-  <string name="pref_transparent_port_title">Port Liste</string>
-  <string name="pref_transparent_port_summary">Liste over porter som skal gå gjennom proxy. *BRUKES KUN* hvis \'Alle\', eller \'Applikasjon\'-modus ikke virker.</string>
-  <string name="pref_transparent_port_dialog">Angi porter som skal gå gjennom proxy</string>
-  <string name="pref_has_root">Be om Root tilgang</string>
-  <string name="pref_has_root_summary">Be om root-tilgang for transparent proxying</string>
-  <string name="status_install_success">Tor binære filer vellykket installert!</string>
-  <string name="status_install_fail">Tor-binære filer kunne ikke installeres. Vennligst sjekk loggen og varsle tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Applikasjonsfeil</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Om Orbot</string>
-  <string name="btn_next">Neste</string>
-  <string name="btn_back">Tilbake</string>
-  <string name="btn_finish">Ferdig</string>
-  <string name="btn_okay">Ok</string>
-  <string name="btn_cancel">Avbryt</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Noen Orbot detaljer</string>
-  <string name="wizard_permissions_root">Tillatelse gitt</string>
-  <string name="wizard_permissions_stock">Orbot tillatelser</string>
-  <string name="wizard_premissions_msg_root">Utmerket! Vi har oppdaget at du har root rettigheter aktivert for Orbot. Vi vil bruke denne makten med omhu.</string>
-  <string name="wizard_permissions_msg_stock">Selv om det ikke er er nødvendig, kan Orbot bli et mer kraftig verktøy hvis enheten har root-tilgang. Bruk knappen nedenfor til å innvilge Orbot superkrefter!</string>
-  <string name="wizard_permissions_no_root">Hvis du ikke har root-tilgang, eller ikke har noen anelse om hva vi snakker om, bare sørg for å bruke programmer laget for å fungere med Orbot.</string>
-  <string name="wizard_permissions_consent">Jeg forstår, og ønsker å fortsette uten superbruker</string>
-  <string name="wizard_permission_enable_root">Gi Orbot root-tilgang</string>
-  <string name="wizard_configure">Konfigurer Torification</string>
-  <string name="wizard_configure_msg">Orbot gir deg muligheten til å rute all applikasjonstrafikk gjennom Tor, ELLER å velge applikasjonene individuelt.</string>
-  <string name="wizard_configure_all">Bruk proxy for alle applikasjoner gjennom Tor</string>
-  <string name="wizard_configure_select_apps">Velg individuelle applikasjoner som skal brukes med Tor</string>
-  <string name="wizard_tips_tricks">Orbot aktiverte applikasjoner</string>
-  <string name="wizard_tips_msg">Applikasjonene nedenfor ble utviklet for å fungere med Orbot. Klikk på hver knapp for å installere nå, eller du kan finne dem senere på Google Play, på GuardianProject.info nettsiden, eller via F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Sikret lynmeldingsklient for Android</string>
-  <string name="wizard_tips_proxy">Proxy-innstillinger - Lær hvordan du konfigurerer applikasjoner til å fungere med Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo søkemotor applikasjon</string>
-  <string name="wizard_tips_twitter">Sett Twitters proxy til \"localhost\", og port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxyinnstillinger</string>
-  <string name="wizard_final">Orbot er klar!</string>
-  <string name="wizard_final_msg">Millioner av mennesker over hele verden bruker Tor for en rekke grunner.\n\ nJournalists og bloggere, menneskerettighetsforkjempere, politi, soldater, bedrifter, borgere i undertrykkende regimer, og bare vanlige borgere ... og nå er du klar til å , også!</string>
-  <string name="wizard_exit_at_first_screen_toast">Vennligst konfigurere Orbot før du bruker det!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Dette vil åpne nettleseren din med adressen https://check.torproject.org for å se om Orbot er korrekt konfigurert, og at du er koblet til Tor.</string>
-  <string name="pref_hs_group">Skjult Service Hosting</string>
-  <string name="pref_general_group">Generelt</string>
-  <string name="pref_start_boot_title">Start Orbot ved oppstart</string>
-  <string name="pref_start_boot_summary">Start Orbot automatisk, og koble til Tor når din Android-enhet starter opp</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot bringer Tor til Android!\n\nTor hjelper deg å forsvare seg mot innholdsfiltrering, trafikk analyse og overvåking som truer personvern, konfidensiell informasjon og personlige relasjoner. \ N \ nDenne veiviseren vil hjelpe deg med å konfigurere Orbot og Tor på enheten.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Advarsel</string>
-  <string name="wizard_warning_msg">Ganske enkelt å installere Orbot vil ikke automatisk anonymmobiltrafikk .\n\nDu må konfigurere Orbot, enheten og andre applikasjoner for å kunne bruke Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Tillatelser</string>
-  <string name="wizard_permissions_root_msg1">Du kan eventuelt gi Orbot \'Superbruker\' adgang til å aktivere avanserte funksjoner, for eksempel Transparent proxy.</string>
-  <string name="wizard_permissions_root_msg2">Hvis du ikke ønsker å gjøre dette, må du sørge for å bruke applikasjoner som er laget for å fungere med Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Enheten ser ikke ut til å være forankret eller gi root eller \"superbruker\" tilgang.\n\nVennligst prøve \"apps\" modus på hovedskjermen i stedet.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot aktiverte applikasjoner</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Sikret sludreprogram med OTR-kryptering</string>
-  <string name="wizard_tips_play">Finn alle Guardian Prosjekt sine applikasjoner på Google Play</string>
-  <string name="wizard_tips_fdroid">Finn alle Guardian Project applikasjoner på F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Finn alle Guardian Project applikasjoner på https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">Dette tillater dine applikasjoner å kjøre automatisk gjennom Tor-nettverket uten noen konfigurasjon.</string>
-  <string name="wizard_transproxy_hint">(Marker denne boksen hvis du ikke har noen anelse om hva vi snakker om)</string>
-  <string name="wizard_transproxy_none">Ingen</string>
-  <string name="pref_transparent_tethering_title">Tor-deling</string>
-  <string name="pref_transparent_tethering_summary">Aktiver Tor Transparent proxyer for Wi-Fi, og USB delte enheter (krever omstart)</string>
-  <string name="button_grant_superuser">Be om Superbruker tilgang</string>
-  <string name="pref_select_apps">Velg applikasjoner</string>
-  <string name="pref_select_apps_summary">Velg applikasjoner som skal rutes gjennom Tor</string>
-  <string name="pref_node_configuration">Node-konfigurasjon</string>
-  <string name="pref_node_configuration_summary">Dette er avanserte innstillinger som kan redusere din anonymitet</string>
-  <string name="pref_entrance_node">Inngangsnoder</string>
-  <string name="pref_entrance_node_summary">Fingeravtrykk, kallenavn, land, og adresser til det første hopp</string>
-  <string name="pref_entrance_node_dialog">Skriv inn inngangsnoder</string>
-  <string name="button_proxy_all">Mellomtjen alt</string>
-  <string name="button_proxy_none">Mellomtjen ingenting</string>
-  <string name="pref_proxy_title">Utgående nettverksproxy (Valgfritt)</string>
-  <string name="pref_proxy_type_title">Utgående proxytype</string>
-  <string name="pref_proxy_type_summary">Protokoll for proxy-server: HTTP, HTTPS, SOCKS4, SOCKS5</string>
-  <string name="pref_proxy_type_dialog">Skriv inn proxytype</string>
-  <string name="pref_proxy_host_title">Utgående proxyvert</string>
-  <string name="pref_proxy_host_summary">Proxyserver vertsnavn</string>
-  <string name="pref_proxy_host_dialog">Skriv inn proxyvert</string>
-  <string name="pref_proxy_port_title">Utgående proxyport</string>
-  <string name="pref_proxy_port_summary">Proxyserver port</string>
-  <string name="pref_proxy_port_dialog">Skriv inn proxyport</string>
-  <string name="pref_proxy_username_title">Utgående Proxy Brukernavn</string>
-  <string name="pref_proxy_username_summary">Proxy Brukernavn (valgfritt)</string>
-  <string name="pref_proxy_username_dialog">Skriv inn Proxy Brukernavn</string>
-  <string name="pref_proxy_password_title">Utgående Proxy Passord</string>
-  <string name="pref_proxy_password_summary">Proxy Passord (valgfritt)</string>
-  <string name="pref_proxy_password_dialog">Skriv inn Proxy Passord</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Konfigurerer full transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Konfigurerer applikasjonsbasert transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Transparent proxying AKTIVERT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy aktivert for nettdeling!</string>
-  <string name="warning_error_starting_transparent_proxying_">ADVARSEL: Feil under oppstart av transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy regler fjernet</string>
-  <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</string>
-  <string name="privoxy_is_running_on_port_">Polipo kjører på port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Konfigurerer portbasert transparent proxying...</string>
-  <string name="bridge_error">Brofeil</string>
-  <string name="bridge_requires_ip">For å kunne bruke bro-funksjonen, må du oppgi minst én bro IP-adresse.</string>
-  <string name="send_email_for_bridges">Send en epost til bridges@xxxxxxxxxxxxxx med teksten \"get bridges\" alene som eneste tekst i selve eposten fra en Gmail-konto.</string>
-  <string name="error">Feil</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Kunne ikke starte Tor prosessen:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Dine \"adresser som kan nås\"-innstillinger forårsaket et unntak!</string>
   <string name="your_relay_settings_caused_an_exception_">Dine relé-innstillinger forårsaket et unntak!</string>
-  <string name="exit_nodes">Avslutt noder</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtrykk, kallenavn, land og adresser for siste hopp</string>
-  <string name="enter_exit_nodes">Skriv inn utgående noder</string>
-  <string name="exclude_nodes">Ekskluder noder</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fineravtrykk, kallenavn, land og adresser som skal ekskluderes</string>
-  <string name="enter_exclude_nodes">Skriv inn ekskluderte noder</string>
-  <string name="strict_nodes">Strict noder</string>
-  <string name="use_only_these_specified_nodes">Bruk *bare* disse angitte nodene</string>
-  <string name="bridges">Broer</string>
-  <string name="use_bridges">Bruk broer</string>
-  <string name="bridges_obfuscated">Maskerte broer</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktiver alternative inngangsnoder til Tor-nettverket</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktiver hvis de konfigurerte broene er maskerte broer</string>
-  <string name="ip_address_and_port_of_bridges">IP-adresser og broporter</string>
-  <string name="enter_bridge_addresses">Skriv inn broadresser</string>
-  <string name="relays">Reléer</string>
-  <string name="relaying">Videresending</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Aktiver enheten din som et relé uten utgående trafikk</string>
-  <string name="relay_port">Relé-port</string>
-  <string name="listening_port_for_your_tor_relay">Porten Tor-reléet ditt lytter på</string>
-  <string name="enter_or_port">Skriv inn OR-port</string>
-  <string name="relay_nickname">Reléets kallenavn</string>
-  <string name="the_nickname_for_your_tor_relay">Kallenavnet på ditt Tor-relé</string>
-  <string name="enter_a_custom_relay_nickname">Skriv inn et egendefinert kallenavn på reléet</string>
-  <string name="reachable_addresses">Antreffbare adresser</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kjør som en klient bak en brannmur med restriktive regler</string>
-  <string name="reachable_ports">Antreffbare porter</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Antreffbare porter bak en restriktiv brannmur</string>
-  <string name="enter_ports">Skriv inn porter</string>
-  <string name="enable_hidden_services">Skjult Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">Tillat enhetsserveren å være tilgjengelig via Tor-nettverket</string>
-  <string name="enter_localhost_ports_for_hidden_services">Skriv inn localhost porter for skjulte tjenester</string>
-  <string name="hidden_service_ports">Skjulte tjenesteporter</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Det adresserbare navnet på din skjulte tjeneste (generert automatisk)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">aktiver feilsøkingslogg for output (må bruke adb eller aLogCat for å vise)</string>
-  <string name="project_home">Prosjektets nettside(r):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor-lisensen</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Tredjepartsprogramvare:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">En applikasjon vil åpne den skjulte tjenesteporten %S til Tor-nettverket. Dette er trygt hvis du stoler på applikasjonen. </string>
-  <string name="found_existing_tor_process">fant eksisterende Tor-prosess...</string>
+    <string name="found_existing_tor_process">fant eksisterende Tor-prosess...</string>
   <string name="something_bad_happened">Noe alvorlig skjedde. Sjekk loggen.</string>
-  <string name="hidden_service_on">skjult tjeneste på:</string>
-  <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
+    <string name="unable_to_read_hidden_service_name">klarte ikke å lese skjult tjenestenavn</string>
   <string name="unable_to_start_tor">Klarte ikke å starte Tor:</string>
-  <string name="unable_to_reset_tor">Gjør en omstart av din enhet, kan ikke tilbakestille Tor!</string>
-  <string name="pref_use_sys_iptables_title">Bruk standard Iptables</string>
-  <string name="pref_use_sys_iptables_summary">bruk de innebygde binære-iptables istedenfor de som kommer med Orbot</string>
-  <string name="error_installing_binares">Tor-binærfilene var ikke i stand til å bli installert, eller oppgradert.</string>
-  <string name="pref_use_persistent_notifications">Alltid behold ikonet i verktøyslinjen når Orbot er tilkoblet</string>
-  <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Varslinger</string>
-  <string name="pref_use_expanded_notifications_title">Utvidede varsler</string>
-  <string name="notification_using_bridges">Broer slått på!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Språk</string>
-  <string name="set_locale_summary">Velg nasjonale innstillinger, og språk for Orbot</string>
-  <string name="wizard_locale_title">Velg språk</string>
-  <string name="wizard_locale_msg">Bruk standard, eller endre det gjeldende språket</string>
-  <string name="powered_by">Levert av Tor</string>
-  <string name="btn_save_settings">Lagre Inntillinger</string>
-  <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodus... </string>
-  <string name="bandwidth_">BÃ¥ndbredde:</string>
-  <string name="down">ned</string>
-  <string name="up">opp</string>
-  <string name="pref_disable_network_title">Inget automatisk hvilemodus for nettverk</string>
-  <string name="pref_disable_network_summary">Legg Tor i hvilemodus når nettilkobling til internett ikke er tilgjengelig</string>
-  <string name="newnym">Du har byttet til en ny Tor-identitet!</string>
-  <string name="menu_verify_browser">Nettleser</string>
-  <string name="menu_use_chatsecure">Bruk ChatSecure</string>
-  <string name="permission_manage_tor_label">HÃ¥ndter Tor</string>
-  <string name="permission_manage_tor_description">La dette programmet kontrollere Tor-tjenesten</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Det ser ikke ut til at du har Orfox installert. �nsker du hjelp med dette, eller skal vi bare åpne nettleseren?</string>
-  <string name="install_apps_">Installere programmer?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Putting Tor å sove ...</string>
+    <string name="no_internet_connection_tor">Ingen Internett-tilkobling; Tor er i ventemodus... </string>
+    <string name="newnym">Du har byttet til en ny Tor-identitet!</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Putting Tor å sove ...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">Nettverkstilkobling er bra. VÃ¥kne Tor opp ...</string>
   <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string>
-  <string name="pref_socks_summary">Port som Tor tilbyr er SOCKS proxy på (standard: 9050 eller 0 for å slå av)</string>
-  <string name="pref_socks_dialog">SOCKS Port Konfigurasjon</string>
-  <string name="pref_transport_title">Tor TransProxy Port</string>
-  <string name="pref_transport_dialog">TransProxy Port Konfigurasjon</string>
-  <string name="pref_dnsport_title">Tor DNS Port</string>
-  <string name="pref_dnsport_dialog">DNS Port Configurer</string>
-  <string name="your_tor_public_ips_">Din Tor offentlige IP:</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Broer oppdatert</string>
-  <string name="restart_orbot_to_use_this_bridge_">Gjør omstart av Orbot før endringer trer i kraft</string>
-  <string name="menu_qr">QR-koder</string>
-  <string name="get_bridges_email">E-post</string>
-  <string name="get_bridges_web">Vev</string>
-  <string name="activate">Aktiver</string>
-  <string name="send_email">Send e-post</string>
-  <string name="install_orweb">Installer Orfox</string>
-  <string name="standard_browser">Forvalgt nettleser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Merk: Bare vanlige Tor-broer fungerer på Intel X86/Atom-enheter</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-nl/strings.xml b/orbotservice/src/main/res/values-nl/strings.xml
index 935bd901..93085c81 100644
--- a/orbotservice/src/main/res/values-nl/strings.xml
+++ b/orbotservice/src/main/res/values-nl/strings.xml
@@ -2,291 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot is een gratis en vrije proxy-app die het andere apps mogelijk maakt het internet veiliger te gebruiken. Orbot gebruikt Tor om je internetverkeer te coderen en het vervolgens te verhullen het door het door een serie computers over de hele wereld te routeren. Tor is vrije software en een open netwerk dat je helpt te verdedigen tegen een vorm van netwerktoezicht die persoonlijke vrijheid en privacy, vertrouwelijke bedrijfsactiviteiten en relaties en staatsveiligheid genaamd \'traffic analyse\' bedreigt.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start en stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is bezig met startenâ?¦</string>
+    <string name="status_starting_up">Orbot is bezig met startenâ?¦</string>
   <string name="status_activated">Verbonden met het Tor-netwerk</string>
   <string name="status_disabled">Orbot is uitgeschakeld</string>
   <string name="status_shutting_down">TorService wordt afgesloten</string>
   <string name="tor_process_starting">Bezig met Tor client startenâ?¦</string>
   <string name="tor_process_complete">klaar.</string>
-  <string name="tor_process_waiting">bezig met wachten.</string>
-  <string name="not_anonymous_yet">WAARSCHUWING: je verkeer is nog niet anononiem! Stel je programma\'s in om gebruik te maken van HTTP-proxy 127.0.0.1:8118 of SOCKS4A- of SOCKS5-proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Thuis</string>
-  <string name="menu_browse">Bladeren</string>
-  <string name="menu_settings">Instellingen</string>
-  <string name="menu_log">Logboek</string>
-  <string name="menu_info">Hulp</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">Over</string>
-  <string name="menu_promo_apps">Apps ophalen...</string>
-  <string name="main_layout_download">Download</string>
-  <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Hulp</string>
-  <string name="button_close">Afsluiten</string>
-  <string name="button_about">Over</string>
-  <string name="button_clear_log">Logboek wissen</string>
-  <string name="menu_verify">Controleren</string>
-  <string name="menu_exit">Sluiten</string>
-  <string name="menu_scan">BridgeQR scannen</string>
-  <string name="menu_share_bridge">BridgeQR delen</string>
-  <string name="press_to_start">- lang indrukken om te starten -</string>
-  <string name="pref_trans_proxy_group">Transparant proxyen (vereist root)</string>
-  <string name="pref_trans_proxy_title">Transparant proxyen</string>
-  <string name="pref_trans_proxy_summary">Automatisch Torificeren van apps</string>
-  <string name="pref_transparent_all_title">Tor alles</string>
-  <string name="pref_transparent_all_summary">Proxy verkeer van alle apps door Tor</string>
-  <string name="pref_transparent_port_fallback_title">Poort proxy fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WAARSCHUWING: omzeilt veel voorkomende poorten (80, 443, etc). *GEBRUIK ENKEL* indien de \'Alles\' of \'Apps\'-modus niet werkt.</string>
-  <string name="pref_transparent_port_title">Poortlijst</string>
-  <string name="pref_transparent_port_summary">Lijst van poorten om te proxyen. *GEBRUIK ENKEL* indien \'Alles\' of \'Apps\'-modus niet werkt</string>
-  <string name="pref_transparent_port_dialog">Voer poorten in voor proxy</string>
-  <string name="pref_has_root">Vraag root-toegang aan</string>
-  <string name="pref_has_root_summary">Vraag root-toegang aan voor transparant proxyen</string>
-  <string name="status_install_success">Binaire bestanden van Tor succesvol geïnstalleerd!</string>
-  <string name="status_install_fail">De binaire bestanden konden niet worden geïnstalleerd. Gelieve de log te raadplegen en tor-assistants@xxxxxxxxxxxxxx op de hoogte te stellen</string>
-  <string name="title_error">Toepassingsfout</string>
-  <string name="wizard_title">Welkom bij Orbot</string>
-  <string name="wizard_btn_tell_me_more">Over Orbot</string>
-  <string name="btn_next">Volgende</string>
-  <string name="btn_back">Vorige</string>
-  <string name="btn_finish">Einde</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Annuleren</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Enkele Orbot-gegevens</string>
-  <string name="wizard_details_msg">Orbot is een open-bron-applicatie die Tor, LibEvent en Polipo bevat. Het biedt een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om op een toestel met root-toegang alle internetverkeer door Tor te sturen.</string>
-  <string name="wizard_permissions_root">Rechten toegewezen</string>
-  <string name="wizard_permissions_stock">Orbot-rechten</string>
-  <string name="wizard_premissions_msg_root">Uitstekend! We hebben gedetecteerd dat je root-rechten hebt aangezet voor Orbot. We gebruiken deze kracht met verstand.</string>
-  <string name="wizard_permissions_msg_stock">Hoewel het niet noodzakelijk is kan Orbot nog krachtiger worden als je toestel root-rechten heeft. Gebruik de knop onderaan om Orbot superkrachten te geven!</string>
-  <string name="wizard_permissions_no_root">Als je niet over root-toegang beschikt en geen idee hebt waarover we bezig zijn, let er dan op dat je apps gebruikt die geschikt zijn voor Orbot.</string>
-  <string name="wizard_permissions_consent">Ik begrijp dit en wil verdergaan zonder Superuser</string>
-  <string name="wizard_permission_enable_root">Root toestaan voor Orbot</string>
-  <string name="wizard_configure">Torificatie instellen</string>
-  <string name="wizard_configure_msg">Orbot geeft je de mogelijkheid om al het verkeer via Tor te laten gaan OF om individueel je applicaties te kiezen.</string>
-  <string name="wizard_configure_all">Proxy alle apps door Tor</string>
-  <string name="wizard_configure_select_apps">Selecteer individuele apps voor Tor</string>
-  <string name="wizard_tips_tricks">Orbot-geschikte apps</string>
-  <string name="wizard_tips_msg">De apps hieronder zijn gemaakt om met Orbot te werken. Klik op de knoppen om ze te installeren, of vind ze later op GuardianProject.info, F-Droid.org of Google Play.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Beveiligde instant messaging-cliënt voor Android</string>
-  <string name="wizard_tips_proxy">Proxy-instellingen - Leer hoe je apps te configureren voor Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo zoekmachine-app</string>
-  <string name="wizard_tips_twitter">Stel Twitter-proxy in als host \"localhost\" en poort 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Maak een verhaal en laat de veiligheid aan Tor over!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-instellingen</string>
-  <string name="wizard_proxy_help_msg">Als de Android-applicatie die je gebruikt het gebruik van een HTTP- of SOCKS-proxy ondersteunt kan je het instellen om te verbinden met Orbot en Tor te gebruiken.\n\n\n De hostinstelling is 127.0.0.1 of \"localhost\". Voor HTTP is de poort 8118, voor SOCKS is de proxy 9050. Indien mogelijk zou je SOCKS4A of SOCKS5 moeten gebruiken.\n \n\n\n Je kan meer te weten komen over proxyen op Android in de VGV op: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot is klaar!</string>
-  <string name="wizard_final_msg">Miljoenen mensen de wereld rond gebruiken Tor voor uiteenlopende redenen.\n\nJournalisten en bloggers, verdedigers van mensenrechten, politie, soldaten, bedrijven, burgers van onderdrukkende regimes, en gewone burgersâ?¦ en nu ben jij er ook klaar voor!</string>
-  <string name="wizard_exit_at_first_screen_toast">Je moet Orbot eerst configureren vooraleer je het kan gebruiken!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">De verbinding met het Tor netwerk is gelukt - maar dit betekent NIET dat je apparaat veilig is. Je kunt de \'Browser\' knop gebruiken om je verbinding te testen. \n\nBezoek ons op https://guardianproject.info/apps/orbot of stuur een email aan help@xxxxxxxxxxxxxxxxxxxx om meer te weten te komen.</string>
-  <string name="tor_check">Dit opent je standaardbrowser naar https://check.torproject.org om te controleren of Orbot succesvol is geconfigureerd om te verbinden met het Tor-netwerk.</string>
-  <string name="pref_hs_group">Verborgen diensten hosten</string>
-  <string name="pref_general_group">Algemeen</string>
-  <string name="pref_start_boot_title">Start Orbot bij opstarten</string>
-  <string name="pref_start_boot_summary">Start Orbot en verbind automatisch met Tor wanneer je Android-toestel opstart</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot brengt Tor naar Android!\n\nTor helpt je te verdedigen tegen het filteren van inhoud, verkeersanalyse en netwerktoezicht die je privacy, vertrouwelijke informatie en persoonlijke relaties bedreigt.\n\nDeze wizard helpt je bij het instellen van Orbot en Tor op je toestel.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Waarschuwing</string>
-  <string name="wizard_warning_msg">Gewoonweg Orbot installeren zal je mobiele verkeer niet automatisch anonimiseren.\n\nJe moet Orbot, je toestel en andere applicaties juist instellen om Tor succesvol te gebruiken.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Rechten</string>
-  <string name="wizard_permissions_root_msg1">Je kan optioneel Orbot \'Superuser\'-toegang geven om geavanceerde functies beschikbaar te stellen, zoals transparant proxyen.</string>
-  <string name="wizard_permissions_root_msg2">Als je dit niet wil doen, let er dan op dat je apps gebruikt die geschikt zijn voor Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Je toestel is niet geroot of biedt geen root of \'Superuser\'-toegang.\n\nProbeer de \'Apps\'-modus op het hoofdscherm.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-geschikte apps</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: beveiligde chat-applicatie met Off-the-Record-versleuteling</string>
-  <string name="wizard_tips_orweb">Orfox: Browser met pricavy functies die werkt met Tor</string>
-  <string name="wizard_tips_play">Vind alle Guardian Project-applicaties op Google Play</string>
-  <string name="wizard_tips_fdroid">Vind alle Guardian Project-applicaties op F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Vind alle Guardian Project-applicaties op https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparant proxyen</string>
-  <string name="wizard_transproxy_msg">Dit maakt het mogelijk voor jouw applicaties om automatisch via het Tor-netwerk te draaien zonder enige configuratie.</string>
-  <string name="wizard_transproxy_hint">(Vink dit aan als je geen idee hebt waarover we het hebben)</string>
-  <string name="wizard_transproxy_none">Geen</string>
-  <string name="pref_transparent_tethering_title">Tor tetheren</string>
-  <string name="pref_transparent_tethering_summary">Schakel Tor transparante proxy voor Wi-Fi en USB-getheterde toestellen in (vereist herstart)</string>
-  <string name="button_grant_superuser">Vraag Superuser-toegang aan</string>
-  <string name="pref_select_apps">Kies applicaties</string>
-  <string name="pref_select_apps_summary">Kies applicaties om via Tor te draaien</string>
-  <string name="pref_node_configuration">Node-configuratie</string>
-  <string name="pref_node_configuration_summary">Dit zijn geavanceerde instellingen die je anonimiteit kunnen verminderen</string>
-  <string name="pref_entrance_node">Toegangsnodes</string>
-  <string name="pref_entrance_node_summary">Vingerafdrukken, nicks, landen en adressen voor de eerste hop</string>
-  <string name="pref_entrance_node_dialog">Voer toegangsnodes in</string>
-  <string name="pref_allow_background_starts_title">Sta starten op de achtergrond toe</string>
-  <string name="pref_allow_background_starts_summary">Sta elke app toe om Orbot de Tor verbinding en diensten te laten starten </string>
-  <string name="button_proxy_all">Proxy alles</string>
-  <string name="button_proxy_none">Proxy niets</string>
-  <string name="button_invert_selection">Selectie omkeren</string>
-  <string name="pref_proxy_title">Uitgaande netwerk-proxy (facultatief)</string>
-  <string name="pref_proxy_type_title">Proxy-type</string>
-  <string name="pref_proxy_type_summary">Protocol om te gebruiken voor proxyserver: HTTP, HTTPS, SOCKS4, SOCKS5</string>
-  <string name="pref_proxy_type_dialog">Voer proxy-type in</string>
-  <string name="pref_proxy_host_title">Proxyhost</string>
-  <string name="pref_proxy_host_summary">Proxyserverhostnaam</string>
-  <string name="pref_proxy_host_dialog">Voer proxyhost in</string>
-  <string name="pref_proxy_port_title">Proxypoort</string>
-  <string name="pref_proxy_port_summary">Proxyserverpoort</string>
-  <string name="pref_proxy_port_dialog">Voer proxy poort in</string>
-  <string name="pref_proxy_username_title">Uitgaande proxygebruikersnaam</string>
-  <string name="pref_proxy_username_summary">Proxygebruikersnaam (facultatief)</string>
-  <string name="pref_proxy_username_dialog">Voer proxygebruikersnaam in</string>
-  <string name="pref_proxy_password_title">Uitgaande proxywachtwoord</string>
-  <string name="pref_proxy_password_summary">Proxywachtwoord (facultatief)</string>
-  <string name="pref_proxy_password_dialog">Voer proxywachtwoord in</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Bezig met opzetten van volledig transparante proxyâ?¦</string>
-  <string name="setting_up_app_based_transparent_proxying_">Bezig met opzetten van per-app transparante proxyâ?¦</string>
-  <string name="transparent_proxying_enabled">Transparante proxy INGESCHAKELD</string>
-  <string name="transproxy_enabled_for_tethering_">Transparante proxy ingeschakeld voor tetheren!</string>
-  <string name="warning_error_starting_transparent_proxying_">WAARSCHUWING: fout tijdens starten van transparante proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy-regels gewist</string>
-  <string name="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </string>
-  <string name="privoxy_is_running_on_port_">Polipo wordt uitgevoerd op poort:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Bezig met opzetten van per-poort transparante proxyâ?¦</string>
-  <string name="bridge_error">Bridge-fout</string>
-  <string name="bridge_requires_ip">Om de bridge-functie te gebruiken moet je minstens één bridge IP-adres invoeren.</string>
-  <string name="send_email_for_bridges">Stuur een e-mail met een GMail-account naar bridges@xxxxxxxxxxxxxx met enkel de regel \"get bridges\" in de body van de e-mail.</string>
-  <string name="error">Fout</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Je ReachableAddresses-instellingen veroorzaakten een fout!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Kon Tor-proces niet starten: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Je ReachableAddresses-instellingen veroorzaakten een fout!</string>
   <string name="your_relay_settings_caused_an_exception_">Je relay-instellingen veroorzaakten een fout!</string>
-  <string name="exit_nodes">Exitnodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Vingerafdrukken, nicks, landen en adressen voor de laatste hop</string>
-  <string name="enter_exit_nodes">Voer exitnode in</string>
-  <string name="exclude_nodes">Uitgesloten nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Vingerafdrukken, nicks, landen en adressen om uit te sluiten</string>
-  <string name="enter_exclude_nodes">Voer uitgesloten nodes in</string>
-  <string name="strict_nodes">Strikte nodes</string>
-  <string name="use_only_these_specified_nodes">Gebruik *enkel* deze opgegeven nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Gebruik bridges</string>
-  <string name="bridges_obfuscated">Versluierde bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Gebruik alternatieve toegangsnodes naar het Tor-etwerk</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Schakel in als de geconfigureerde bridges versluierde bridges zijn</string>
-  <string name="ip_address_and_port_of_bridges">IP-adres en poort van bridges</string>
-  <string name="enter_bridge_addresses">Voer bridge-adres in</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relayen</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Stel je toestel in staat om een non-exit relay te zijn</string>
-  <string name="relay_port">Relay-poort</string>
-  <string name="listening_port_for_your_tor_relay">Luisterpoort van jouw Tor-relay</string>
-  <string name="enter_or_port">Voer OR-poort in</string>
-  <string name="relay_nickname">Relay-bijnaam</string>
-  <string name="the_nickname_for_your_tor_relay">De bijnaam voor jouw Tor-relay</string>
-  <string name="enter_a_custom_relay_nickname">Voer een eigen relay-bijnaam in</string>
-  <string name="reachable_addresses">Bereikbare adressen</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Draai als een cliënt achter een firewall met beperkend beleid</string>
-  <string name="reachable_ports">Bereikbare poorten</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Poorten bereikbaar achter een beperkende firewall</string>
-  <string name="enter_ports">Voer poorten in</string>
-  <string name="enable_hidden_services">Verborgen diensten hosten</string>
-  <string name="run_servers_accessible_via_the_tor_network">maak server-op-toestel toegankelijk via het Tor-netwerk</string>
-  <string name="enter_localhost_ports_for_hidden_services">voer localhost-poorten in voor verborgen diensten</string>
-  <string name="hidden_service_ports">Verborgen dienst-poort</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">de adresseerbare naam voor je verborgen dienst (automatisch gegenereerd)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">schakel debug log naar uitvoer in (adb of aLogCat is nodig om dit te bekijken)</string>
-  <string name="project_home">Project homepagina(\'s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">De Tor-licentie</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software van 3e partijen: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Een applicatie wil verborgen dienst-poort %S openen naar het Tor-netwerk. Dit is veilig als je de applicatie vertrouwt.</string>
-  <string name="found_existing_tor_process">bestaand Tor-proces gevondenâ?¦</string>
+    <string name="found_existing_tor_process">bestaand Tor-proces gevondenâ?¦</string>
   <string name="something_bad_happened">Er is een fout opgetreden. Controleer de log</string>
-  <string name="hidden_service_on">verborgen dienst op:</string>
-  <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
+    <string name="unable_to_read_hidden_service_name">Kan verborgen dienst-naam niet lezen</string>
   <string name="unable_to_start_tor">Kan Tor niet starten:</string>
-  <string name="unable_to_reset_tor">Herstart je toestel, kan Tor niet opnieuw instellen!</string>
-  <string name="pref_use_sys_iptables_title">Gebruik standaard iptables</string>
-  <string name="pref_use_sys_iptables_summary">gebruik de ingebouwde iptables-binary in plaats van de in Orbot geïntegreerde</string>
-  <string name="error_installing_binares">De Tor-binaries konden niet worden geïnstalleerd of bijgewerkt.</string>
-  <string name="pref_use_persistent_notifications">Houd icoon in taakbalk zolang Orbot verbonden is</string>
-  <string name="pref_use_persistent_notifications_title">Meldingen altijd aan</string>
-  <string name="pref_use_expanded_notifications">Toon uitgebreide melding met Tor-exitland en IP</string>
-  <string name="pref_use_expanded_notifications_title">Uitgebreide meldingen</string>
-  <string name="notification_using_bridges">Bridges ingeschakeld!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Taal</string>
-  <string name="set_locale_summary">Kies de landsinstellingen en taal voor Orbot</string>
-  <string name="wizard_locale_title">Kies taal</string>
-  <string name="wizard_locale_msg">Laat standaard of schakel over naar huidige taal</string>
-  <string name="powered_by">aangedreven door Tor</string>
-  <string name="btn_save_settings">Sla instellingen op</string>
-  <string name="no_internet_connection_tor">Geen internetverbinding; Tor is op stand-byâ?¦</string>
-  <string name="bandwidth_">Bandbreedte:</string>
-  <string name="down">omlaag</string>
-  <string name="up">omhoog</string>
-  <string name="pref_disable_network_title">Geen netwerk automatisch slapen</string>
-  <string name="pref_disable_network_summary">Laat Tor slapen als er geen internetverbinding beschikbaar is</string>
-  <string name="newnym">Je bent naar een nieuwe Tor identiteit gewisseld!</string>
-  <string name="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Gebruik ChatSecure</string>
-  <string name="permission_manage_tor_label">Tor beheren</string>
-  <string name="permission_manage_tor_description">Deze applicatie toestaan om de Tor-dienst te bedienen</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox lijkt niet geïnstalleerd te zijn, Wil je daar hulp bij, of wil je gewoon de browser openen?</string>
-  <string name="install_apps_">Applicaties installeren?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Geen internetverbinding. Tor wordt te slapen gelegdâ?¦</string>
+    <string name="no_internet_connection_tor">Geen internetverbinding; Tor is op stand-byâ?¦</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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Je Tor publieke IP\'s:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Schakel deze applicatie uit in Android-&gt;Instellingen-&gt;Applicaties als je problemen ondervindt met Orbot:</string>
-  <string name="app_conflict">App-conflict</string>
-  <string name="pref_transproxy_refresh_title">Transproxy automatisch verversen</string>
-  <string name="pref_transproxy_refresh_summary">Transproxy-regels opnieuw toepassen wanneer de status van het netwerk verandert</string>
-  <string name="pref_transproxy_flush_title">Transproxy VERWIJDEREN DWINGEN</string>
-  <string name="pref_transproxy_flush_summary">Tik hier om alle transproxy-netwerkregels NU te spoelen</string>
-  <string name="transparent_proxy_rules_flushed_">Transparante proxy-regels gespoeld!</string>
-  <string name="you_do_not_have_root_access_enabled">Je hebt ROOT-toegang niet ingeschakeld</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Het kan nodig zijn Orbot te stoppen en opnieuw te starten opdat wijzigingen in de instellingen worden ingeschakeld.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridges bijgewerkt</string>
-  <string name="restart_orbot_to_use_this_bridge_">Herstart Orbot om de wijzigingen in te schakelen</string>
-  <string name="menu_qr">QR-codes</string>
-  <string name="bridge_mode">Bridge-modus</string>
-  <string name="get_bridges_email">E-mail</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Activeren</string>
-  <string name="apps_mode">Apps VPN Modus</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Je kan instellen dat alle applicaties op je toestel gebruik maken van het Tor-netwerk met de VPN-functie van Android.\n\n*WAARSCHUWING* Dit is een nieuwe, experimentele functie die in sommige gevallen niet automatisch kan starten, of zou kunnen stoppen. Het moet NIET worden gebruikt voor anonimiteit en ENKEL om firewalls en filters te omzeilen.</string>
-  <string name="send_email">E-mail versturen</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Je kan een bridge-adres verkrijgen door e-mail, het web of door een bridge-QR-code te scannen. Kies \'E-mail\' of \'Web\' hieronder om een bridge-adres aan te vragen.\n\nEenmaal je een adres hebt kopieer en plak je het in de \"Bridges\"-optie in de Orbot-instellingen, waarna je Orbot herstart.</string>
-  <string name="install_orweb">Orfox installeren</string>
-  <string name="standard_browser">Standaardbrowser</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LET OP: enkel standaard Tor-bridges werken op Intel x86/Atom-toestellen</string>
-  <string name="vpn_default_world">Wereld</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pa/strings.xml b/orbotservice/src/main/res/values-pa/strings.xml
index 2756370d..0fe1e9e1 100644
--- a/orbotservice/src/main/res/values-pa/strings.xml
+++ b/orbotservice/src/main/res/values-pa/strings.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_browse">�ਰਨਾ</string>
-  <string name="menu_settings">ਪਰਿਸਥਿਤ�</string>
-  <string name="menu_info">ਸਹਾ�ਤਾ</string>
-  <string name="button_help">ਸਹਾ�ਤਾ</string>
-  <string name="btn_cancel">ਰੱਦ �ਰ�</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">ਪਰਾ�ਸ� ਸ��ਿੰ�</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">�ਾਲ�</string>
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pl/strings.xml b/orbotservice/src/main/res/values-pl/strings.xml
index 960bd0af..81e18d9c 100644
--- a/orbotservice/src/main/res/values-pl/strings.xml
+++ b/orbotservice/src/main/res/values-pl/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot jest darmowÄ? aplikacjÄ? proxy która wspomaga inne aplikacje do używania internetu bezpiecznie. Orbot używa Tora do szyfrowania Twojego ruchu internetowego i nastÄ?pnie przepuszczania go przez wiele innych komputereów pororzucanych na caÅ?ym Å?wiecie. Tor jest darmowym oprogramowaniem i otwartÄ? sieciÄ? która pomaga Tobie w obronie przed monitoringiem sieci która zagrarza osobistej wolnoÅ?ci i prywatnoÅ?ci, poufnym biznesowym aktywnoÅ?ciom.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">wÅ?Ä?cz i wyÅ?Ä?cz Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startuje...</string>
+    <string name="status_starting_up">Orbot startuje...</string>
   <string name="status_activated">PodÅ?Ä?czony do sieci Tor</string>
   <string name="status_disabled">Orbot wyÅ?Ä?czony</string>
   <string name="status_shutting_down">TorService wyÅ?Ä?cza siÄ?</string>
   <string name="tor_process_starting">Uruchamianie klienta sieci Tor...</string>
   <string name="tor_process_complete">gotowe.</string>
-  <string name="tor_process_waiting">czekaj.</string>
-  <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! ProszÄ? skonfiguruj aplikacje aby używaÅ?y serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Start</string>
-  <string name="menu_browse">PrzeglÄ?daj</string>
-  <string name="menu_settings">Ustawienia</string>
-  <string name="menu_log">Logi</string>
-  <string name="menu_info">Pomoc</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">O programie</string>
-  <string name="menu_promo_apps">ZdobÄ?dź aplikacje</string>
-  <string name="main_layout_download">Pobieranie (prÄ?dkoÅ?Ä?/suma)</string>
-  <string name="main_layout_upload">WysyÅ?anie (prÄ?dkoÅ?Ä?/suma)</string>
-  <string name="button_help">Pomoc</string>
-  <string name="button_close">Zamknij</string>
-  <string name="button_about">O programie</string>
-  <string name="button_clear_log">CzyÅ?Ä? dziennik</string>
-  <string name="menu_verify">Sprawdź</string>
-  <string name="menu_exit">WyjÅ?cie</string>
-  <string name="menu_scan">Skanuj BridgeQR</string>
-  <string name="menu_share_bridge">Podziel siÄ? BridgeQR</string>
-  <string name="press_to_start">- wciÅ?nij na dÅ?użej, by uruchomiÄ? -</string>
-  <string name="pref_trans_proxy_group">Przekierowanie przezroczyste (Wymaga uprawnieÅ? administratora)</string>
-  <string name="pref_trans_proxy_title">Przekierowanie przezroczyste</string>
-  <string name="pref_trans_proxy_summary">Automatyczne toryfikowanie aplikacji</string>
-  <string name="pref_transparent_all_title">PrzepuÅ?Ä? wszystko przez Tora</string>
-  <string name="pref_transparent_all_summary">Przekierowanie ruchu wszystkich aplikacji przez Tora</string>
-  <string name="pref_transparent_port_fallback_title">Zapasowy Port Proxy</string>
-  <string name="pref_transparent_port_fallback_summary">UWAGA: Unika powszechnych portów (80, 443, etc). *UÅ»YWAÄ? TYLKO* gdy \'All\' lub tryb \'App\' nie dziaÅ?a.</string>
-  <string name="pref_transparent_port_title">Lista Portów</string>
-  <string name="pref_transparent_port_summary">Lista portów, które przechwytywaÄ?. *UÅ»YWAÄ? TYLKO* gdy \'All\' lub tryb \'App\' nie dziaÅ?a.</string>
-  <string name="pref_transparent_port_dialog">Wpisz porty do przechwytywania</string>
-  <string name="pref_has_root">Å»Ä?daj dostÄ?pu administratora</string>
-  <string name="pref_has_root_summary">Å»Ä?daj dostÄ?pu administratora dla przezroczystego przekierowania</string>
-  <string name="status_install_success">Binarki Tora pomyÅ?lnie zainstalowane!</string>
-  <string name="status_install_fail">Nie można zainstalowaÄ? plików binarnych Tora. Zajrzyj do dziennika i powiadom tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">BÅ?Ä?d Aplikacji</string>
-  <string name="wizard_title">Witamy w Orbocie</string>
-  <string name="wizard_btn_tell_me_more">O Orbocie</string>
-  <string name="btn_next">Dalej</string>
-  <string name="btn_back">wstecz</string>
-  <string name="btn_finish">Koniec</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Anuluj</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Niektóre szczegóÅ?y o Orbocie</string>
-  <string name="wizard_details_msg">Orbot jest otwartÄ? aplikacjÄ? zawierajÄ?cÄ? Tor, LibEvent i Polipo. Dostarcza lokalnego proxy HTTP (8118) i SOCKS proxy (9050) do sieci Tora. Orbot ma możliwoÅ?Ä?, na urzÄ?dzeniu uruchomionym z prawami administratora, wysyÅ?aÄ? caÅ?y ruch internetowy przez Tora.</string>
-  <string name="wizard_permissions_root">DostÄ?p zezwolony</string>
-  <string name="wizard_permissions_stock">Prawa dostepu Orbota</string>
-  <string name="wizard_premissions_msg_root">Doskonale! OdkryliÅ?my, że masz uprawnienia administratora wÅ?Ä?czone dla Orbota. BÄ?dziemy mÄ?drze korzystaÄ? z tej wÅ?adzy.</string>
-  <string name="wizard_permissions_msg_stock">Podczas gdy nie jest to wymagane, Orbot może staÄ? siÄ? znacznie potÄ?żniejszym narzÄ?dziem, gdy masz prawa administratora na swoim urzÄ?dzeniu. Użyj przycisku poniżej, by daÄ? Orbotowi duży uprawnienia.</string>
-  <string name="wizard_permissions_no_root">JeÅ?li nie masz uprawnieÅ? administratora lub nie masz pojÄ?cia, o czym mówimy, używaj aplikacji skonfigurowanych do pracy z Orbotem.</string>
-  <string name="wizard_permissions_consent">Rozumiem i chcÄ? kontynuowaÄ? bez uprawnieÅ? administratora</string>
-  <string name="wizard_permission_enable_root">Nadaj uprawnienia administratora Orbotowi</string>
-  <string name="wizard_configure">Skonfiguruj ToryfikacjÄ?</string>
-  <string name="wizard_configure_msg">Orbot daje Ci możliwoÅ?Ä? przekierowania caÅ?ego ruchu aplikacji przez Tora albo wybrania aplikacji pojedynczo.</string>
-  <string name="wizard_configure_all">Przekierowuj wszystkie aplikacje przez Tora</string>
-  <string name="wizard_configure_select_apps">Wybierz poszczególne aplikacje dla Tora</string>
-  <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string>
-  <string name="wizard_tips_msg">ZachÄ?camy do pobierania i używania aplikacji, które wiedzÄ?, jak Å?Ä?czyÄ? siÄ? bezpoÅ?rednio z Orbotem. Kliknij na poniższe przyciski, by zainstalowaÄ?.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Bezpieczny komunikator pod Androida</string>
-  <string name="wizard_tips_proxy">Ustawienia Proxy - Dowiedz siÄ?, jak konfigurowaÄ? aplikacje do wspóÅ?pracy z Orbotem</string>
-  <string name="wizard_tips_duckgo">Aplikacja Duckduckgo Search Engine</string>
-  <string name="wizard_tips_twitter">Twitter obsÅ?uguje proxy http \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Napisz artukuÅ?, historiÄ?, a bezpieczeÅ?stwo pozostaw Torowi.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ustawienia Proxy</string>
-  <string name="wizard_proxy_help_msg">JeÅ?li aplikacja na Androida, której używasz obsÅ?uguje proxy HTTP lub SOCKS proxy, to możesz skonfigurowaÄ? jÄ? do Å?Ä?czenia siÄ? z Orbotem i używania Tora. Ustawienie hosta to 127.0.0.1 lub \"localhost\". Dla HTTP, numer portu to 8118. Dla SOCKS proxy to 9050. Powinno siÄ? używaÄ? SOCKS4A lub SOCKS5, jeÅ?li to możliwe.\n \n\n\n Możesz dowiedzieÄ? siÄ? wiÄ?cej o przekierowaniu ruchu na Androidzie z FAQ pod adresem: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot jest gotowy!</string>
-  <string name="wizard_final_msg">Miliony ludzi na caÅ?ym Å?wiecie używajÄ? Tora z różnych powodów.\n\nDziennikarze i blogerzy, dziaÅ?acze na rzecz praw czÅ?owieka, stróże prawa, żoÅ?nierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string>
-  <string name="wizard_exit_at_first_screen_toast">ProszÄ? skonfiguruj Orbot zanim zaczniesz go uzywaÄ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">PomyÅ?lnie poÅ?Ä?czyÅ?eÅ? siÄ? do sieci Tor - ale to nie oznacza, że Twoje urzÄ?dzenie jest bezpieczne. Możesz użyÄ? przycisku \'PrzeglÄ?darka\' aby sprawdziÄ? swoje poÅ?Ä?czenie. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyÅ?lij nam maila na help@xxxxxxxxxxxxxxxxxxxx aby dowiedzieÄ? siÄ? wiÄ?cej.</string>
-  <string name="tor_check">To otworzy TwojÄ? domyÅ?lnÄ? przeglÄ?darkÄ? na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poÅ?Ä?czenie z Torem.</string>
-  <string name="pref_hs_group">UsÅ?ugi ukryte</string>
-  <string name="pref_general_group">Ogólne</string>
-  <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string>
-  <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i Å?Ä?cz siÄ? z Torem, gdy Twoje urzÄ?dzenie z Androidem siÄ? uruchomi</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot daje Tora Androidowi! Tor pomaga broniÄ? siÄ? przed podsÅ?uchem sieci znanym jako analiza ruchu, który zagraża wolnoÅ?ci osobistej i prywatnoÅ?ci, poufnym dziaÅ?aniom biznesowym i relacjami.\n\nTen kreator pomoże Ci skonfigurowaÄ? Orbota i Tora na Twoim urzÄ?dzeniu.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ostrzeżenie</string>
-  <string name="wizard_warning_msg">Sama instalacja Orbota nie sprawi, że Twój mobilny ruch bÄ?dzie caÅ?kiem anonimowy.\n\nMusisz wykonaÄ? poprawnÄ? konfiguracjÄ? Orbota, Twojego urzÄ?dzenia i innych aplikacji, aby skutecznie używaÄ? Tora.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Uprawnienia</string>
-  <string name="wizard_permissions_root_msg1">Możesz opcjonalnie przekazaÄ? darowiznÄ? Orbotowi i otrzymaÄ? dostÄ?p \'Superużytkownika\' aby wÅ?Ä?czyÄ? zaawansowane funkcje, jak np. Transparentne Proxy.</string>
-  <string name="wizard_permissions_root_msg2">JeÅ?li nie chcesz tego robiÄ?, upewnij siÄ? by używaÄ? aplikacji stworzonych do pracy z Orbotem</string>
-  <string name="wizard_permissions_no_root_msg">WyglÄ?da na to, że Twoje urzÄ?dzenie nie ma praw administratora, lub nie posiada opcji \'Super użytkownika\'.\n\nZamiast tego prosimy o spróbowanie opcji \'Aplikacje\' na gÅ?ównym ekranie.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-WÅ?Ä?czone Aplikacje</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Bezpieczny komunikator z szyfrowaniem Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: PrzeglÄ?darka, która dziaÅ?a przez Tora</string>
-  <string name="wizard_tips_play">Znajdź wszystkie aplikacje Guardian Project na Google Play</string>
-  <string name="wizard_tips_fdroid">Zobacz wszystkie aplikacje Guardian Project na F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Zobacz wszystkie aplikacje Guardian Project na https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparentne Proxy</string>
-  <string name="wizard_transproxy_msg">To pozwala Twojej aplikacji na automatyczne poÅ?Ä?czenie przez SieÄ? Tor bez żadnej konfiguracji.</string>
-  <string name="wizard_transproxy_hint">(Sprawdź tutaj, jeÅ?li nie masz pojÄ?cia o czym mówimy)</string>
-  <string name="wizard_transproxy_none">Brak</string>
-  <string name="pref_transparent_tethering_title">PrzywiÄ?zywanie Tora</string>
-  <string name="pref_transparent_tethering_summary">WÅ?Ä?cz Transparentne Proxy Tora dla Wi-Fi i USB (wymaga restartu)</string>
-  <string name="button_grant_superuser">Å»Ä?danie dostÄ?pu Superużytkownika</string>
-  <string name="pref_select_apps">Wybierz aplikacje</string>
-  <string name="pref_select_apps_summary">Wybierz aplikacje do przejÅ?cia przez Tor</string>
-  <string name="pref_node_configuration">Konfiguracja wÄ?zÅ?a</string>
-  <string name="pref_node_configuration_summary">SÄ? to zaawansowane ustawienia, które mogÄ? zmniejszyÄ? TwojÄ? anonimowoÅ?Ä?</string>
-  <string name="pref_entrance_node">WÄ?zÅ?y wejÅ?ciowe</string>
-  <string name="pref_entrance_node_summary">Odciski palców, nicki, paÅ?stwa i adresy na pierwszy raz</string>
-  <string name="pref_entrance_node_dialog">Wpisz WÄ?zÅ?y WejÅ?ciowe</string>
-  <string name="pref_allow_background_starts_title">Pozwól na start z tle</string>
-  <string name="pref_allow_background_starts_summary">Pozwól każdej aplikacji powiedzieÄ?, aby Orbot uruchomiÅ? Tor i inne zwiÄ?zane z nim usÅ?ugi</string>
-  <string name="button_proxy_all">Przepuszczaj wszystko przez proxy</string>
-  <string name="button_proxy_none">Nie przepuszczaj niczego przez proxy</string>
-  <string name="button_invert_selection">OdwróÄ? zaznaczone</string>
-  <string name="pref_proxy_title">WychodzÄ?cy serwer sieciowy proxy</string>
-  <string name="pref_proxy_type_title">WychodzÄ?ce Typy Proxy</string>
-  <string name="pref_proxy_type_summary">ProtokóÅ? używany dla serwera proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Wpis Typ Proxy</string>
-  <string name="pref_proxy_host_title">WychodzÄ?cy Proxy Host</string>
-  <string name="pref_proxy_host_summary">Nazwa hosta serwera proxy</string>
-  <string name="pref_proxy_host_dialog">Wpisz Hosta Proxy</string>
-  <string name="pref_proxy_port_title">WychodzÄ?ce Porty Proxy</string>
-  <string name="pref_proxy_port_summary">Port serwera Proxy</string>
-  <string name="pref_proxy_port_dialog">Wpisz port Proxy</string>
-  <string name="pref_proxy_username_title">Nazwa użytkownika WychodzÄ?cego Proxy</string>
-  <string name="pref_proxy_username_summary">Nazwa użytkownika proxy (opcjonalna)</string>
-  <string name="pref_proxy_username_dialog">Wpisz nazwÄ? użytkownika Proxy</string>
-  <string name="pref_proxy_password_title">HasÅ?o WychodzÄ?cego Proxy</string>
-  <string name="pref_proxy_password_summary">HasÅ?o Proxy (opcjonalne)</string>
-  <string name="pref_proxy_password_dialog">Wpisz hasÅ?o Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Ustawianie w peÅ?ni transparentnego proxy...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ustawianie bazujÄ?cego na aplikacji transparentnego proxy</string>
-  <string name="transparent_proxying_enabled">Transparentne proxy WÅ?Ä?CZONE</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy podÅ?Ä?czone do modemu!</string>
-  <string name="warning_error_starting_transparent_proxying_">OSTRZEÅ»ENIE: bÅ?Ä?d w uruchamianiu transparentnego proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy dziaÅ?a czysto</string>
-  <string name="couldn_t_start_tor_process_">Nie można byÅ?o zainicjowaÄ? procesu Tora:</string>
-  <string name="privoxy_is_running_on_port_">Polipo dziaÅ?a na porcie:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ustawianie bazujÄ?cego na porcie transparentnego proxy</string>
-  <string name="bridge_error">BÅ?Ä?d mostka</string>
-  <string name="bridge_requires_ip">Aby użyÄ? funkcji mostka, musisz wpisaÄ? przynajmniej jeden adres IP mostka.</string>
-  <string name="send_email_for_bridges">WyÅ?lij e-mail do bridges@xxxxxxxxxxxxxx piszÄ?c w treÅ?ci \"get bridges\" z konta gmail.</string>
-  <string name="error">BÅ?Ä?d</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Twoje ustawienia dostÄ?pnych adresów spowodowaÅ?y wyjÄ?tek!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Nie można byÅ?o zainicjowaÄ? procesu Tora:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Twoje ustawienia dostÄ?pnych adresów spowodowaÅ?y wyjÄ?tek!</string>
   <string name="your_relay_settings_caused_an_exception_">Ustawienia Twojego przekaźnika spowodowaÅ?y wyjÄ?tek!</string>
-  <string name="exit_nodes">WÄ?zÅ?y WyjÅ?ciowe</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Odciski palców, nicki, paÅ?stwa i adresy na ostatni skok</string>
-  <string name="enter_exit_nodes">Wpisz wÄ?zÅ?y wyjÅ?ciowe.</string>
-  <string name="exclude_nodes">Wyklucz wÄ?zÅ?y</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Odciski palców, nicki, paÅ?stwa i adresy do wykluczenia.</string>
-  <string name="enter_exclude_nodes">Wpisz wykluczone wÄ?zÅ?y.</string>
-  <string name="strict_nodes">Å?cisÅ?e wÄ?zÅ?y</string>
-  <string name="use_only_these_specified_nodes">Użyj *tylko* tych okreÅ?lonych wÄ?zÅ?ów</string>
-  <string name="bridges">Mostki</string>
-  <string name="use_bridges">Użyj mostków</string>
-  <string name="bridges_obfuscated">UUtajnione Mostki</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Umożliw alternatywne wejÅ?ciowe wÄ?zÅ?y do Sieci Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">WÅ?Ä?cz, jeÅ?li skonfigurowane mostki sÄ? ukrytymi mostkami</string>
-  <string name="ip_address_and_port_of_bridges">Adres IP i port mostków</string>
-  <string name="enter_bridge_addresses">Wpisz adresy mostków</string>
-  <string name="relays">Przekaźniki</string>
-  <string name="relaying">Przekazywanie</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Pozwól swojemu urzÄ?dzeniu zostaÄ? bezwyjÅ?ciowym przekaźnikiem</string>
-  <string name="relay_port">Port Przekaźników</string>
-  <string name="listening_port_for_your_tor_relay">NasÅ?uchiwanie portu Twojego przekaźnika</string>
-  <string name="enter_or_port">Wpisz port OR</string>
-  <string name="relay_nickname">Nick przekaźnika</string>
-  <string name="the_nickname_for_your_tor_relay">Nick Twojego przekaźnika Tora</string>
-  <string name="enter_a_custom_relay_nickname">Wpisz standardowÄ? nazwÄ? przekaźnika</string>
-  <string name="reachable_addresses">OsiÄ?galne adresy:</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">WÅ?Ä?cz jako klienta za firewallem z restrykcyjnÄ? politykÄ?</string>
-  <string name="reachable_ports">OsiÄ?galne porty</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Porty dostÄ?pne za ograniczajÄ?cym firewallem</string>
-  <string name="enter_ports">Wpisz porty</string>
-  <string name="enable_hidden_services">WÅ?Ä?cz Ukryte Serwisy</string>
-  <string name="run_servers_accessible_via_the_tor_network">wÅ?Ä?cz serwisy dostÄ?pne przez SieÄ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">wpisz porty localhosta dla ukrytych serwisów</string>
-  <string name="hidden_service_ports">Porty Ukrytych Serwisów</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">adresowana nazwa dla Twojego ukrytego serwisu (generowana automatycznie)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">wÅ?Ä?cz zdebugowany log do wydajnoÅ?ci (musisz używaÄ? adb lub aLogCat, by go zobaczyÄ?)</string>
-  <string name="project_home">Strony domowe projektu:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Licencja Tora</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Oprogramowanie 3rd-Party</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Aplikacja chce otworzyÄ? port ukrytego serwera %S do Sieci Tor. Jest to bezpieczne, jeÅ?li ufasz aplikacji.</string>
-  <string name="found_existing_tor_process">znaleziono istniejÄ?cy proces Tora...</string>
+    <string name="found_existing_tor_process">znaleziono istniejÄ?cy proces Tora...</string>
   <string name="something_bad_happened">CoÅ? nie poszÅ?o nie tak. Sprawdź logi</string>
-  <string name="hidden_service_on">ukryty serwis:</string>
-  <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
+    <string name="unable_to_read_hidden_service_name">uniemożliw czytanie nazw ukrytych serwisów</string>
   <string name="unable_to_start_tor">Nie można wystartowaÄ? aplikacji Tor:</string>
-  <string name="unable_to_reset_tor">Zrestartuj swoje urzÄ?dzenie, nie można zrestartowaÄ? Tora!</string>
-  <string name="pref_use_sys_iptables_title">Użyj domyÅ?lnie Iptables</string>
-  <string name="pref_use_sys_iptables_summary">użyj wbudowanych plików binarnych iptables zamiast tych w pakiecie z Orbotem</string>
-  <string name="error_installing_binares">Pliki binarne Tora nie zostaÅ?y zainstalowane lub uaktualnione.</string>
-  <string name="pref_use_persistent_notifications">Zawsze trzymaj ikonÄ? w pasku powiadomieÅ? gdy Orbot jest poÅ?Ä?czony</string>
-  <string name="pref_use_persistent_notifications_title">Powiadomienia zawsze aktywne</string>
-  <string name="pref_use_expanded_notifications">Pokaż rozszerzone powiadomienie z krajem Tor exit node oraz jego IP</string>
-  <string name="pref_use_expanded_notifications_title">Rozszerzone Powiadomienia</string>
-  <string name="notification_using_bridges">Mostki wÅ?Ä?czone!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">JÄ?zyk</string>
-  <string name="set_locale_summary">Wybierz ustawienia regionalne i jÄ?zyk dla Orbota</string>
-  <string name="wizard_locale_title">Wybierz jÄ?zyk</string>
-  <string name="wizard_locale_msg">Zostaw domyÅ?lny albo zmieÅ? jÄ?zyk</string>
-  <string name="powered_by">napÄ?dzane oprogramowaniem Projektu Tor</string>
-  <string name="btn_save_settings">Zapisz ustawienia</string>
-  <string name="no_internet_connection_tor">Brak poÅ?Ä?czenia internetowego; Tor jest w trybie oczekiwania...</string>
-  <string name="bandwidth_">PrzepustowoÅ?Ä?:</string>
-  <string name="down">pobieranie</string>
-  <string name="up">wysyÅ?anie</string>
-  <string name="pref_disable_network_title">Brak Auto-UÅ?pienia Sieci</string>
-  <string name="pref_disable_network_summary">Ustaw Tor\'a w tryb uÅ?pienia kiedy poÅ?Ä?czenie internetowe bÄ?dzie niedostÄ?pne</string>
-  <string name="newnym">Nowa tożsamoÅ?Ä? Tor\'a zostaÅ?a zmieniona!</string>
-  <string name="menu_verify_browser">PrzeglÄ?darka</string>
-  <string name="menu_use_chatsecure">Użyj ChatSecure</string>
-  <string name="permission_manage_tor_label">Administruj Tor\'em</string>
-  <string name="permission_manage_tor_description">Pozwól tej aplikacji kontrolowaÄ? serwis Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">WyglÄ?da na to, że nie masz zainstalowanej Orfoxa. Chcesz abyÅ?my Ci pomogli, czy chcesz abyÅ?my otworzyli to w przeglÄ?darce?</string>
-  <string name="install_apps_">ZainstalowaÄ? aplikacje?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Brak poÅ?Ä?czenia internetowego. Tor bÄ?dzie w trybie snu...</string>
+    <string name="no_internet_connection_tor">Brak poÅ?Ä?czenia internetowego; Tor jest w trybie oczekiwania...</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="wizard_tips_martus">Mobile Martus - Benetech Dokumentacja Aplikacji Praw CzÅ?owieka</string>
-  <string name="your_tor_public_ips_">Twoje publiczne Tor IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">ProszÄ? wyÅ?Ä?cz tÄ? aplikacjÄ? w Android-&gt;Ustawienia-&gt;Aplikacje jesli masz problemy z Orbot:</string>
-  <string name="app_conflict">Konflikt aplikacji</string>
-  <string name="pref_transproxy_refresh_title">Transproxy Auto-OdÅ?wież</string>
-  <string name="pref_transproxy_refresh_summary">Zaztosuj ustawienia Transproxy kiedy stan sieci zmieni siÄ?</string>
-  <string name="pref_transproxy_flush_title">Transproxy WYMUÅ? USUNIÄ?CIE</string>
-  <string name="pref_transproxy_flush_summary">Dotknij tutaj, aby wyczyÅ?ciÄ? wszystkie zasady sieciowe transproxy TERAZ</string>
-  <string name="transparent_proxy_rules_flushed_">Ustawienia Transproxy zostaÅ?y wyczyszczone!</string>
-  <string name="you_do_not_have_root_access_enabled">Nie masz praw użytkownika root.</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Możesz zatrzymaÄ? i uruchomiÄ? ponownie Orbota, aby zmiany ustawieÅ? weszÅ?y w życie.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Zaktualizowane Bridges</string>
-  <string name="restart_orbot_to_use_this_bridge_">ProszÄ? zrestartowaÄ? Orbot, aby zmiany mogÅ?y wejÅ?Ä? w życie</string>
-  <string name="menu_qr">Kody QR</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">JeÅ?li Twoja sieÄ? telefoniczna aktywnie blokuje Tora, to możesz używaÄ? Bridge., aby poÅ?Ä?czyÄ? siÄ? z sieciÄ?. WYBIERZ jeden typ bridge powyżej, aby wÅ?Ä?czyÄ? bridges.</string>
-  <string name="bridge_mode">Tryb Bridge</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Aktywuj</string>
-  <string name="apps_mode">Tryb VPN Aplikacji</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Możesz wÅ?Ä?czyÄ? opcjÄ? dla wszystkich aplikacji, tak, aby ich ruch internetowy byÅ? przepuszczany przez sieÄ? Tor używajÄ?c do tego opcji VPN w Androidzie.\n\n*UWAGA* Jest to nowa, eksperymentalana opcja i w niektórych przypadkach może ona nie uruchomiÄ? siÄ? automatycznie, lub może siÄ? zatrzymaÄ?. Opcja ta NIE POWINNA byÄ? używana w celach uzyskania anonimowoÅ?ci, a TYLKO wyÅ?Ä?cznie w celu ominiÄ?cia firewalli i filtrów.</string>
-  <string name="send_email">WyÅ?lij Email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Możesz uzyskaÄ? adres Bridge poprzez email, internet, lub poprzez zeskanowanie kodu QR. Wybierz \'Email\' lub \'Internet\' poniżej, aby poprosiÄ? o adres bridge\'a.\n\nJak już bÄ?dziesz mieÄ? ten adres to skopiuj i wklej go do \"Bridges\" we wÅ?aÅ?ciwoÅ?ciach Orbota a nastÄ?pnie go zrestartuj.</string>
-  <string name="install_orweb">Zainstaluj Orfox</string>
-  <string name="standard_browser">Standardowa przeglÄ?darka</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">UWAGA: Tylko standardowe bridges dziaÅ?ajÄ? na urzÄ?dzeniach z Intel X86/ATOM.</string>
-  <string name="vpn_default_world">Å?wiat</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ps/strings.xml b/orbotservice/src/main/res/values-ps/strings.xml
index 844f834c..49c8dbc4 100644
--- a/orbotservice/src/main/res/values-ps/strings.xml
+++ b/orbotservice/src/main/res/values-ps/strings.xml
@@ -8,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pt-rBR/strings.xml b/orbotservice/src/main/res/values-pt-rBR/strings.xml
index 47bd4184..290272fb 100644
--- a/orbotservice/src/main/res/values-pt-rBR/strings.xml
+++ b/orbotservice/src/main/res/values-pt-rBR/strings.xml
@@ -2,284 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot é um aplicativo de proxy livre que capacita outros aplicativos a usar a internet com mais segurança. Orbot usa o Tor para criptografar seu tráfego na internet e então o esconde \"saltando\" entre uma série de computadores ao redor do mundo. Tor é um software livre e de rede aberta que ajuda você a se defender de certas formas de vigilância que ameaçam privacidade e liberdade pessoais, atividades e relações comerciais confidenciais e segurança estatal conhecida como análise de tráfego.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e parar o Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciando...</string>
+    <string name="status_starting_up">Orbot está iniciando...</string>
   <string name="status_activated">Conectado à rede Tor</string>
   <string name="status_disabled">Orbot está desativado</string>
   <string name="status_shutting_down">TorService está desligando</string>
   <string name="tor_process_starting">Iniciando cliente Tor...</string>
   <string name="tor_process_complete">completo.</string>
-  <string name="tor_process_waiting">esperando.</string>
-  <string name="not_anonymous_yet">AVISO: Seu tráfego não é anônimo ainda! Por favor, configure suas aplicações para usar proxy HTTP 127.0.0.1:8118 ou proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Início</string>
-  <string name="menu_browse">Procurar</string>
-  <string name="menu_settings">Configurações</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Parar</string>
-  <string name="menu_about">Sobre</string>
-  <string name="menu_promo_apps">Obter aplicativos...</string>
-  <string name="main_layout_download">Download</string>
-  <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Fechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar Log</string>
-  <string name="menu_verify">Checar</string>
-  <string name="menu_exit">Sair</string>
-  <string name="menu_scan">Escanear BridgeQR</string>
-  <string name="menu_share_bridge">Compartilhar BridgeQR</string>
-  <string name="press_to_start">- clique longo para iniciar -</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requer Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
-  <string name="pref_trans_proxy_summary">Automaticamente Torificar Apps</string>
-  <string name="pref_transparent_all_title">Tor Tudo</string>
-  <string name="pref_transparent_all_summary">Tráfego proxy para todos apps através do Tor</string>
-  <string name="pref_transparent_port_fallback_title">Porta do Proxy Reserva</string>
-  <string name="pref_transparent_port_fallback_summary">AVISO: Evite as portas comuns (80,443, etc). *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou.</string>
-  <string name="pref_transparent_port_title">Lista de Portas</string>
-  <string name="pref_transparent_port_summary">Lista de portas para proxy. *USE SOMENTE* se o modo \'Todos\' ou \'App\' não funcionou</string>
-  <string name="pref_transparent_port_dialog">Insira as portas para proxy</string>
-  <string name="pref_has_root">Requer Acesso Root</string>
-  <string name="pref_has_root_summary">Requer acesso root para proxy transparente</string>
-  <string name="status_install_success">Binário do Tor instalados com sucesso!</string>
-  <string name="status_install_fail">Os arquivos binários do Tor estão inaptos à serem instalados. Por favor, cheque o log e notifique tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erro de Aplicação</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Sobre Orbot</string>
-  <string name="btn_next">Próximo</string>
-  <string name="btn_back">Voltar</string>
-  <string name="btn_finish">Terminar</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancelar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Alguns detalhes do Orbot</string>
-  <string name="wizard_details_msg">Orbot é uma aplicação de código aberto que contém Tor, libEvent e Polipo. Ela provê um proxy HTTP local (8118) e um proxy SOCKS (9050) dentro da rede Tor. Orbot também tem a a habilidade, num dispositivo de com acesso root, de enviar todo o tráfego de internet através do Tor.</string>
-  <string name="wizard_permissions_root">Permissão Concedida</string>
-  <string name="wizard_permissions_stock">Permissões do Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelente! Detectamos que você habilitou permissões de root para Orbot. Nós usaremos este poder com sabedoria.</string>
-  <string name="wizard_permissions_msg_stock"> Enquanto não é requerido, o Orbot pode se tornar uma ferramenta mais poderosa se seu dispositivo tivesse acesso root. Use o botão abaixo para conceder superpoderes ao Orbot! </string>
-  <string name="wizard_permissions_no_root">Se você não tem acesso root ou não tem idéia sobre o que estamos falando, só tenha a certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_consent">Eu entendo e gostaria de continuar sem o Superusuário</string>
-  <string name="wizard_permission_enable_root">Conceder acesso Root ao Orbot</string>
-  <string name="wizard_configure">Configurar Torificação</string>
-  <string name="wizard_configure_msg">Orbot dá a você a opção de rotear todo o tráfego de aplicação através do Tor OU para escolher suas aplicações individualmente.</string>
-  <string name="wizard_configure_all">Usar Proxy para Todas Apps Através do Tor</string>
-  <string name="wizard_configure_select_apps">Selecionar Apps Individuais para o Tor</string>
-  <string name="wizard_tips_tricks">Apps habilitadas para Orbot</string>
-  <string name="wizard_tips_msg">As apps abaixo foram desenvolvidas para trabalhar com Orbot. Clique em cada botão para instalar agora, ou você pode encontrá-las posteriormente no Android Market.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - cliente de mensagem instantânea segura para Android</string>
-  <string name="wizard_tips_proxy">Configurações de Proxy - Aprenda como configurar apps para trabalhar com Orbot</string>
-  <string name="wizard_tips_duckgo">Ferramenta de Busca DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Define o proxy do Twitter para \"localhost\" e a porta 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Faça uma história e deixe-a para o tor por segurança!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Configurações de Proxy</string>
-  <string name="wizard_proxy_help_msg">Se a app Android que você está usando puder suportar o uso de proxy HTTP ou SOCKS, então você pode configurar para conectar ao Orbot e usar o Tor. As configurações de host são 127.0.0.1 ou \"localhost\". Para HTTP, a porta configurada é 8118. Para SOCKS, o proxy é 9050. Você deve usar SOCKS4A ou SOCKS5 se possível. Você pode aprender mais sobre proxy no Android através do FAQ em: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot está pronto!</string>
-  <string name="wizard_final_msg">Centenas de milhares de pessoas ao redor do mundo usam o Tor por uma enorme variedade de razões. Jornalistas e bloggers, defensores dos direitos humanos, oficiais da lei, soldados, corporações, cidadãos em regimes repressivos, e somente cidadãos comuns... e agora você está pronto para usar, também! </string>
-  <string name="wizard_exit_at_first_screen_toast">Por favor, configure o Orbot antes de começar a usá-lo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Você se conectou à rede Tor com sucesso - mas isto N�O significa que seu dispositivo é seguro. Você pode usar a opção \'Checar\' no menu para testar seu navegador. Visite-nos em https://guardianproject.info/apps/orbot ou envie um e-mail para help@xxxxxxxxxxxxxxxxxxxx para saber mais.</string>
-  <string name="tor_check">Isto irá abrir seu navegador web em https://check.torproject.org com o intuito de ver se o Orbot está provavelmente configurado e você está conectado ao Tor.</string>
-  <string name="pref_hs_group">Serviços Ocultos</string>
-  <string name="pref_general_group">Geral</string>
-  <string name="pref_start_boot_title">Iniciar Orbot no Boot</string>
-  <string name="pref_start_boot_summary">Automaticamente iniciar o Orbot e conectar o Tor quando seu Android bootar.</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot trouxe Tor para Android!! Tor ajuda você a se defender contra filtro de conteúdo, análises de tráfego e vigilância de rede que ameaçam sua privacidade, informação confidencial e relacionamentos pessoais. Este assistente irá ajudá-lo a configurar o Orbot e Tor no seu dispositivo.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Aviso</string>
-  <string name="wizard_warning_msg">Simplesmente instalando o Orbot não irá automaticamente anonimizar seu tráfego móvel. Você deve configurar apropriadamente o Orbot, seu dispositivo e outras apps para usar o Tor com sucesso.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissões</string>
-  <string name="wizard_permissions_root_msg1">Você pode opcionalmente garantir ao Orbot acesso de \'Superusuário\' para habilitar recursos avançados, como um proxy transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se você não quiser fazer isto, tenha certeza de usar apps feitas para trabalhar com o Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Seu dispositivo não parece ser roteado ou prover um acesso \'Superusuário\'. De maneira a você se beneficiar do Tor, você precisará usar apps criadas para trabalhar com o Orbot, ou que suportem configurações de proxy HTTP ou SOCKS. </string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Apps Orbot Habilitadas</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: app de chat seguro com criptografia Off-the-Record</string>
-  <string name="wizard_tips_orweb">Orfox: navegador de privacidade aprimorada que funciona através do Tor</string>
-  <string name="wizard_tips_play">Encontre todos os aplicativos da Guardian Project no Google Play</string>
-  <string name="wizard_tips_fdroid">Encontre todos os aplicativos da Guardian Project no F-Droid </string>
-  <string name="wizard_tips_fdroid_org">Encontre todos os aplicativos da Guardian Project no https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_msg">Isto permite à suas apps automaticamente rodarem através da rede Tor sem nenhuma configuração.</string>
-  <string name="wizard_transproxy_hint">(Selecione esta caixa se você não souber do que estamos falando)</string>
-  <string name="wizard_transproxy_none">Nenhum</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Habilitar Proxy Transparente para Tor Dispositivos de Toque Wi-Fi e Usb (requer reinicialização)</string>
-  <string name="button_grant_superuser">Acesso Superusuário Requerido</string>
-  <string name="pref_select_apps">Selecionar Apps</string>
-  <string name="pref_select_apps_summary">Escolha as Apps para Rotearem Através do Tor</string>
-  <string name="pref_node_configuration">Configuração de Nó</string>
-  <string name="pref_node_configuration_summary">Aqui estão as configurações avançadas que podem reduzir seu anonimato.</string>
-  <string name="pref_entrance_node">Nós de Entrada</string>
-  <string name="pref_entrance_node_summary">Impressões digitais, apelidos, países e endereços para a primeira etapa</string>
-  <string name="pref_entrance_node_dialog">Insira os Nós de Entrada</string>
-  <string name="pref_allow_background_starts_title">Permitir estrelas em segundo plano</string>
-  <string name="button_proxy_all">Todo o Proxy</string>
-  <string name="button_proxy_none">Nenhum Proxy</string>
-  <string name="button_invert_selection">Inverter Sele</string>
-  <string name="pref_proxy_title">Proxy de saída da rede (Opcional)</string>
-  <string name="pref_proxy_type_title">Tipo de Proxy</string>
-  <string name="pref_proxy_type_summary">Protocolo para usar no servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Insira o Tipo de Proxy</string>
-  <string name="pref_proxy_host_title">Proxy Host</string>
-  <string name="pref_proxy_host_summary">Endereço do servidor Proxy</string>
-  <string name="pref_proxy_host_dialog">Insira o Host do Proxy</string>
-  <string name="pref_proxy_port_title">Porta do Proxy</string>
-  <string name="pref_proxy_port_summary">Porta do servidor Proxy</string>
-  <string name="pref_proxy_port_dialog">Insira a porta do Proxy</string>
-  <string name="pref_proxy_username_title">Nome de usuário do Proxy de saída</string>
-  <string name="pref_proxy_username_summary">Nome de usuário do Proxy (Opcional)</string>
-  <string name="pref_proxy_username_dialog">Digite o nome de usuário do Proxy</string>
-  <string name="pref_proxy_password_title">Senha do Proxy de saída</string>
-  <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
-  <string name="pref_proxy_password_dialog">Digite a senha do Proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Configurando proxy com total transparência...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurando apps baseadas em transparência de proxy...</string>
-  <string name="transparent_proxying_enabled">Proxy Transparente HABILITADO</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy habilitado para Toque!</string>
-  <string name="warning_error_starting_transparent_proxying_">AVISO: erro ao iniciar o proxy transparente!</string>
-  <string name="transproxy_rules_cleared">Regras TransProxy limpas</string>
-  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo está rodando na porta:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurando proxy transparente baseado em porta...</string>
-  <string name="bridge_error">Erro na Ponte</string>
-  <string name="bridge_requires_ip">Como condição para usar o recurso de ponte, você deve inserir pelo menos um endereço IP de ponte.</string>
-  <string name="send_email_for_bridges">Envie um email para bridges@xxxxxxxxxxxxxx com a linha \"get bridges\" sozinha no corpo do e-mail, a partir de uma conta do gmail</string>
-  <string name="error">Erro</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Suas configurações de Endereços Acessíveis causou uma exceção!</string>
   <string name="your_relay_settings_caused_an_exception_">Suas configurações de retransmissão causaram uma exceção!</string>
-  <string name="exit_nodes">Nós de Saída</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Impressões digitais, apelidos, países e endereços para a última etapa.</string>
-  <string name="enter_exit_nodes">Insira os Nós de Saída</string>
-  <string name="exclude_nodes">Nós Excluídos</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Impressões digitais, apelidos, países e endereços para excluir</string>
-  <string name="enter_exclude_nodes">Insira Nós Excluídos</string>
-  <string name="strict_nodes">Nós Estritos</string>
-  <string name="use_only_these_specified_nodes">Use *somente* estes nós específicos</string>
-  <string name="bridges">Pontes</string>
-  <string name="use_bridges">Usar pontes</string>
-  <string name="bridges_obfuscated">Pontes Ofuscadas</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Habilitar nós de entrada alternativos dentro da rede Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Habilitar se pontes configuradas forem pontes ofuscadas</string>
-  <string name="ip_address_and_port_of_bridges">Endereço IP e porta das pontes</string>
-  <string name="enter_bridge_addresses">Insira os Endereços das Pontes</string>
-  <string name="relays">Retransmissores</string>
-  <string name="relaying">Retransmitindo</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Habilitar seu dispositivo para não ser um retransmissor de saída</string>
-  <string name="relay_port">Porta Retransmissora</string>
-  <string name="listening_port_for_your_tor_relay">Ouvindo porta do seu retransmissor Tor</string>
-  <string name="enter_or_port">Insira porta OR</string>
-  <string name="relay_nickname">Apelido do Retransmissor</string>
-  <string name="the_nickname_for_your_tor_relay">O apelido para seu retransmissor Tor</string>
-  <string name="enter_a_custom_relay_nickname">Insira um apelido de retransmissor customizado</string>
-  <string name="reachable_addresses">Endereços Atingíveis</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Rodar como um cliente atrás de um firewall com políticas restritivas.</string>
-  <string name="reachable_ports">Portas Atingíveis</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Portas atingíveis atrás de um firewall restritivo</string>
-  <string name="enter_ports">Insira as portas</string>
-  <string name="enable_hidden_services">Habilitar Serviços Ocultos</string>
-  <string name="run_servers_accessible_via_the_tor_network">rodar servidores acessíveis via rede Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">insira as portas local para serviços ocultos</string>
-  <string name="hidden_service_ports">Portas de Serviço Oculto</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">o nome enderessável para seu serviço oculto (gerado automaticamente)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">habilitar debug log para saída (deve usar adb ou aLogCat para ver)</string>
-  <string name="project_home">Home(s) do Projeto: </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Licença Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Software de Terceiros</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Uma app quer abrir a porta %S oculta do servidor para a rede Tor. Isto é seguro se você confia na app.</string>
-  <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
+    <string name="found_existing_tor_process">procurando processos Tor existentes...</string>
   <string name="something_bad_happened">Algo ruim aconteceu. Cheque o lo</string>
-  <string name="hidden_service_on">serviço oculto em:</string>
-  <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
+    <string name="unable_to_read_hidden_service_name">habilitar ler o nome do serviço oculto</string>
   <string name="unable_to_start_tor">Habilitar iniciar o Tor:</string>
-  <string name="unable_to_reset_tor">Reinicie seu dispositivo, incapaz de resetar Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar tabelas de IP padrão:</string>
-  <string name="pref_use_sys_iptables_summary">usar as tabelas ip binárias embutidas ao invés das tabelas do pacote Orbot</string>
-  <string name="error_installing_binares">Os binários Tor não estão disponíveis para serem instalados ou atualizados.</string>
-  <string name="pref_use_persistent_notifications">Sempre manter o ícone na barra de tarefas quando o Orbot está conectado</string>
-  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ligadas</string>
-  <string name="pref_use_expanded_notifications">Mostrar notificação expandida com Tor país de saída e IP</string>
-  <string name="pref_use_expanded_notifications_title">Notificações Expandidas</string>
-  <string name="notification_using_bridges">Pontes habilitadas!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Escolha o local e idioma para o Orbot</string>
-  <string name="wizard_locale_title">Escolha o Idioma</string>
-  <string name="wizard_locale_msg">Deixe o padrão ou troque o idioma atual</string>
-  <string name="powered_by">distribuído por Tor</string>
-  <string name="btn_save_settings">Salvar Configurações</string>
-  <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</string>
-  <string name="bandwidth_">Largura de banda:</string>
-  <string name="down">down</string>
-  <string name="up">up</string>
-  <string name="pref_disable_network_title">Modo de espera automático</string>
-  <string name="pref_disable_network_summary">Colocar o Tor em modo de espera quando não houver acesso Internet disponível</string>
-  <string name="newnym">Você trocou para uma nova identidade Tor!</string>
-  <string name="menu_verify_browser">Navegador</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Gerenciar Tor</string>
-  <string name="permission_manage_tor_description">Habilitar este app a controlar o serviço Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Parece que você não tem o Orweb instalado. Quer ajuda com isso ou devemos apenas abrir o navegador?</string>
-  <string name="install_apps_">Instalar apps?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Sem conectividade na rede. Colocando o Tor para dormir...</string>
+    <string name="no_internet_connection_tor">Sem conexão na internet; Tor está na espera...</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_dialog">Torrc Personalizado</string>
-  <string name="your_tor_public_ips_">Seus IPs Públicos do Tor:</string>
-  <string name="app_conflict">Conflito de aplicattivo</string>
-  <string name="pref_transproxy_flush_title">Transproxy FORÃ?AR REMOÃ?Ã?O</string>
-  <string name="you_do_not_have_root_access_enabled">Você não tem acesso root ativado</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Você pode precisar parar e iniciar Orbot para as configurações de mudar para ser ativado.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Pontes Atualizadas</string>
-  <string name="restart_orbot_to_use_this_bridge_">Por favor reinicie Orbot para habilitar as mundanças</string>
-  <string name="menu_qr">QR Codes</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Se a sua rede móvel ativamente blocos Tor, você pode usar uma ponte para acessar a rede. Selecione um dos tipos de pontes acima, para permitir pontes.</string>
-  <string name="bridge_mode">Modo Ponte</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Atvar</string>
-  <string name="apps_mode">Modo Apps VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Você pode permitir que todos os aplicativos em seu dispositivo para executar através da rede Tor usando o recurso VPN do Android.\n\n*AVISO* Esta é uma característica nova, experimental e em alguns casos pode não começar automaticamente, ou pode parar.   Não deve ser usado para manter o anonimato, e serão utilizadas apenas para obter através de firewalls e filtros.</string>
-  <string name="send_email">Enviar Email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Você pode obter um endereço de ponte através de e-mail, web ou lendo um código QR ponte. Selecione \'E-mail\' ou \'Web\' abaixo para solicitar uma ponte endereço. \n\nUma vez que você tem um endereço, copie &amp; colá-lo na "Bridges" preferência na configuração e reiniciar do Orbot.</string>
-  <string name="install_orweb">Instalar Orfox</string>
-  <string name="standard_browser">Navegador Padrão</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTA: Apenas pontes Tor padrão funcionam em dispositivos Atom/Intel X86</string>
-  <string name="vpn_default_world">Mundo</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pt-rPT/strings.xml b/orbotservice/src/main/res/values-pt-rPT/strings.xml
index 20ba24b2..2f8e5113 100644
--- a/orbotservice/src/main/res/values-pt-rPT/strings.xml
+++ b/orbotservice/src/main/res/values-pt-rPT/strings.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="wizard_title">Orbot</string>
-  <!--Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -10,5 +9,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-pt/strings.xml b/orbotservice/src/main/res/values-pt/strings.xml
index 69f7a770..e2791207 100644
--- a/orbotservice/src/main/res/values-pt/strings.xml
+++ b/orbotservice/src/main/res/values-pt/strings.xml
@@ -1,181 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">iniciar e parar Tor</string>
-  <string name="tor_proxy_service_process">serviço proxy Tor</string>
-  <string name="status_starting_up">O Orbot está a iniciar...</string>
+    <string name="status_starting_up">O Orbot está a iniciar...</string>
   <string name="status_activated">Conetado à rede Tor</string>
   <string name="status_disabled">O Orbot está desativado</string>
   <string name="tor_process_starting">A iniciar o cliente Tor...</string>
   <string name="tor_process_complete">completo.</string>
-  <string name="tor_process_waiting">a aguardar.</string>
-  <string name="not_anonymous_yet">AVISO: O seu tráfego não está anónimo! Por favor, configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Início</string>
-  <string name="menu_browse">Explorar</string>
-  <string name="menu_settings">Configurações</string>
-  <string name="menu_log">Registo</string>
-  <string name="menu_info">Ajuda</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Parar</string>
-  <string name="menu_about">Sobre</string>
-  <string name="main_layout_download">Transferir</string>
-  <string name="main_layout_upload">Enviar</string>
-  <string name="button_help">Ajuda</string>
-  <string name="button_close">Fechar</string>
-  <string name="button_about">Sobre</string>
-  <string name="button_clear_log">Limpar Registo</string>
-  <string name="menu_verify">Verificar</string>
-  <string name="menu_exit">Sair</string>
-  <string name="menu_scan">Digitalizar BridgeQR</string>
-  <string name="menu_share_bridge">Compartilhar BridgeQR</string>
-  <string name="press_to_start">- pressionar longo para iniciar - </string>
-  <string name="pref_trans_proxy_group">Proxy Transparente (requer \'Root\')</string>
-  <string name="pref_trans_proxy_title">Proxy Transparente</string>
-  <string name="pref_transparent_all_title">Tor em Tudo</string>
-  <string name="pref_transparent_all_summary">Passar todo o tráfego das apps via Tor</string>
-  <string name="pref_transparent_port_fallback_summary">AVISO: Rodear as portas comuns (80, 443, etc...). *USAR APENAS* se o modo  \'Todas\' ou \'App\' não funcionar.</string>
-  <string name="pref_transparent_port_title">Lista de Portas</string>
-  <string name="pref_transparent_port_summary">Lista de portas para o proxy. *USAR APENAS* se o modo \'Todas\' ou \'App\' não funcionar.</string>
-  <string name="pref_transparent_port_dialog">Insira as portas para o proxy</string>
-  <string name="pref_has_root">Solicitar Acesso \'Root\'</string>
-  <string name="pref_has_root_summary">Solicitar acesso \'root\' para o proxy transparente</string>
-  <string name="status_install_success">Binários do Tor instalados com sucesso!</string>
-  <string name="status_install_fail">Não foi possível instalar os ficheiros binário do Tor. Por favor, verifique o registo de eventos e notifique tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Erro de Aplicação</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Sobre o Orbot</string>
-  <string name="btn_next">Seguinte</string>
-  <string name="btn_back">Voltar</string>
-  <string name="btn_finish">Terminar</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Cancelar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Alguns Detalhes do Orbot</string>
-  <string name="wizard_permissions_root">Autorização Concedida</string>
-  <string name="wizard_permissions_stock">Autorizações do Orbot</string>
-  <string name="wizard_permissions_consent">Eu compreendo e gostaria de continuar sem a Superuser</string>
-  <string name="wizard_permission_enable_root">Conceder \'Root\' para o Orbot</string>
-  <string name="wizard_configure">Configurar Acesso do Tor</string>
-  <string name="wizard_configure_all">Passar Todas as Aplicações Via Tor</string>
-  <string name="wizard_configure_select_apps">Selecione Individualmente as Apps para o Tor</string>
-  <string name="wizard_tips_tricks">Orbot - Apps ativadas</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Cliente de mensagens instantâneas seguras para Android</string>
-  <string name="wizard_tips_proxy">Configurações do Proxy - Aprenda a configurar as apps para funcionarem com o Orbot</string>
-  <string name="wizard_tips_duckgo">App de Mecanismo de Procura DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Defina o proxy do Twitter para hospedeiro \"localhost\" e porta 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Definições Proxy</string>
-  <string name="wizard_final">O Orbot está pronto!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_hs_group">Serviço de Hospedagem Ocultado</string>
-  <string name="pref_general_group">Geral</string>
-  <string name="pref_start_boot_title">Iniciar o Orbot no Arranque</string>
-  <string name="pref_start_boot_summary">Iniciar automaticamente o Orbot e conetar o Tor quando o seu dispositivo Android inicia</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Aviso</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Autorizações</string>
-  <string name="wizard_permissions_root_msg1">Opcionalmente, pode conceder acesso de  Administrador\' ao Orbot para ativar as funções avançadas, tais como, Proxy Transparente.</string>
-  <string name="wizard_permissions_root_msg2">Se não quer isto, por favor, certifique-se que usa as apps criadas para funcionarem com a Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot - Apps Ativadas</string>
-  <string name="wizard_tips_play">Encontre todas as apps do Projeto Guardian na Play Store da Google</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy Transparente</string>
-  <string name="wizard_transproxy_hint">(Selecione esta caixa se não souber do que estamos a falar)</string>
-  <string name="wizard_transproxy_none">Nenhum</string>
-  <string name="pref_transparent_tethering_title">\"Tethering\" Tor</string>
-  <string name="pref_transparent_tethering_summary">Ativar o Proxy Transparente Tor para a rede Sem Fios e Dispositivos USB \"Tethered\" (necessário reiniciar)</string>
-  <string name="button_grant_superuser">Solicitar Acesso de Administrador</string>
-  <string name="pref_select_apps">Selecionar Apps</string>
-  <string name="pref_select_apps_summary">Escolher Apps para Encaminhar Via Tor</string>
-  <string name="button_proxy_all">Tudo com o Proxy</string>
-  <string name="button_proxy_none">Nenhum Proxy</string>
-  <string name="button_invert_selection">Inverter Seleção</string>
-  <string name="pref_proxy_title">Proxy de Rede de Saída (Opcional)</string>
-  <string name="pref_proxy_type_title">Tipo de Proxy de Saída</string>
-  <string name="pref_proxy_type_summary">Protocolo para usar para o servidor proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Inserir Tipo de Proxy</string>
-  <string name="pref_proxy_host_title">Anfitrião Proxy de Saída</string>
-  <string name="pref_proxy_host_summary">Nome do Hospedeiro do Servidor Proxy</string>
-  <string name="pref_proxy_host_dialog">Inserir Hospedeiro Proxy</string>
-  <string name="pref_proxy_port_title">Porta Proxy de Saída</string>
-  <string name="pref_proxy_port_summary">Porta do Servidor Proxy</string>
-  <string name="pref_proxy_port_dialog">Inserir Porta do Proxy</string>
-  <string name="pref_proxy_username_title">Nome do Utilizador do Proxy de Saída</string>
-  <string name="pref_proxy_username_summary">Nome do Utilizador do Proxy (Opcional)</string>
-  <string name="pref_proxy_username_dialog">Inserir Nome de Utilizador do Proxy</string>
-  <string name="pref_proxy_password_title">Senha do Proxy de Saída</string>
-  <string name="pref_proxy_password_summary">Senha do Proxy (Opcional)</string>
-  <string name="pref_proxy_password_dialog">Inserir Senha do Proxy</string>
-  <string name="status">Estado</string>
-  <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
-  <string name="error">Erro</string>
-  <string name="bridges">Pontes</string>
-  <string name="use_bridges">Usar Pontes</string>
-  <string name="ip_address_and_port_of_bridges">Endereço de IP e porta das pontes</string>
-  <string name="enter_or_port">Inserir OU porta</string>
-  <string name="reachable_ports">Portas alcançáveis</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Portas alcançáveis por detrás de uma Firewal restritiva</string>
-  <string name="enter_ports">Insira as portas</string>
-  <string name="enable_hidden_services">Hospedeiro de Serviço Ocultado</string>
-  <string name="hidden_service_ports">Portas de Serviço Ocultadas</string>
-  <string name="project_home">Projeto Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">A Licença do Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Programas de Terceiros: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Uma app pretende abrir a porta %S do servidor ocultado para a rede Tor. Isto é seguro, se confiar na app.</string>
-  <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Não foi possível iniciar o processo Tor: </string>
+    <string name="found_existing_tor_process">encontrado o processo Tor existente...</string>
   <string name="something_bad_happened">Aconteceu algo de mau. Verifique o registo de eventos.</string>
-  <string name="hidden_service_on">serviço ocultado em:</string>
-  <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
+    <string name="unable_to_read_hidden_service_name">não é possível ler o nome do serviço ocultado</string>
   <string name="unable_to_start_tor">Não é possível iniciar o Tor:</string>
-  <string name="unable_to_reset_tor">Reinicie o seu dispositivo, não é possível reiniciar Tor!</string>
-  <string name="pref_use_sys_iptables_title">Usar Tabelas de IP Predefinidas</string>
-  <string name="pref_use_persistent_notifications_title">Notificações Sempre Ativadas</string>
-  <string name="pref_use_expanded_notifications_title">Notificações Estendidas</string>
-  <string name="notification_using_bridges">Pontes ativadas!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Idioma</string>
-  <string name="set_locale_summary">Escolha o local e o idioma para o Orbot</string>
-  <string name="wizard_locale_title">Escolher Idioma</string>
-  <string name="wizard_locale_msg">Deixe a predefinição ou mude o idioma atual</string>
-  <string name="btn_save_settings">Guardar Definições</string>
-  <string name="bandwidth_">Largura de banda:</string>
-  <string name="down">para baixo</string>
-  <string name="up">para cima</string>
-  <string name="newnym">Mudou para uma nova identidade do Tor!</string>
-  <string name="menu_use_chatsecure">Usar ChatSecure</string>
-  <string name="permission_manage_tor_label">Gerir Tor</string>
-  <string name="permission_manage_tor_description">Ative esta app para controlar o serviço Tor</string>
-  <string name="install_apps_">Instalar apps?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nenhuma conetividade de rede. A hibernar Torâ?¦</string>
+    <string name="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="your_tor_public_ips_">Os seus IPs Públicos Tor:</string>
-  <string name="app_conflict">Conflito de App</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Pontes Atualizadas</string>
-  <string name="menu_qr">Códigos QR</string>
-  <string name="get_bridges_email">Correio Eletrónico</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Ativar</string>
-  <string name="send_email">Enviar Mensagem</string>
-  <string name="standard_browser">Navegador Padrão</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ro-rRO/strings.xml b/orbotservice/src/main/res/values-ro-rRO/strings.xml
index f0ae485d..b80fb51c 100644
--- a/orbotservice/src/main/res/values-ro-rRO/strings.xml
+++ b/orbotservice/src/main/res/values-ro-rRO/strings.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">Pagina de start</string>
-  <string name="menu_browse">RÄ?sfoieÅ?te</string>
-  <string name="menu_settings">SetÄ?ri</string>
-  <string name="menu_info">AsistenÅ£Ä?</string>
-  <string name="menu_about">Despre</string>
-  <string name="button_help">AsistenÅ£Ä?</string>
-  <string name="button_close">Ã?nchide</string>
-  <string name="button_about">Despre</string>
-  <string name="menu_exit">IeÅ?ire</string>
-  <string name="btn_back">Ã?napoi</string>
-  <string name="btn_cancel">Revocare</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">SetÄ?ri proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">General</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Avertizare</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Nimic</string>
-  <string name="status">Stare</string>
-  <string name="error">Eroare</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">SalveazÄ? setÄ?rile</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ro/strings.xml b/orbotservice/src/main/res/values-ro/strings.xml
index e445b4b7..1dbcc393 100644
--- a/orbotservice/src/main/res/values-ro/strings.xml
+++ b/orbotservice/src/main/res/values-ro/strings.xml
@@ -1,231 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">porneÈ?te È?i opreÈ?te Tor</string>
-  <string name="tor_proxy_service_process">serviciu proxy tor</string>
-  <string name="status_starting_up">Orbot porneste...</string>
+    <string name="status_starting_up">Orbot porneste...</string>
   <string name="status_activated">Conectat la reteaua Tor</string>
   <string name="status_disabled">Orbot este dezactivat</string>
   <string name="tor_process_starting">Porneste clientul Tor...</string>
   <string name="tor_process_complete">terminat.</string>
-  <string name="tor_process_waiting">asteptare.</string>
-  <string name="not_anonymous_yet">ATENTIE: Traficul inca nu este anonim! Configureaza aplicatile sa foloseasca proxy-ul HTTP 127.0.0.1:8118 sau SOCKS4A sau proxy-ul SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Pagina de start</string>
-  <string name="menu_browse">RÄ?sfoieÅ?te</string>
-  <string name="menu_settings">SetÄ?ri</string>
-  <string name="menu_log">log</string>
-  <string name="menu_info">AsistenÅ£Ä?</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">Despre</string>
-  <string name="main_layout_download">Descarca</string>
-  <string name="main_layout_upload">Incarca</string>
-  <string name="button_help">AsistenÅ£Ä?</string>
-  <string name="button_close">Ã?nchide</string>
-  <string name="button_about">Despre</string>
-  <string name="button_clear_log">Goleste log-ul</string>
-  <string name="menu_verify">Verifica</string>
-  <string name="menu_exit">IeÅ?ire</string>
-  <string name="press_to_start">- apasa lung pentru pornire -</string>
-  <string name="pref_trans_proxy_group">Proxy transparent (necesita root)</string>
-  <string name="pref_trans_proxy_title">Proxy transparent</string>
-  <string name="pref_trans_proxy_summary">Aplicare automata a Tor la aplicatii</string>
-  <string name="pref_transparent_all_title">Tor tot</string>
-  <string name="pref_transparent_all_summary">Toate aplicatile folosesc Tor pentru trafic</string>
-  <string name="pref_transparent_port_fallback_title">Port proxy de rezerva</string>
-  <string name="pref_transparent_port_fallback_summary">ATENTIE: Ocoleste porturile comune (80, 443, etc.). *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
-  <string name="pref_transparent_port_title">Lista porturi</string>
-  <string name="pref_transparent_port_summary">Lista porturi pentru proxy. *FOLOSESTE DOAR* daca modurile \"Toate\" sau \"Aplicatii\" nu functioneaza</string>
-  <string name="pref_transparent_port_dialog">Introdu porturile pentru proxy</string>
-  <string name="pref_has_root">Necesita acces root</string>
-  <string name="pref_has_root_summary">Necesita acces root pentru proxy transparent</string>
-  <string name="status_install_success">Fisierele binare Tor instalate cu succes!</string>
-  <string name="status_install_fail">Fisierele binare Tor nu au putut fi instalate. Verificati log-ul si raportati bug-ul la tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Eroare de aplicatie</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Despre Orbot</string>
-  <string name="btn_next">Urmatorul</string>
-  <string name="btn_back">Ã?napoi</string>
-  <string name="btn_finish">Termina</string>
-  <string name="btn_okay">Ok</string>
-  <string name="btn_cancel">Revocare</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Detalii Orbot</string>
-  <string name="wizard_permissions_root">Permisiune acordata</string>
-  <string name="wizard_permissions_stock">Permisiuni Orbot</string>
-  <string name="wizard_premissions_msg_root">Excelent! Am detectat ca ai permis acces root pentru Orbot. Vom folosi aceasta putere cu raspundere.</string>
-  <string name="wizard_permissions_msg_stock">Desi nu este necesar, Orbot poate fi mai puternic daca dispozitivul dumneavoastra are acces root. Foloseste butonul de mai jos pentru ai oferi superputeri lui Orbot!</string>
-  <string name="wizard_permissions_no_root">Daca nu ai acces root, sau nu ai habar despre ce vorbim, asigura-te ca folosesti aplicatii facute sa functioneze cu Orbot.</string>
-  <string name="wizard_permissions_consent">Inteleg si as vrea sa continui fara Superuser</string>
-  <string name="wizard_permission_enable_root">Aproba root pentru Orbot</string>
-  <string name="wizard_configure">Configureaza Tor</string>
-  <string name="wizard_configure_msg">Orbot ofera posibilitatea sa trimita tot traficul prin Tor SAU sa alegi aplicatii individuale.</string>
-  <string name="wizard_configure_all">Toate aplicatiile folosesc Tor</string>
-  <string name="wizard_configure_select_apps">Alege aplicatii individuale pentru Tor</string>
-  <string name="wizard_tips_tricks">Aplicatii compatibile Orbot</string>
-  <string name="wizard_tips_msg">Aplicatiile de mai jos au fost create sa fie compatibile cu Orbot. Apasa pe fiecare buton pentru a instala acum, sau le poti gasi mai tarziu pe Google Play, pe site-ul GuardianProject.info sau pe F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Mesagerie instantanee securizatÄ? pentru Android</string>
-  <string name="wizard_tips_proxy">Setari pentru proxy - Invata cum sa configurezi aplicatii sa fie compatibile cu Orbot</string>
-  <string name="wizard_tips_duckgo">Motor de cautare DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Seteaza proxy-ul Twitter \"localhost\" su portul 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">SetÄ?ri proxy</string>
-  <string name="wizard_final">Orbot este pregatit!</string>
-  <string name="wizard_exit_at_first_screen_toast">ConfiguraÈ?i Orbot înainte de a începe sÄ?-l utilizaÈ?i!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Vom deschide pagina https://check.torproject.org pentru a verifica daca Orbot este configurat corespunzator si daca este conectat la Tor.</string>
-  <string name="pref_hs_group">Serviciu de gazduire ascuns</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Porneste Orbot la boot-are</string>
-  <string name="pref_start_boot_summary">Porneste Orbot automat si conecteaza-te la Tor cand porneste dispozitivul</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Atentie</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permisiuni</string>
-  <string name="wizard_permissions_root_msg1">Optional, ii poti oferi lui Orbot acces \"Superuser\" pentru a activa optiuni avansate, cum ar fi proxy transparent.</string>
-  <string name="wizard_permissions_root_msg2">Daca nu vrei sa faci asta, asigura-te ca folosesti aplicatii compatibile cu Orbot.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Aplicatii cu Orbot activat</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: AplicaÈ?ie sigurÄ? de chat cu codare Off-the-Record</string>
-  <string name="wizard_tips_play">Gaseste toate aplicatile Guardian Project pe Google Play</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy transparent</string>
-  <string name="wizard_transproxy_msg">Asta va permite aplicatilor tale sa foloseasca Tor automat fara nici o configurare.</string>
-  <string name="wizard_transproxy_hint">(Bifeaza asta daca nu ai idee despre ce vorbim)</string>
-  <string name="wizard_transproxy_none">Nimic</string>
-  <string name="pref_transparent_tethering_title">Partajarea conexiunii Tor</string>
-  <string name="pref_transparent_tethering_summary">Activeaza proxy transparent pentru conexiuni partajate prin Wi-Fi si USB (necesita restart)</string>
-  <string name="button_grant_superuser">Cere acces Superuser</string>
-  <string name="pref_select_apps">Selecteaza aplicatii</string>
-  <string name="pref_select_apps_summary">Alege aplicatii care sa foloseasca Tor</string>
-  <string name="pref_node_configuration">Configurare nod</string>
-  <string name="pref_node_configuration_summary">Setari avansate care ar putea sa iti reduca anonimitatea</string>
-  <string name="pref_entrance_node">Noduri de intrare</string>
-  <string name="pref_entrance_node_summary">Amprente, nick name-uri si adrese pentru primul hop</string>
-  <string name="pref_entrance_node_dialog">Introdu noduri de intrare</string>
-  <string name="pref_proxy_title">Proxy de retea pentru iesire (optional)</string>
-  <string name="pref_proxy_type_title">Tipul proxy-ului de iesire</string>
-  <string name="pref_proxy_type_summary">Tipul protocolului pentru proxy: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Introdu tipul proxy-ului</string>
-  <string name="pref_proxy_host_title">Host-ul proxy-ului de iesire</string>
-  <string name="pref_proxy_host_summary">Hostname-ul server-ului proxy</string>
-  <string name="pref_proxy_host_dialog">Introdu host-ul proxy-ului</string>
-  <string name="pref_proxy_port_title">Port-ul proxy-ului de iesire</string>
-  <string name="pref_proxy_port_summary">Port-ul serverului proxy</string>
-  <string name="pref_proxy_port_dialog">Introdu port-ul proxy</string>
-  <string name="pref_proxy_username_title">Username-ul proxy-ului de iesire</string>
-  <string name="pref_proxy_username_summary">Username-ul proxy-ului (optional)</string>
-  <string name="pref_proxy_username_dialog">Introdu username-ul proxy-ului</string>
-  <string name="pref_proxy_password_title">Parola pentru proxy-ul de iesire</string>
-  <string name="pref_proxy_password_summary">Parola pentru proxy (optional)</string>
-  <string name="pref_proxy_password_dialog">Introdu parola pentru proxy</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Configurez proxy transparent complet...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Configurez un proxy transparent bazat pe aplicatie...</string>
-  <string name="transparent_proxying_enabled">Proxy transparent ACTIVAT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy activat pentru partajare!</string>
-  <string name="warning_error_starting_transparent_proxying_">ATENTIE: eroare la pornirea proxy-ului transparent!</string>
-  <string name="transproxy_rules_cleared">Reguli TransProxy golite</string>
-  <string name="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Configurez proxy transparent bazat pe port...</string>
-  <string name="bridge_error">Eroare de punte</string>
-  <string name="bridge_requires_ip">Pentru a putea folosi optiunea de punte, trebuie introdusa cel putin o adresa IP pentru punte.</string>
-  <string name="send_email_for_bridges">Trimite un e-mail la bridges@xxxxxxxxxxxxxx cu linia \"get bridges\" in continutul mail-ului de pe un cont de GMail.</string>
-  <string name="error">Eroare</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Setarile tale pentru adrese accesibile au cauzat o exceptie!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Nu am putut porni procesul Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Setarile tale pentru adrese accesibile au cauzat o exceptie!</string>
   <string name="your_relay_settings_caused_an_exception_">Setarile tale de relay au cauzat o exceptie!</string>
-  <string name="exit_nodes">Noduri de iesire</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Amprente, nick name-uri, tari si adrese pentru ultimul hop</string>
-  <string name="enter_exit_nodes">Introdu noduri de iesire</string>
-  <string name="exclude_nodes">Noduri de exclus</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Amprente, nick name-uri, tari si adrese de exclus</string>
-  <string name="enter_exclude_nodes">Introdu noduri de exclus</string>
-  <string name="strict_nodes">Noduri stricte</string>
-  <string name="use_only_these_specified_nodes">Foloseste *doar* nodurile specificate</string>
-  <string name="bridges">Punti</string>
-  <string name="use_bridges">Foloseste punti</string>
-  <string name="bridges_obfuscated">Punti mascate</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Activeaza noduri de intrare alternative in reteaua Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Activeaza daca puntile configurate sunt punti mascate</string>
-  <string name="ip_address_and_port_of_bridges">Adresa IP si port pentru punti</string>
-  <string name="enter_bridge_addresses">Introdu adresa pentru punte</string>
-  <string name="relays">Comutatoare</string>
-  <string name="relaying">Comutare</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Activeaza dispozitivul sa fie un comutator fara iesire</string>
-  <string name="relay_port">Port de retransmitere</string>
-  <string name="listening_port_for_your_tor_relay">Port pentru comutatorul tau Tor</string>
-  <string name="enter_or_port">Introdu portul OR</string>
-  <string name="relay_nickname">Nick name-ul comutatorului</string>
-  <string name="the_nickname_for_your_tor_relay">Nick name-ul pentru comutatorul tau Tor</string>
-  <string name="enter_a_custom_relay_nickname">Introdu un nick name pentru comutator</string>
-  <string name="reachable_addresses">Adresa accesibila</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ruleaza ca si client in spatele firewall-ului cu politici restrictive</string>
-  <string name="reachable_ports">Porturi accesibile</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Porturi accesibile in spatele unui firewall restrictiv</string>
-  <string name="enter_ports">Introdu porturi</string>
-  <string name="enable_hidden_services">Serviciu de gazduire ascuns</string>
-  <string name="run_servers_accessible_via_the_tor_network">permite serverului de pe dispozitiv sa fie accesibil in reteaua Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">introdu porturile localhost-ului pentru servicile ascunse</string>
-  <string name="hidden_service_ports">Porturi de serviciu ascunse</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">numele serviciului tau ascuns (generat automat)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">activeaza exportul log-ului (trebuie folosit adb sau LogCat pentru vizualizare)</string>
-  <string name="project_home">Casa(le) proiectului:</string>
-  <string name="the_tor_license">Licenta Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Aplicatii tertiare:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">O aplicatie vrea sa deschida portul ascuns %S spre reteaua Tor. Este sigur daca ai incredere in aplicatie.</string>
-  <string name="found_existing_tor_process">gasit proces Tor existent...</string>
+    <string name="found_existing_tor_process">gasit proces Tor existent...</string>
   <string name="something_bad_happened">Ceva rau s-a intamplat. Verifica log-ul</string>
-  <string name="hidden_service_on">serviciu ascuns pe:</string>
-  <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
+    <string name="unable_to_read_hidden_service_name">nu am putut citi numele serviciului ascuns</string>
   <string name="unable_to_start_tor">Nu am reusit sa pornesc Tor:</string>
-  <string name="pref_use_sys_iptables_title">Foloseste Iptables implicite</string>
-  <string name="pref_use_sys_iptables_summary">foloseste fisierele binare iptables incorporate in locul celor din Orbot</string>
-  <string name="error_installing_binares">Fisierele binare Tor nu au putut fi instalate sau actualizate.</string>
-  <string name="pref_use_persistent_notifications">Arata tot timpul icoana in bara cand Orbot este conectat</string>
-  <string name="pref_use_persistent_notifications_title">Notificari active tot timpul</string>
-  <string name="notification_using_bridges">Punti activate!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">LimbÄ?</string>
-  <string name="set_locale_summary">Alege localele si limba pentru Orbot</string>
-  <string name="wizard_locale_title">Alege limba</string>
-  <string name="wizard_locale_msg">Lasa implicit sau schimba limba curenta</string>
-  <string name="btn_save_settings">SalveazÄ? setarile</string>
-  <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în aÈ?teptare...</string>
-  <string name="bandwidth_">LÄ?È?ime de bandÄ?:</string>
-  <string name="down">jos</string>
-  <string name="up">sus</string>
-  <string name="pref_disable_network_title">FÄ?rÄ? adormirea automatÄ? a reÈ?elei</string>
-  <string name="pref_disable_network_summary">Pune Tor sÄ? doarmÄ? dacÄ? nu este internet disponibil</string>
-  <string name="newnym">AÈ?i comutat la o nouÄ? identitate Tor!</string>
-  <string name="menu_use_chatsecure">UtilizaÈ?i ChatSecure</string>
-  <string name="permission_manage_tor_label">Administrare Tor</string>
-  <string name="permission_manage_tor_description">ActivaÈ?i aceastÄ? aplicaÈ?ie pentru a controla serviciile Tor</string>
-  <string name="install_apps_">Se instaleazÄ? aplicaÈ?ia?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Nu este conexiune la reÈ?ea. Se pune Tor în adormire...</string>
+    <string name="no_internet_connection_tor">Nu este conexiune la internet; Tor este în aÈ?teptare...</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="you_do_not_have_root_access_enabled">Nu aveÈ?i activat accesul ca ROOT</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KiO</string>
-  <string name="mb">MiO</string>
-  <string name="menu_qr">Coduri QR</string>
-  <string name="bridge_mode">Mod punte</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">ActiveazÄ?</string>
-  <string name="send_email">Trimite email</string>
-  <string name="standard_browser">Navigator standard</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-rs-rAR/strings.xml b/orbotservice/src/main/res/values-rs-rAR/strings.xml
index 132b67e8..520c0a26 100644
--- a/orbotservice/src/main/res/values-rs-rAR/strings.xml
+++ b/orbotservice/src/main/res/values-rs-rAR/strings.xml
@@ -1,47 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">reiniciar Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot está iniciándose�</string>
+    <string name="status_starting_up">Orbot está iniciándose�</string>
   <string name="status_activated">Conectado a la red Tor</string>
   <string name="status_disabled">\"Orbot está Desactivado</string>
   <string name="status_shutting_down">Orbot se está apagando</string>
   <string name="tor_process_complete">Completar</string>
-  <string name="not_anonymous_yet">CIUDADO: Tu tráfico no es anónimo aún! Por favor configura tus aplicaciones para que usen el HTTP proxy 127.0.0.1:8118 o SOCKS4A o el proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Inicio</string>
-  <string name="menu_browse">Navegar</string>
-  <string name="menu_settings">Configuración</string>
-  <string name="menu_log">Registro</string>
-  <string name="menu_info">Ayuda</string>
-  <string name="menu_apps">Apps</string>
-  <string name="menu_start">Iniciar</string>
-  <string name="menu_stop">Detener</string>
-  <string name="menu_about">Acerca de</string>
-  <string name="menu_wizard">Asistente</string>
-  <string name="button_help">Ayuda</string>
-  <string name="button_close">Cerrar</string>
-  <string name="button_about">Acerca de</string>
-  <string name="button_clear_log">Borrar Registros</string>
-  <string name="menu_verify">Chequear</string>
-  <string name="menu_exit">Salir</string>
-  <string name="pref_trans_proxy_group">Proxying Transparente (Requiere Root)</string>
-  <string name="pref_trans_proxy_title">Proxying Transparente</string>
-  <string name="pref_trans_proxy_summary">Torificación Automática de Aplicaciones</string>
-  <string name="pref_transparent_all_title">Torear Todo</string>
-  <string name="btn_next">Siguiente</string>
-  <string name="btn_back">Atrás</string>
-  <string name="btn_finish">Finalizar</string>
-  <string name="btn_cancel">Cancelar</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_final">Orbot está listo!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">General</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
@@ -53,6 +20,4 @@
   <!--Transparent Proxy screen-->
   <!--<string name="pref_use_whispercore">Use WhisperCore</string>
 <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string>-->
-  <string name="default_bridges"/>
-  <string name="powered_by">potenciado por The Tor Project</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ru/strings.xml b/orbotservice/src/main/res/values-ru/strings.xml
index 94029fb0..674235d2 100644
--- a/orbotservice/src/main/res/values-ru/strings.xml
+++ b/orbotservice/src/main/res/values-ru/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot - Ñ?Ñ?о Ñ?вободнаÑ? пÑ?огÑ?амма длÑ? пÑ?окÑ?и-Ñ?оединений, она позволÑ?еÑ? дÑ?Ñ?гим пÑ?иложениÑ?м более безопаÑ?но иÑ?полÑ?зоваÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?оединение. Orbot иÑ?полÑ?зÑ?еÑ? Tor длÑ? Ñ?иÑ?Ñ?ованиÑ? инÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?ика, коÑ?оÑ?Ñ?й заÑ?ем Ñ?кÑ?Ñ?ваеÑ?Ñ?Ñ? в Ñ?оде пеÑ?еÑ?Ñ?лки Ñ?еÑ?ез неÑ?колÑ?ко компÑ?Ñ?Ñ?еÑ?ов в Ñ?азнÑ?Ñ? Ñ?аÑ?Ñ?Ñ?Ñ? планеÑ?Ñ?. Tor Ñ?влÑ?еÑ?Ñ?Ñ? Ñ?вободнÑ?м пÑ?огÑ?аммнÑ?м пÑ?иложением, а Ñ?акже оÑ?кÑ?Ñ?Ñ?ой Ñ?еÑ?Ñ?Ñ?, помогаÑ?Ñ?ей заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?лежки в Ñ?еÑ?Ñ?Ñ?, Ñ?гÑ?ожаÑ?Ñ?ей лиÑ?ной Ñ?вободе и Ñ?аÑ?Ñ?ной жизни, конÑ?иденÑ?иалÑ?нÑ?м бизнеÑ?-деÑ?Ñ?елÑ?ноÑ?Ñ?и и конÑ?акÑ?ам, а Ñ?акже гоÑ?Ñ?даÑ?Ñ?Ñ?венной пÑ?огÑ?амме бÐ
 µÐ·Ð¾Ð¿Ð°Ñ?ноÑ?Ñ?и, извеÑ?Ñ?ной как анализ Ñ?Ñ?аÑ?ика.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Ð?апÑ?Ñ?к и оÑ?Ñ?ановка Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Ð?апÑ?Ñ?к Orbot...</string>
+    <string name="status_starting_up">Ð?апÑ?Ñ?к Orbot...</string>
   <string name="status_activated">Ð?одклÑ?Ñ?Ñ?н к Ñ?еÑ?и Tor</string>
   <string name="status_disabled">Orbot оÑ?клÑ?Ñ?Ñ?н</string>
   <string name="status_shutting_down">СлÑ?жба Tor вÑ?клÑ?Ñ?аеÑ?Ñ?Ñ?</string>
   <string name="tor_process_starting">Ð?апÑ?Ñ?каеÑ?Ñ?Ñ? клиенÑ? Tor...</string>
   <string name="tor_process_complete">завеÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">ожидание.</string>
-  <string name="not_anonymous_yet">Ð?РÐ?Ð?УÐ?РÐ?Ð?Ð?Ð?Ð?Ð?Ð?: ваÑ? Ñ?Ñ?аÑ?ик еÑ?Ñ? не анонимен! Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Ñ?вои пÑ?иложениÑ? на иÑ?полÑ?зование HTTP-пÑ?окÑ?и 127.0.0.1:8118 или же SOCKS4A или SOCKS5-пÑ?окÑ?и 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а</string>
-  <string name="menu_browse">Ð?Ñ?оÑ?моÑ?Ñ?</string>
-  <string name="menu_settings">Ð?аÑ?Ñ?Ñ?ойки</string>
-  <string name="menu_log">Ð?Ñ?Ñ?нал</string>
-  <string name="menu_info">СпÑ?авка</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?Ñ?</string>
-  <string name="menu_stop">Ð?Ñ?Ñ?ановиÑ?Ñ?</string>
-  <string name="menu_about">Ð? пÑ?огÑ?амме</string>
-  <string name="menu_promo_apps">Ð?олÑ?Ñ?иÑ?Ñ? пÑ?иложениÑ?...</string>
-  <string name="main_layout_download">Ð?агÑ?Ñ?зка</string>
-  <string name="main_layout_upload">Ð?Ñ?пÑ?авка</string>
-  <string name="button_help">СпÑ?авка</string>
-  <string name="button_close">Ð?акÑ?Ñ?Ñ?Ñ?</string>
-  <string name="button_about">Ð? пÑ?огÑ?амме</string>
-  <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?иÑ?Ñ? жÑ?Ñ?нал</string>
-  <string name="menu_verify">Ð?Ñ?овеÑ?ка</string>
-  <string name="menu_exit">Ð?Ñ?Ñ?од</string>
-  <string name="menu_scan">СканиÑ?оваÑ?Ñ? QR-код моÑ?Ñ?а</string>
-  <string name="menu_share_bridge">Ð?пÑ?бликоваÑ?Ñ? QR-код моÑ?Ñ?а</string>
-  <string name="press_to_start">- долгое нажаÑ?ие длÑ? запÑ?Ñ?ка -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и (Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? root-доÑ?Ñ?Ñ?п)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?еÑ?каÑ? Tor-иÑ?икаÑ?иÑ? пÑ?иложений</string>
-  <string name="pref_transparent_all_title">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?Ñ? Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_all_summary">Ð?апÑ?авлÑ?Ñ?Ñ? Ñ?Ñ?аÑ?ик вÑ?еÑ? пÑ?иложений Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?внÑ?й поÑ?Ñ? пÑ?окÑ?и</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?РÐ?Ð?УÐ?РÐ?Ð?Ð?Ð?Ð?Ð?Ð?: обÑ?одиÑ? обÑ?ие поÑ?Ñ?Ñ? (80, 443, и Ñ?.д.). *Ð?СÐ?Ð?Ð?ЬÐ?Ð?Ð?Ð?ТЬ ТÐ?Ð?ЬÐ?Ð?* еÑ?ли Ñ?ежимÑ? \'Ð?Ñ?Ñ?\' или \'Ð?Ñ?иложение\' не Ñ?абоÑ?аÑ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпиÑ?ок поÑ?Ñ?ов</string>
-  <string name="pref_transparent_port_summary">СпиÑ?ок поÑ?Ñ?ов длÑ? пÑ?окÑ?иÑ?икаÑ?ии. *Ð?СÐ?Ð?Ð?ЬÐ?Ð?Ð?Ð?ТЬ ТÐ?Ð?ЬÐ?Ð?* еÑ?ли Ñ?ежимÑ? \'Ð?Ñ?Ñ?\' или \'Ð?Ñ?иложение\' не Ñ?абоÑ?аÑ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?ведиÑ?е поÑ?Ñ?Ñ? длÑ? пÑ?окÑ?иÑ?икаÑ?ии</string>
-  <string name="pref_has_root">Ð?апÑ?оÑ?иÑ?Ñ? root-доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?апÑ?оÑ?иÑ?Ñ? root-доÑ?Ñ?Ñ?п длÑ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии</string>
-  <string name="status_install_success">Ð?Ñ?огÑ?амма Tor Ñ?Ñ?пеÑ?но Ñ?Ñ?Ñ?ановлена!</string>
-  <string name="status_install_fail">Ð?е Ñ?далоÑ?Ñ? Ñ?Ñ?Ñ?ановиÑ?Ñ? пÑ?огÑ?аммÑ? Tor. Ð?ожалÑ?йÑ?Ñ?а, пÑ?овеÑ?Ñ?Ñ?е Ñ?иÑ?Ñ?емнÑ?й жÑ?Ñ?нал и Ñ?ообÑ?иÑ?е нам: tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?ибка пÑ?иложениÑ?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?б Orbot</string>
-  <string name="btn_next">Ð?пеÑ?Ñ?д</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?авеÑ?Ñ?иÑ?Ñ?</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Ð?Ñ?мена</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Ð?екоÑ?оÑ?Ñ?е Ñ?ведениÑ? о пÑ?огÑ?амме Orbot</string>
-  <string name="wizard_details_msg">Orbot â?? Ñ?Ñ?о пÑ?иложение Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?м иÑ?Ñ?однÑ?м кодом, коÑ?оÑ?ое Ñ?одеÑ?жиÑ? Tor, LibEvent и Privoxy. Ð?но пÑ?едоÑ?Ñ?авлÑ?еÑ? локалÑ?нÑ?й HTTP-пÑ?окÑ?и (8118) и SOCKS-пÑ?окÑ?и (9050) в Ñ?еÑ?Ñ? Tor. Orbot Ñ?акже позволÑ?еÑ? на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ваÑ? Ñ? пÑ?авами root пеÑ?еÑ?Ñ?лаÑ?Ñ? веÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?ик Ñ?еÑ?ез Tor.</string>
-  <string name="wizard_permissions_root">РазÑ?еÑ?ение полÑ?Ñ?ено</string>
-  <string name="wizard_permissions_stock">РазÑ?еÑ?ениÑ? Orbot</string>
-  <string name="wizard_premissions_msg_root">Ð?Ñ?лиÑ?но! Ð?Ñ? опÑ?еделили, Ñ?Ñ?о вÑ? пÑ?едоÑ?Ñ?авили root-пÑ?ава длÑ? Orbot. Ð?Ñ? бÑ?дем иÑ?полÑ?зоваÑ?Ñ? Ñ?Ñ?Ñ? возможноÑ?Ñ?Ñ? Ñ? Ñ?мом.</string>
-  <string name="wizard_permissions_msg_stock">ХоÑ?Ñ? Ñ?Ñ?о и не Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ?, Orbot можеÑ? бÑ?Ñ?Ñ? более моÑ?нÑ?м инÑ?Ñ?Ñ?Ñ?менÑ?ом, еÑ?ли ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во имееÑ? пÑ?ава root. Ð?ажмиÑ?е на кнопкÑ? ниже и пÑ?едоÑ?Ñ?авÑ?Ñ?е Orbot Ñ?Ñ?пеÑ?возможноÑ?Ñ?и!</string>
-  <string name="wizard_permissions_no_root">Ð?Ñ?ли Ñ? ваÑ? неÑ? root-пÑ?ав или вÑ? не имееÑ?е пÑ?едÑ?Ñ?авлениÑ? о Ñ?Ñ?м мÑ? говоÑ?им, пÑ?оÑ?Ñ?о Ñ?бедиÑ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ?, Ñ?азÑ?абоÑ?аннÑ?е длÑ? Orbot.</string>
-  <string name="wizard_permissions_consent">Я понимаÑ? и Ñ?оÑ?Ñ? пÑ?одолжиÑ?Ñ? без пÑ?ав Ñ?Ñ?пеÑ?полÑ?зоваÑ?елÑ?</string>
-  <string name="wizard_permission_enable_root">Ð?аÑ?Ñ? root-пÑ?ава Orbot</string>
-  <string name="wizard_configure">Ð?аÑ?Ñ?Ñ?оиÑ?Ñ? Tor-иÑ?икаÑ?иÑ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?огÑ?амма Orbot даÑ?Ñ? вам возможноÑ?Ñ?Ñ? напÑ?авлÑ?Ñ?Ñ? Ñ?Ñ?аÑ?ик вÑ?еÑ? пÑ?иложений Ñ?еÑ?ез Tor Ð?Ð?Ð? вÑ?бÑ?аÑ?Ñ? пÑ?иложениÑ? длÑ? пеÑ?енапÑ?авлениÑ? Ñ?амоÑ?Ñ?оÑ?Ñ?елÑ?но.</string>
-  <string name="wizard_configure_all">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?е пÑ?иложениÑ? Ñ?еÑ?ез Tor</string>
-  <string name="wizard_configure_select_apps">Ð?апÑ?авлÑ?Ñ?Ñ? вÑ?бÑ?аннÑ?е пÑ?иложениÑ? Ñ?еÑ?ез Tor</string>
-  <string name="wizard_tips_tricks">Orbot-задейÑ?Ñ?вованнÑ?е пÑ?иложениÑ?</string>
-  <string name="wizard_tips_msg">Ð?Ñ? Ñ?овеÑ?Ñ?ем вам Ñ?каÑ?аÑ?Ñ? и иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ?, коÑ?оÑ?Ñ?е Ñ?меÑ?Ñ? Ñ?абоÑ?аÑ?Ñ? напÑ?Ñ?мÑ?Ñ? Ñ?еÑ?ез Orbot. Ð?ажмиÑ?е на кнопки ниже, Ñ?Ñ?обÑ? запÑ?Ñ?Ñ?иÑ?Ñ? пÑ?оÑ?еÑ?Ñ? Ñ?Ñ?Ñ?ановки.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - заÑ?иÑ?Ñ?ннÑ?й обмен Ñ?ообÑ?ениÑ?ми в Android</string>
-  <string name="wizard_tips_proxy">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и: Ñ?знайÑ?е, как наÑ?Ñ?Ñ?оиÑ?Ñ? пÑ?иложениÑ? длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot</string>
-  <string name="wizard_tips_duckgo">Ð?Ñ?иложение поиÑ?ковой Ñ?иÑ?Ñ?емÑ? DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Twitter поддеÑ?живаеÑ? http-пÑ?окÑ?и \"localhost:8118\"</string>
-  <string name="wizard_tips_story_maker">StoryMaker - напиÑ?иÑ?е Ñ?аÑ?Ñ?каз и оÑ?Ñ?авÑ?Ñ?е его Tor длÑ? обеÑ?пеÑ?ениÑ? безопаÑ?ноÑ?Ñ?и!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?аÑ?Ñ?Ñ?ойки пÑ?окÑ?и</string>
-  <string name="wizard_proxy_help_msg">Ð?Ñ?ли иÑ?полÑ?зÑ?емое вами пÑ?иложение длÑ? Android поддеÑ?живаеÑ? HTTP или SOCKS-пÑ?окÑ?и, Ñ?о вÑ? можеÑ?е наÑ?Ñ?Ñ?оиÑ?Ñ? его на подклÑ?Ñ?ение к Orbot и иÑ?полÑ?зование Tor.\n\n\nÐ?наÑ?ение Ñ?оÑ?Ñ?а - 127.0.0.1 или \"localhost\". Ð?лÑ? HTTP номеÑ? поÑ?Ñ?а - 8118. Ð?лÑ? SOCKS-пÑ?окÑ?и - 9050. Ð?о возможноÑ?Ñ?и иÑ?полÑ?зÑ?йÑ?е SOCKS4A или SOCKS5.\n \n\n\nÐ?Ñ? можеÑ?е Ñ?знаÑ?Ñ? болÑ?Ñ?е о Ñ?абоÑ?е Ñ?еÑ?ез пÑ?окÑ?и на Android, пÑ?оÑ?иÑ?ав Ñ?Ñ?оÑ? FAQ: http://tinyurl.com/proxyandroid\n </string>
-  <string name="wizard_final">Orbot гоÑ?ов к иÑ?полÑ?зованиÑ?!</string>
-  <string name="wizard_final_msg">Ð?иллионÑ? лÑ?дей во вÑ?Ñ?м миÑ?е иÑ?полÑ?зÑ?Ñ?Ñ? Tor по Ñ?азлиÑ?нÑ?м пÑ?иÑ?инам. Ð?Ñ?Ñ?налиÑ?Ñ?Ñ? и блоггеÑ?Ñ?, пÑ?авозаÑ?иÑ?ники, Ñ?оÑ?Ñ?Ñ?дники пÑ?авооÑ?Ñ?аниÑ?елÑ?нÑ?Ñ? оÑ?ганов, Ñ?олдаÑ?Ñ?, коÑ?поÑ?аÑ?ии, гÑ?аждане Ñ?Ñ?Ñ?ан Ñ? Ñ?епÑ?еÑ?Ñ?ивнÑ?м Ñ?ежимом и пÑ?оÑ?Ñ?о обÑ?Ñ?нÑ?е гÑ?аждане..., а Ñ?епеÑ?Ñ? гоÑ?овÑ? и вÑ?!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?ожалÑ?йÑ?Ñ?а, наÑ?Ñ?Ñ?ойÑ?е Orbot пÑ?ежде Ñ?ем пÑ?иÑ?Ñ?Ñ?пиÑ?Ñ? к иÑ?полÑ?зованиÑ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Ð?Ñ? Ñ?Ñ?пеÑ?но подклÑ?Ñ?илиÑ?Ñ? к Ñ?еÑ?и Tor, но Ñ?Ñ?о Ð?Ð? знаÑ?иÑ?, Ñ?Ñ?о ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во безопаÑ?но. Ð?Ñ? можеÑ?е воÑ?полÑ?зоваÑ?Ñ?Ñ?Ñ? Ñ?Ñ?нкÑ?ией \'Ð?Ñ?овеÑ?ка\' из менÑ?, Ñ?Ñ?обÑ? пÑ?оÑ?еÑ?Ñ?иÑ?оваÑ?Ñ? ваÑ? бÑ?аÑ?зеÑ?.\n\nÐ?оÑ?еÑ?иÑ?е наÑ? Ñ?айÑ? https://guardianproject.info/apps/orbot или оÑ?пÑ?авÑ?Ñ?е пиÑ?Ñ?мо на адÑ?еÑ? help@xxxxxxxxxxxxxxxxxxxx, Ñ?Ñ?обÑ? Ñ?знаÑ?Ñ? болÑ?Ñ?е.</string>
-  <string name="tor_check">ЭÑ?о пÑ?иведÑ?Ñ? к запÑ?Ñ?кÑ? бÑ?аÑ?зеÑ?а, вÑ?бÑ?анного на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве по Ñ?молÑ?аниÑ?, и подклÑ?Ñ?ениÑ? к Ñ?айÑ?Ñ? https://check.torproject.org Ñ? Ñ?елÑ?Ñ? пÑ?овеÑ?ки пÑ?авилÑ?ноÑ?Ñ?и Ñ?абоÑ?Ñ? Orbot и опÑ?еделениÑ?, подклÑ?Ñ?енÑ? ли вÑ? к Ñ?еÑ?и Tor.</string>
-  <string name="pref_hs_group">СкÑ?Ñ?Ñ?Ñ?е Ñ?лÑ?жбÑ?</string>
-  <string name="pref_general_group">Ð?бÑ?ие</string>
-  <string name="pref_start_boot_title">Ð?апÑ?Ñ?каÑ?Ñ? Orbot пÑ?и загÑ?Ñ?зке</string>
-  <string name="pref_start_boot_summary">Ð?вÑ?омаÑ?иÑ?еÑ?ки запÑ?Ñ?каÑ?Ñ? Orbot и подклÑ?Ñ?аÑ?Ñ?Ñ?Ñ? к Ñ?еÑ?и Tor пÑ?и загÑ?Ñ?зке ваÑ?его Android-Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot позволÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? Tor на Android!\n\nTor позволÑ?еÑ? вам заÑ?иÑ?иÑ?Ñ?Ñ?Ñ? оÑ? Ñ?илÑ?Ñ?Ñ?аÑ?ии Ñ?одеÑ?жимого, анализа Ñ?Ñ?аÑ?ика и наблÑ?дениÑ? за Ñ?еÑ?Ñ?Ñ?, коÑ?оÑ?Ñ?е Ñ?Ñ?авÑ?Ñ? под Ñ?гÑ?озÑ? пÑ?иваÑ?ноÑ?Ñ?Ñ?, конÑ?иденÑ?иалÑ?нÑ?Ñ? инÑ?оÑ?маÑ?иÑ? и лиÑ?нÑ?е оÑ?ноÑ?ениÑ?.\n\nЭÑ?оÑ? маÑ?Ñ?еÑ? поможеÑ? вам наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot и Tor на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?Ñ?едÑ?пÑ?еждение</string>
-  <string name="wizard_warning_msg">Сама по Ñ?ебе Ñ?Ñ?Ñ?ановка Orbot не Ñ?делаеÑ? авÑ?омаÑ?иÑ?еÑ?ки ваÑ? мобилÑ?нÑ?й Ñ?Ñ?аÑ?ик анонимнÑ?м.\n\nÐ?Ñ? должнÑ? пÑ?авилÑ?но наÑ?Ñ?Ñ?оиÑ?Ñ? Orbot, ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во и дÑ?Ñ?гие пÑ?иложениÑ?, Ñ?Ñ?о бÑ? Ñ?Ñ?пеÑ?но иÑ?полÑ?зоваÑ?Ñ? Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">РазÑ?еÑ?ениÑ?</string>
-  <string name="wizard_permissions_root_msg1">Ð?Ñ? Ñ?ак же можеÑ?е по желаниÑ? даÑ?Ñ? Orbot пÑ?ава \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\' длÑ? доÑ?Ñ?Ñ?па к дополниÑ?елÑ?нÑ?м возможноÑ?Ñ?Ñ?м Ñ?ипа пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии.</string>
-  <string name="wizard_permissions_root_msg2">Ð?Ñ?ли вÑ? не Ñ?оÑ?иÑ?е делаÑ?Ñ? Ñ?Ñ?о, пожалÑ?йÑ?Ñ?а, Ñ?доÑ?Ñ?овеÑ?Ñ?Ñ?еÑ?Ñ?, Ñ?Ñ?о иÑ?полÑ?зÑ?еÑ?е пÑ?иложениÑ?, Ñ?озданнÑ?е длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Ð?оÑ?оже, ваÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во не имееÑ? root-пÑ?ав и не пÑ?едоÑ?Ñ?авлÑ?еÑ? доÑ?Ñ?Ñ?п \'СÑ?пеÑ?полÑ?зоваÑ?елÑ?\'.\n\nЧÑ?обÑ? иÑ?полÑ?зоваÑ?Ñ? Tor, вам надо иÑ?полÑ?зоваÑ?Ñ? пÑ?иложениÑ?, поÑ?Ñ?Ñ?оеннÑ?е длÑ? Ñ?абоÑ?Ñ? Ñ? Orbot или Ñ?е, коÑ?оÑ?Ñ?е поддеÑ?живаÑ?Ñ? иÑ?полÑ?зование HTTP или SOCKS-пÑ?окÑ?и.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?Ñ?иложениÑ?, Ñ?абоÑ?аÑ?Ñ?ие Ñ? Orbot:</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: пÑ?иложение длÑ? безопаÑ?ной пеÑ?епиÑ?ки Ñ? конÑ?иденÑ?иалÑ?нÑ?м Ñ?иÑ?Ñ?ованием</string>
-  <string name="wizard_tips_orweb">Orfox: конÑ?иденÑ?иалÑ?нÑ?й бÑ?аÑ?зеÑ?, Ñ?абоÑ?аÑ?Ñ?ий Ñ?еÑ?ез Tor</string>
-  <string name="wizard_tips_play">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?айÑ?и вÑ?е пÑ?иложениÑ? Guardian Project на Ñ?айÑ?е https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?озÑ?аÑ?ное пÑ?окÑ?иÑ?ование</string>
-  <string name="wizard_transproxy_msg">ЭÑ?о позволÑ?еÑ? ваÑ?им пÑ?иложениÑ?м авÑ?омаÑ?иÑ?еÑ?ки Ñ?абоÑ?аÑ?Ñ? по Ñ?еÑ?и Tor без какого-либо конÑ?игÑ?Ñ?иÑ?ованиÑ?.</string>
-  <string name="wizard_transproxy_hint">(Ð?Ñ?меÑ?Ñ?Ñ?е даннÑ?й пÑ?нкÑ?, еÑ?ли вÑ? не знаеÑ?е о Ñ?Ñ?м идÑ?Ñ? Ñ?еÑ?Ñ?)</string>
-  <string name="wizard_transproxy_none">Ð?еÑ?</string>
-  <string name="pref_transparent_tethering_title">ТеÑ?еÑ?инг Tor</string>
-  <string name="pref_transparent_tethering_summary">Ð?клÑ?Ñ?иÑ?Ñ? пÑ?озÑ?аÑ?нÑ?Ñ? пÑ?окÑ?иÑ?икаÑ?иÑ? Tor длÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?в Ñ? Ñ?еÑ?еÑ?ингом по Wi-Fi и USB (Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? пеÑ?езапÑ?Ñ?к)</string>
-  <string name="button_grant_superuser">Ð?апÑ?оÑ?иÑ?Ñ? доÑ?Ñ?Ñ?п СÑ?пеÑ?полÑ?зоваÑ?елÑ?</string>
-  <string name="pref_select_apps">Ð?Ñ?бÑ?аннÑ?е пÑ?иложениÑ?</string>
-  <string name="pref_select_apps_summary">Ð?Ñ?бÑ?аÑ?Ñ? пÑ?иложениÑ? длÑ? напÑ?авлениÑ? Ñ?еÑ?ез Tor</string>
-  <string name="pref_node_configuration">Ð?онÑ?игÑ?Ñ?аÑ?иÑ? Ñ?зла</string>
-  <string name="pref_node_configuration_summary">ЭÑ?о дополниÑ?елÑ?нÑ?е наÑ?Ñ?Ñ?ойки, коÑ?оÑ?Ñ?е могÑ?Ñ? Ñ?низиÑ?Ñ? ваÑ?Ñ? анонимноÑ?Ñ?Ñ?</string>
-  <string name="pref_entrance_node">Ð?Ñ?однÑ?е Ñ?злÑ?</string>
-  <string name="pref_entrance_node_summary">Ð?Ñ?пеÑ?аÑ?ки, пÑ?евдонимÑ?, Ñ?Ñ?Ñ?анÑ? и адÑ?еÑ?а длÑ? пеÑ?вого пÑ?Ñ?жка</string>
-  <string name="pref_entrance_node_dialog">Ð?ведиÑ?е вÑ?однÑ?е Ñ?злÑ?</string>
-  <string name="pref_allow_background_starts_title">РазÑ?еÑ?иÑ?Ñ? Ñ?оновÑ?Ñ? загÑ?Ñ?зкÑ?</string>
-  <string name="pref_allow_background_starts_summary">Ð?озволиÑ?Ñ? лÑ?бомÑ? пÑ?иложениÑ? Ñ?Ñ?ебоваÑ?Ñ? оÑ? Orbot запÑ?Ñ?каÑ?Ñ? Tor и оÑ?ноÑ?Ñ?Ñ?иеÑ?Ñ? к немÑ? Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="button_proxy_all">Ð?Ñ?окÑ?иÑ?оваÑ?Ñ? вÑ?Ñ?</string>
-  <string name="button_proxy_none">Ð?е пÑ?окÑ?иÑ?оваÑ?Ñ? </string>
-  <string name="button_invert_selection">Ð?нвеÑ?Ñ?иÑ?оваÑ?Ñ? вÑ?деленное</string>
-  <string name="pref_proxy_title">Ð?Ñ?Ñ?одÑ?Ñ?ий Ñ?еÑ?евой пÑ?окÑ?и (необÑ?заÑ?елÑ?но)</string>
-  <string name="pref_proxy_type_title">Тип пÑ?окÑ?и</string>
-  <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол длÑ? иÑ?полÑ?зованиÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?ом: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Ð?ведиÑ?е Ñ?ип пÑ?окÑ?и</string>
-  <string name="pref_proxy_host_title">ХоÑ?Ñ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_host_summary">Ð?мÑ? Ñ?оÑ?Ñ?а пÑ?окÑ?и-Ñ?еÑ?веÑ?а</string>
-  <string name="pref_proxy_host_dialog">Ð?ведиÑ?е Ñ?оÑ?Ñ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_port_title">Ð?оÑ?Ñ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_port_summary">Ð?оÑ?Ñ? пÑ?окÑ?и-Ñ?еÑ?веÑ?а</string>
-  <string name="pref_proxy_port_dialog">Ð?ведиÑ?е поÑ?Ñ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_username_title">Ð?мÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_username_summary">Ð?мÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?а (необÑ?заÑ?елÑ?но)</string>
-  <string name="pref_proxy_username_dialog">Ð?ведиÑ?е имÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_password_title">Ð?аÑ?олÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и</string>
-  <string name="pref_proxy_password_summary">Ð?аÑ?олÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и-Ñ?еÑ?веÑ?а (необÑ?заÑ?елÑ?но)</string>
-  <string name="pref_proxy_password_dialog">Ð?ведиÑ?е паÑ?олÑ? полÑ?зоваÑ?елÑ? пÑ?окÑ?и</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">УÑ?Ñ?ановка обÑ?ей пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии...</string>
-  <string name="setting_up_app_based_transparent_proxying_">УÑ?Ñ?ановка оÑ?нованной на пÑ?иложениÑ?Ñ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?озÑ?аÑ?наÑ? пÑ?окÑ?иÑ?икаÑ?иÑ? Ð?Ð?Ð?ЮЧÐ?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">Ð?Ñ?озÑ?аÑ?нÑ?й пÑ?окÑ?и поддеÑ?живаеÑ? Ñ?еÑ?еÑ?инг!</string>
-  <string name="warning_error_starting_transparent_proxying_">Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?: оÑ?ибка запÑ?Ñ?ка пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии!</string>
-  <string name="transproxy_rules_cleared">Ð?Ñ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и Ñ?даленÑ?</string>
-  <string name="couldn_t_start_tor_process_">Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo Ñ?абоÑ?аеÑ? на поÑ?Ñ?Ñ?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">УÑ?Ñ?ановка оÑ?нованной на поÑ?Ñ?аÑ? пÑ?озÑ?аÑ?ной пÑ?окÑ?иÑ?икаÑ?ии...</string>
-  <string name="bridge_error">Ð?Ñ?ибка моÑ?Ñ?а</string>
-  <string name="bridge_requires_ip">Ð?лÑ? иÑ?полÑ?зованиÑ? необÑ?одимо задаÑ?Ñ? IP-адÑ?еÑ? как минимÑ?м одного моÑ?Ñ?а.</string>
-  <string name="send_email_for_bridges">Ð?Ñ?пÑ?авÑ?Ñ?е пиÑ?Ñ?мо на адÑ?еÑ? bridges@xxxxxxxxxxxxxx Ñ?о Ñ?Ñ?Ñ?окой \"get bridges\" в Ñ?еле Ñ?ообÑ?ениÑ? из Ñ?Ñ?Ñ?Ñ?ной запиÑ?и GMail.</string>
-  <string name="error">Ð?Ñ?ибка</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?и наÑ?Ñ?Ñ?ойки доÑ?Ñ?Ñ?пнÑ?Ñ? адÑ?еÑ?ов вÑ?звали иÑ?клÑ?Ñ?ение!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?и наÑ?Ñ?Ñ?ойки доÑ?Ñ?Ñ?пнÑ?Ñ? адÑ?еÑ?ов вÑ?звали иÑ?клÑ?Ñ?ение!</string>
   <string name="your_relay_settings_caused_an_exception_">Ð?аÑ?Ñ?Ñ?ойки ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а вÑ?звали иÑ?клÑ?Ñ?ение!</string>
-  <string name="exit_nodes">Ð?Ñ?Ñ?однÑ?е Ñ?злÑ?</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ð?Ñ?пеÑ?аÑ?ки, пÑ?евдонимÑ?, Ñ?Ñ?Ñ?анÑ? и адÑ?еÑ?а длÑ? поÑ?леднего пÑ?Ñ?жка</string>
-  <string name="enter_exit_nodes">Ð?ведиÑ?е вÑ?Ñ?однÑ?е Ñ?злÑ?</string>
-  <string name="exclude_nodes">Ð?Ñ?клÑ?Ñ?Ñ?ннÑ?е Ñ?злÑ?</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ð?Ñ?пеÑ?аÑ?ки, пÑ?евдонимÑ?, Ñ?Ñ?Ñ?анÑ? и адÑ?еÑ?а на иÑ?клÑ?Ñ?ение</string>
-  <string name="enter_exclude_nodes">Ð?ведиÑ?е иÑ?клÑ?Ñ?Ñ?ннÑ?е Ñ?злÑ?</string>
-  <string name="strict_nodes">ТоÑ?нÑ?е Ñ?злÑ?</string>
-  <string name="use_only_these_specified_nodes">Ð?Ñ?полÑ?зоваÑ?Ñ? *Ñ?олÑ?ко* Ñ?Ñ?и заданнÑ?е Ñ?злÑ?</string>
-  <string name="bridges">Ð?оÑ?Ñ?Ñ?</string>
-  <string name="use_bridges">Ð?Ñ?полÑ?зоваÑ?Ñ? моÑ?Ñ?Ñ?</string>
-  <string name="bridges_obfuscated">Ð?бÑ?Ñ?Ñ?Ñ?иÑ?ованнÑ?е моÑ?Ñ?Ñ?</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?клÑ?Ñ?иÑ?Ñ? алÑ?Ñ?еÑ?наÑ?ивнÑ?е вÑ?однÑ?е Ñ?злÑ? в Ñ?еÑ?Ñ? Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?аданнÑ?е моÑ?Ñ?Ñ? обÑ?Ñ?Ñ?Ñ?иÑ?ованÑ?</string>
-  <string name="ip_address_and_port_of_bridges">IP-адÑ?еÑ?а и поÑ?Ñ?Ñ? моÑ?Ñ?ов</string>
-  <string name="enter_bridge_addresses">Ð?ведиÑ?е адÑ?еÑ?а моÑ?Ñ?ов</string>
-  <string name="relays">РеÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ?</string>
-  <string name="relaying">РеÑ?Ñ?анÑ?лÑ?Ñ?иÑ?</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">РазÑ?еÑ?иÑ?Ñ? ваÑ?емÑ? Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?вÑ? бÑ?Ñ?Ñ? невÑ?Ñ?однÑ?м Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом</string>
-  <string name="relay_port">Ð?оÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</string>
-  <string name="listening_port_for_your_tor_relay">СлÑ?Ñ?аÑ?Ñ?ий поÑ?Ñ? длÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Tor</string>
-  <string name="enter_or_port">Ð?ведиÑ?е поÑ?Ñ? OR</string>
-  <string name="relay_nickname">Ð?мÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</string>
-  <string name="the_nickname_for_your_tor_relay">Ð?мÑ? длÑ? ваÑ?его Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Tor</string>
-  <string name="enter_a_custom_relay_nickname">Ð?ведиÑ?е полÑ?зоваÑ?елÑ?Ñ?кое имÑ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</string>
-  <string name="reachable_addresses">Ð?оÑ?Ñ?Ñ?пнÑ?е адÑ?еÑ?а</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ð?апÑ?Ñ?каÑ?Ñ? как клиенÑ? за межÑ?еÑ?евÑ?м Ñ?кÑ?аном Ñ? огÑ?аниÑ?иваÑ?Ñ?ими полиÑ?иками</string>
-  <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пнÑ?е поÑ?Ñ?Ñ?</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?Ñ?, доÑ?Ñ?Ñ?пнÑ?е из-за огÑ?аниÑ?иÑ?елÑ?ного Ñ?еÑ?евого Ñ?кÑ?ана</string>
-  <string name="enter_ports">Ð?ведиÑ?е поÑ?Ñ?Ñ?</string>
-  <string name="enable_hidden_services">Ð?клÑ?Ñ?иÑ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?е Ñ?лÑ?жбÑ?</string>
-  <string name="run_servers_accessible_via_the_tor_network">Ð?апÑ?Ñ?Ñ?иÑ?Ñ? Ñ?еÑ?веÑ?а, доÑ?Ñ?Ñ?пнÑ?е Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ð?ведиÑ?е локалÑ?нÑ?е поÑ?Ñ?Ñ? длÑ? Ñ?кÑ?Ñ?Ñ?Ñ?Ñ? Ñ?лÑ?жб</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ð?дÑ?еÑ?Ñ?емое имÑ? длÑ? ваÑ?ей Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ? (Ñ?оздаÑ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?еÑ?ки)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Ð?клÑ?Ñ?иÑ?Ñ? вÑ?вод жÑ?Ñ?нала оÑ?ладки (Ñ?Ñ?ебÑ?еÑ? иÑ?полÑ?зоваÑ?Ñ? adb или aLogCat длÑ? пÑ?оÑ?моÑ?Ñ?а)</string>
-  <string name="project_home">Ð?омаÑ?нÑ?Ñ? Ñ?Ñ?Ñ?аниÑ?а пÑ?оекÑ?а: </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ð?иÑ?ензиÑ? Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Ð?Ñ?огÑ?аммÑ? Ñ?Ñ?оÑ?онниÑ? Ñ?азÑ?абоÑ?Ñ?иков: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Ð?Ñ?иложение Ñ?оÑ?еÑ? оÑ?кÑ?Ñ?Ñ?Ñ? Ñ?кÑ?Ñ?Ñ?Ñ?й поÑ?Ñ? Ñ?еÑ?веÑ?а %S Ñ?еÑ?и Tor. ЭÑ?о безопаÑ?но, еÑ?ли вÑ? довеÑ?Ñ?еÑ?е данномÑ? пÑ?иложениÑ?.</string>
-  <string name="found_existing_tor_process">найден Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий пÑ?оÑ?еÑ?Ñ? Tor...</string>
+    <string name="found_existing_tor_process">найден Ñ?Ñ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ?ий пÑ?оÑ?еÑ?Ñ? Tor...</string>
   <string name="something_bad_happened">Ð?Ñ?оизоÑ?ла какаÑ?-Ñ?о оÑ?ибка. Ð?Ñ?овеÑ?Ñ?Ñ?е жÑ?Ñ?нал.</string>
-  <string name="hidden_service_on">Ñ?кÑ?Ñ?Ñ?аÑ? Ñ?лÑ?жба на:</string>
-  <string name="unable_to_read_hidden_service_name">невозможно пÑ?оÑ?иÑ?аÑ?Ñ? имÑ? Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ?</string>
+    <string name="unable_to_read_hidden_service_name">невозможно пÑ?оÑ?иÑ?аÑ?Ñ? имÑ? Ñ?кÑ?Ñ?Ñ?ой Ñ?лÑ?жбÑ?</string>
   <string name="unable_to_start_tor">Ð?евозможно запÑ?Ñ?Ñ?иÑ?Ñ? Tor:</string>
-  <string name="unable_to_reset_tor">Ð?еÑ?езагÑ?Ñ?зиÑ?е Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?во, невозможно пеÑ?еÑ?Ñ?Ñ?ановиÑ?Ñ? Tor!</string>
-  <string name="pref_use_sys_iptables_title">Ð?Ñ?полÑ?зоваÑ?Ñ? Iptables по Ñ?молÑ?аниÑ?</string>
-  <string name="pref_use_sys_iptables_summary">Ð?Ñ?полÑ?зоваÑ?Ñ? вÑ?Ñ?Ñ?оеннÑ?й Ñ?айл iptables вмеÑ?Ñ?о поÑ?Ñ?авлÑ?емого Ñ? Orbot</string>
-  <string name="error_installing_binares">Ð?Ñ?полнÑ?емÑ?е Ñ?айлÑ? Tor не Ñ?могли Ñ?Ñ?Ñ?ановиÑ?Ñ?Ñ?Ñ? или обновиÑ?Ñ?Ñ?.</string>
-  <string name="pref_use_persistent_notifications">Ð?Ñ?егда оÑ?обÑ?ажаÑ?Ñ? иконкÑ? в панели задаÑ? когда Orbot подклÑ?Ñ?ен</string>
-  <string name="pref_use_persistent_notifications_title">Ð?оÑ?Ñ?оÑ?нное Ñ?ведомление о Ñ?абоÑ?е</string>
-  <string name="pref_use_expanded_notifications">Ð?оказаÑ?Ñ? Ñ?аÑ?Ñ?иÑ?енное Ñ?ведомление Tor Ñ?о Ñ?Ñ?Ñ?аной вÑ?Ñ?ода и IP</string>
-  <string name="pref_use_expanded_notifications_title">РаÑ?Ñ?иÑ?еннÑ?е Ñ?ведомлениÑ?</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?Ñ? вклÑ?Ñ?енÑ?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">ЯзÑ?к</string>
-  <string name="set_locale_summary">Ð?Ñ?бÑ?аÑ?Ñ? Ñ?зÑ?к инÑ?еÑ?Ñ?ейÑ?а длÑ? Orbot</string>
-  <string name="wizard_locale_title">Ð?Ñ?бÑ?аÑ?Ñ? Ñ?зÑ?к</string>
-  <string name="wizard_locale_msg">Ð?Ñ?Ñ?авиÑ?Ñ? по Ñ?молÑ?аниÑ? или пеÑ?еклÑ?Ñ?иÑ?Ñ? Ñ?екÑ?Ñ?ий Ñ?зÑ?к</string>
-  <string name="powered_by">оÑ?новано на Tor</string>
-  <string name="btn_save_settings">СоÑ?Ñ?аниÑ?Ñ? наÑ?Ñ?Ñ?ойки</string>
-  <string name="no_internet_connection_tor">Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? подклÑ?Ñ?ение к инÑ?еÑ?неÑ?Ñ?, Tor наÑ?одиÑ?Ñ?Ñ? в Ñ?ежиме ожиданиÑ?â?¦</string>
-  <string name="bandwidth_">Ð?анал:</string>
-  <string name="down">к нам</string>
-  <string name="up">оÑ? наÑ?</string>
-  <string name="pref_disable_network_title">Ð?вÑ?озаÑ?Ñ?пание без Ñ?еÑ?и</string>
-  <string name="pref_disable_network_summary">Ð?еÑ?еводиÑ?Ñ? Tor в Ñ?пÑ?Ñ?ий Ñ?ежим пÑ?и оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вии инÑ?еÑ?неÑ?а</string>
-  <string name="newnym">Ð?Ñ? пеÑ?еклÑ?Ñ?илиÑ?Ñ? на новÑ?й иденÑ?иÑ?икаÑ?оÑ? Tor!</string>
-  <string name="menu_verify_browser">Ð?Ñ?овеÑ?иÑ?Ñ? бÑ?аÑ?зеÑ?</string>
-  <string name="menu_use_chatsecure">Ð?Ñ?полÑ?зоваÑ?Ñ? ChatSecure</string>
-  <string name="permission_manage_tor_label">УпÑ?авление Tor</string>
-  <string name="permission_manage_tor_description">РазÑ?еÑ?иÑ?Ñ? пÑ?иложениÑ? Ñ?пÑ?авлÑ?Ñ?Ñ? Ñ?еÑ?виÑ?ом Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Ð?е поÑ?оже, Ñ?Ñ?о Ñ? ваÑ? Ñ?Ñ?Ñ?ановлен Orfox. ХоÑ?иÑ?е Ñ?пÑ?авкÑ? на Ñ?Ñ?Ñ? Ñ?емÑ? или пÑ?оÑ?Ñ?о оÑ?кÑ?Ñ?Ñ?Ñ? бÑ?аÑ?зеÑ??</string>
-  <string name="install_apps_">УÑ?Ñ?ановиÑ?Ñ? пÑ?иложениÑ??</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?еÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?и. Tor вÑ?одиÑ? в Ñ?ежим Ñ?на...</string>
+    <string name="no_internet_connection_tor">Ð?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ? подклÑ?Ñ?ение к инÑ?еÑ?неÑ?Ñ?, 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="wizard_tips_martus">Mobile Martus -  пÑ?иложение Benetech докÑ?менÑ?аÑ?иÑ? по пÑ?авам Ñ?еловека </string>
-  <string name="your_tor_public_ips_">Ð?аÑ?и пÑ?блиÑ?нÑ?е IP-адÑ?еÑ?а Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?ожалÑ?йÑ?Ñ?а, оÑ?клÑ?Ñ?иÑ?е Ñ?Ñ?Ñ? пÑ?огÑ?аммÑ? в Android-&gt;Ð?аÑ?Ñ?Ñ?ойки-&gt;Ð?Ñ?иложениÑ?, еÑ?ли Ñ? ваÑ? возникли пÑ?облемÑ? Ñ? Orbot:</string>
-  <string name="app_conflict"> Ð?онÑ?ликÑ? пÑ?иложений</string>
-  <string name="pref_transproxy_refresh_title">Ð?вÑ?ообновление пÑ?озÑ?аÑ?ного пÑ?окÑ?и</string>
-  <string name="pref_transproxy_refresh_summary">Ð?овÑ?оÑ?но пÑ?имениÑ?Ñ? пÑ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и пÑ?и изменении Ñ?оÑ?Ñ?оÑ?ниÑ? Ñ?еÑ?и</string>
-  <string name="pref_transproxy_flush_title">Ð?РÐ?Ð?УÐ?Ð?ТÐ?Ð?ЬÐ?Ð?Ð? УÐ?Ð?Ð?Ð?Ð?Ð?Ð? пÑ?озÑ?аÑ?ного пÑ?окÑ?и</string>
-  <string name="pref_transproxy_flush_summary">Ð?ажмиÑ?е здеÑ?Ñ?, Ñ?Ñ?обÑ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? оÑ?иÑ?Ñ?иÑ?Ñ? вÑ?е Ñ?еÑ?евÑ?е пÑ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и</string>
-  <string name="transparent_proxy_rules_flushed_">Ð?Ñ?авила пÑ?озÑ?аÑ?ного пÑ?окÑ?и Ñ?даленÑ?!</string>
-  <string name="you_do_not_have_root_access_enabled">У ваÑ? не вклÑ?Ñ?Ñ?н root-доÑ?Ñ?Ñ?п</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?озможно, поÑ?Ñ?ебÑ?еÑ?Ñ?Ñ? оÑ?Ñ?ановиÑ?Ñ? и запÑ?Ñ?Ñ?иÑ?Ñ? Orbot заново длÑ? подклÑ?Ñ?ениÑ? изменений наÑ?Ñ?Ñ?оек.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">кбиÑ?/Ñ?</string>
-  <string name="mbps">мбиÑ?/Ñ?</string>
-  <string name="kb">Ð?Ð?</string>
-  <string name="mb">Ð?Ð?</string>
-  <string name="bridges_updated">Ð?оÑ?Ñ?Ñ? обновленÑ?</string>
-  <string name="restart_orbot_to_use_this_bridge_">Ð?ожалÑ?йÑ?Ñ?а, пеÑ?езапÑ?Ñ?Ñ?иÑ?е Orbot длÑ? вÑ?Ñ?Ñ?плениÑ? изменениÑ? в Ñ?илÑ?</string>
-  <string name="menu_qr">QR-кодÑ?</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Ð?Ñ?ли ваÑ?а Ñ?еÑ?Ñ? мобилÑ?ной Ñ?вÑ?зи акÑ?ивно блокиÑ?Ñ?еÑ? Tor, вÑ? можеÑ?е иÑ?полÑ?зоваÑ?Ñ? моÑ?Ñ?Ñ? Tor длÑ? доÑ?Ñ?Ñ?па к Ñ?еÑ?и. Ð?Ñ?беÑ?иÑ?е один из Ñ?ипов моÑ?Ñ?ов вÑ?Ñ?е, Ñ?Ñ?обÑ? вклÑ?Ñ?иÑ?Ñ? Ñ?Ñ?Ñ? Ñ?Ñ?нкÑ?иÑ?.</string>
-  <string name="bridge_mode">Режим моÑ?Ñ?а</string>
-  <string name="get_bridges_email">Эл. поÑ?Ñ?а</string>
-  <string name="get_bridges_web">СайÑ?</string>
-  <string name="activate">Ð?кÑ?иваÑ?иÑ?</string>
-  <string name="apps_mode">VPN-Ñ?ежим пÑ?иложений</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?Ñ? можеÑ?е вклÑ?Ñ?иÑ?Ñ? Ñ?Ñ?нкÑ?иÑ? пеÑ?енапÑ?авлениÑ? вÑ?еÑ? пÑ?иложений на ваÑ?ем Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ве Ñ?еÑ?ез Ñ?еÑ?Ñ? Tor, иÑ?полÑ?зÑ?Ñ? Ñ?Ñ?нкÑ?иÑ? VPN в Android.\n\n* Ð?РÐ?Ð?УÐ?РÐ?Ð?Ð?Ð?Ð?Ð?Ð? * ЭÑ?о новаÑ? Ñ?кÑ?пеÑ?именÑ?алÑ?наÑ? Ñ?Ñ?нкÑ?иÑ? и в некоÑ?оÑ?Ñ?Ñ? Ñ?лÑ?Ñ?аÑ?Ñ? можеÑ? оÑ?Ñ?ановиÑ?Ñ?Ñ?Ñ? или не запÑ?Ñ?Ñ?иÑ?Ñ?Ñ?Ñ? авÑ?омаÑ?иÑ?еÑ?ки. Ð?на не должна бÑ?Ñ?Ñ? иÑ?полÑ?зована длÑ? анонимноÑ?Ñ?и, а ТÐ?Ð?ЬÐ?Ð? длÑ? пÑ?оÑ?ождениÑ? Ñ?илÑ?Ñ?Ñ?ов и межÑ?еÑ?евÑ?Ñ? Ñ?кÑ?анов.</string>
-  <string name="send_email">Ð?Ñ?пÑ?авиÑ?Ñ? пиÑ?Ñ?мо</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ð?Ñ? можеÑ?е полÑ?Ñ?иÑ?Ñ? адÑ?еÑ? моÑ?Ñ?а по Ñ?лекÑ?Ñ?онной поÑ?Ñ?е, Ñ? Ñ?айÑ?а или пÑ?Ñ?Ñ?м Ñ?каниÑ?ованиÑ? QR-кода. Ð?Ñ?беÑ?иÑ?е \"Эл. поÑ?Ñ?а\" или \"СайÑ?\" ниже, Ñ?Ñ?обÑ? запÑ?оÑ?иÑ?Ñ? адÑ?еÑ? моÑ?Ñ?а.\n\nÐ?олÑ?Ñ?еннÑ?й адÑ?еÑ? Ñ?копиÑ?Ñ?йÑ?е и вÑ?Ñ?авÑ?Ñ?е его в Ñ?азделе наÑ?Ñ?Ñ?оек Orbot \"Ð?оÑ?Ñ?Ñ?\", поÑ?ле Ñ?его пеÑ?езапÑ?Ñ?Ñ?иÑ?е пÑ?иложение.</string>
-  <string name="install_orweb">УÑ?Ñ?ановиÑ?Ñ? Orfox</string>
-  <string name="standard_browser">СÑ?андаÑ?Ñ?нÑ?й бÑ?аÑ?зеÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?РÐ?Ð?Ð?ЧÐ?Ð?Ð?Ð?: Ñ?олÑ?ко Ñ?Ñ?андаÑ?Ñ?нÑ?е моÑ?Ñ?Ñ? Tor Ñ?абоÑ?аÑ?Ñ? на Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ваÑ? Intel X86/Atom</string>
-  <string name="vpn_default_world">Ð?иÑ?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-si-rLK/strings.xml b/orbotservice/src/main/res/values-si-rLK/strings.xml
index dfda50a4..ff1136a3 100644
--- a/orbotservice/src/main/res/values-si-rLK/strings.xml
+++ b/orbotservice/src/main/res/values-si-rLK/strings.xml
@@ -1,190 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor �රම�භ ��ර�ම �� න��ත�ම</string>
-  <string name="tor_proxy_service_process">Tor න�ය�ත� ���� </string>
-  <string name="status_starting_up">Orbot �රම�භ �රම�න��</string>
+    <string name="status_starting_up">Orbot �රම�භ �රම�න��</string>
   <string name="status_activated">Tor ජ�ලයට �බ�ද�ය�</string>
   <string name="status_disabled">Orbot à¶?à·?â??රà·?යà·?à·?à·?රà·?à·?ත à¶?ර à¶?ත </string>
   <string name="tor_process_starting">Tor ද�ය�ය� �රම�භ �රම�න�...</string>
   <string name="tor_process_complete">�ම�ප�ර�ණය�.</string>
-  <string name="tor_process_waiting">ර�ද� ��ට�ය�.</string>
-  <string name="not_anonymous_yet">à¶?à·?à·?à·?දයයà·?: à¶?බà·? à¶?නà·?දà·?නà·? තà·?ම නà·?රà·?නà·?මà·?à¶? නà·?මà·?ත. à¶?රà·?ණà·?à¶?ර à¶?බà·? යà·?දà·?මà·? à·?දà·?à·? HTTP proxy 127.0.0.1:8118 à·?à·? SOCKS4A à·?à·? SOCKS5 proxy 127.0.0.1:9050 භà·?à·?à·?තà·? à·?න පරà·?දà·? à·?à·?නà·?â??යà·?à·? à¶?රà¶?නà·?න.</string>
-  <string name="menu_home">ම�ල�ප�ට��</string>
-  <string name="menu_browse">ප�ර����න�න</string>
-  <string name="menu_settings">��ට��ම�</string>
-  <string name="menu_log">ල��ය </string>
-  <string name="menu_info">�ද��</string>
-  <string name="menu_start">�රඹන�න</string>
-  <string name="menu_stop">න�ත��න�න</string>
-  <string name="menu_about">ප���බද</string>
-  <string name="main_layout_download">භ��ත �රන�න </string>
-  <string name="main_layout_upload">�ඩ��ත �රන�න </string>
-  <string name="button_help">�ද��</string>
-  <string name="button_close">��න�න</string>
-  <string name="button_about">ප���බද</string>
-  <string name="button_clear_log">ල��ය ���� �රන�න </string>
-  <string name="menu_verify">පර����� �රන�න</string>
-  <string name="menu_exit">��ත� �න�න</string>
-  <string name="press_to_start">- �රම�භ ��ර�මට ට�� ��ල���� තද�රන�න -</string>
-  <string name="pref_trans_proxy_group">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? (මà·?ලය à¶?à·?à·?à·?â??ය à·?à·?)</string>
-  <string name="pref_trans_proxy_title">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·?</string>
-  <string name="pref_trans_proxy_summary">යà·?මà·?නà·? à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? ටà·?රà·?à¶?රණය </string>
-  <string name="pref_transparent_all_title">Tor ��යල�ල</string>
-  <string name="pref_transparent_all_summary">Tor ත�ල ��ය�� ය�ම��ලට ප�ත�න න�ය�ත����� තදබදය</string>
-  <string name="pref_transparent_port_fallback_title">ප�ට න�ය�ත����� ප��බ���ම </string>
-  <string name="pref_transparent_port_fallback_summary">à¶?à·?à·?à·?දයයà·?: මà¶?à·?à·?රà·?ය යà·?තà·? පà·?දà·? පà·?ට (80, 443, යනà·?දà·?ය). *භà·?à·?à·?තà·?à·? à·?à·?දà·?à¶?à·?* \'à·?à·?යà·?à·?\' à·?à·? \'යà·?මà·?\' පà·?â??රà¶?à·?ර à·?à·?ඩ නà·?à¶?රනà·?නà·? නමà·? පමණà·?.</string>
-  <string name="pref_transparent_port_title">ප�ට ල�ය���ත�� </string>
-  <string name="pref_transparent_port_summary">නà·?යà·?තà·?à·?à·?à·?à·? à·?දà·?à·? පà·?ට ලà·?යà·?à·?à·?තà·?à·?. *භà·?à·?à·?තà·?à·? à·?à·?දà·?à¶?à·?* \'à·?à·?යà·?à·?\' à·?à·? \'යà·?මà·?\' පà·?â??රà¶?à·?ර à·?à·?ඩ නà·?à¶?රනà·?නà·? නමà·? පමණà·?.</string>
-  <string name="pref_transparent_port_dialog">ප�ට න�ය�ත������ට ��� �රන�න</string>
-  <string name="pref_has_root">මà·?ල පà·?â??රà·?à·?à·?ය à¶?ලà·?ලනà·?න </string>
-  <string name="pref_has_root_summary">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? à·?දà·?à·? මà·?ල පà·?â??රà·?à·?à·?ය à¶?ලà·?ලනà·?න </string>
-  <string name="status_install_success">Tor ද���මයන� ��ර�ථ�� ��ථ�පනය �රන ලද�!</string>
-  <string name="status_install_fail">Tor ද���මය ��න��න� ��ථ�පනය ��ර�මට න����� ��ය. �ර�ණ��ර ල��ය පර������ර tor-assistants@xxxxxxxxxxxxxx ට ද�න�ම� ද�න�න</string>
-  <string name="title_error">ය�ද�ම� ද�� </string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot ප�ල�බද� </string>
-  <string name="btn_next">�ල� </string>
-  <string name="btn_back">ප��ප�ට</string>
-  <string name="btn_finish">����නය� </string>
-  <string name="btn_okay">���ය�</string>
-  <string name="btn_cancel">��ල��� �රන�න</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Orbot ප���බද �ත�ම� ����තර </string>
-  <string name="wizard_permissions_root">�න�ම�ත�ය ල�බ� �ත.</string>
-  <string name="wizard_permissions_stock">Orbot �න�ම�ත�යන� </string>
-  <string name="wizard_premissions_msg_root">�නර��ය�! �බ ම�ල Orbot �ද�� ම�ල �න�ම�ත�යන� �බල �ර �ත� බ� �පට �න��රණය ��ය. �ප ම�ම බලය න�ණ�ත� ල�� භ���ත� ��ර�මට ප�ර�න�ද� ��ම�.</string>
-  <string name="wizard_permissions_msg_stock">à¶?තà·?â??යà·?à·?à·?â??ය නà·?à·?à·?à·?තà·? Orbot à·?ට මà·?ල පà·?â??රà·?à·?à·?ය ලබà·?දà·?මà·?නà·? à¶?ය බලà¶?තà·? මà·?à·?ලමà¶?à·? බà·?ට පතà·?à·?à·?. පà·?ල බà·?තà·?තම භà·?à·?à·?තයà·?නà·? Orbot à·?ට à·?à·?පà·?රà·?බලය ලබà·?දà·?නà·?න!</string>
-  <string name="wizard_permissions_no_root">à¶?බට මà·?ල පà·?â??රà·?à·?à·?ය à·?මà·?බනà·?ධà·? à¶?à·?à·?à·?දà·? à¶?à·?බà·?ධයà¶?à·? නà·?මà·?තà·? නමà·?, Orbot à·?ල à·?ඩà·? à¶?රන යà·?මà·?නà·? පමණà¶?à·? භà·?à·?à·?තà·? à¶?රනà·?න.</string>
-  <string name="wizard_permissions_consent">ම� �ට ��ට��ය�. ��ප�ර� පර���ල�ය� න�ම�ත�� ද��ටම �ර��න ය�මට ��ම�ත�ත�ම�.</string>
-  <string name="wizard_permission_enable_root">Orbot à·?ට මà·?ලය පà·?â??රදà·?නය à¶?රනà·?න </string>
-  <string name="wizard_configure">ටà·?රà·?à¶?රණය à·?à·?නà·?â??යà·?à·? à¶?රනà·?න </string>
-  <string name="wizard_configure_msg">Orbot �බට ��ය�� ය�ම��ල �න�ද�න� Tor ත�ල�න� ය���මට �� �බ� ය�ම� තන� තන�� ත�ර���න�මට ����� ලබ�ද�.</string>
-  <string name="wizard_configure_all">��ය�� ය�ම��ලට ප�ත�න න�ය�ත����� Tor ත�ල�න� ය�න�න </string>
-  <string name="wizard_configure_select_apps">තන� ය�ම�න� Tor �ද�� ත�ර��න�න </string>
-  <string name="wizard_tips_tricks">Orbot �බල �ල ය�ම� </string>
-  <string name="wizard_tips_msg">ප�ත ය�ම� ��ද� �ත�ත� Orbot �ම� ��ඩ ��ර�මට ය. ��ථ�පනය ��ර�ම �ද�� ��� ��� බ�ත�තම මත ��ල��� �රන�න. න�ත��ත� �බට ම�ම ය�ම� Google Play, GuardianProject.info ��බ��ඩ��ය�න� �� F-Droid.org �ල�න� ��ය� �ත ���.</string>
-  <string name="wizard_tips_proxy">නà·?යà·?තà·? à·?à·?à·?à·? à·?à·?ටà·?à·?මà·? - Orbot à·?මà¶? à¶?à·?â??රà·?යà·?à¶?à·?රà·?මට à¶?නà·?à¶?à·? යà·?මà·? à·?à·?නà·?â??යà·?à·? à¶?රන à¶?à¶?à·?රය à·?දà·?රනà·?න </string>
-  <string name="wizard_tips_duckgo">DuckDuckGo à·?à·?à·?à·?මà·? යනà·?තà·?â??ර යà·?දà·?ම </string>
-  <string name="wizard_tips_twitter">Twitter න�ය�ත������ \"localhost\" �ත���ර�යට �� ප�ටය 8118 ට ප���ට��න�න </string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">න�ය�ත� ���� ��ට��ම� </string>
-  <string name="wizard_final">Orbot ��ද�නම�!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">මà·?මà¶?à·?නà·? à¶?බà·? à·?à·?බà·? බà·?â??රà·?à·?à·?රය https://check.torproject.org ට à·?à·?à·?à·?ත à·?à·?. à¶?à·?à·?ට à¶?බට Orbot නà·?à·?à·? ලà·?à·? à·?à·?නà·?â??යà·?à·? à·?à·? à¶?තà·?දà·?යà·? à·?à·? à¶?බ Tor ජà·?ලයට à·?මà·?බනà·?ධ à·?à·? à¶?තà·?දà·?යà·? දà·?à¶?à¶?ත à·?à·?à¶?.</string>
-  <string name="pref_hs_group">�����ණ� ���� �ත���ර �රම�න� </string>
-  <string name="pref_general_group">ප�ද�</string>
-  <string name="pref_start_boot_title">Orbot �රඹ�ම� ධ���ය� �රඹන�න </string>
-  <string name="pref_start_boot_summary">Orbot à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? à¶?රමà·?භ à¶?ර, à¶?බà·? Android à¶?පà¶?රණය පටනà·?à¶?තà·? à·?à·?ට Tor à·?ලට à·?මà·?බනà·?ධ à¶?රà¶?නà·?න.</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">����දයය�</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">�න�ම�ත�ය</string>
-  <string name="wizard_permissions_root_msg1">à¶?බට à¶?à·?à·?à·?â??ය නමà·? Orbot à·?à·?පà·?රà·? පරà·?à·?à·?ලà¶?යà·?ට පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·? à·?à·?à·?à·? à·?à·?නà·? පà·?â??රà¶?මන à·?à·?à·?à·?à·?à·?à¶?à¶? à·?බල à¶?à·?රà·?මට à¶?à·?à·?ර ලබà·?දà·?ය à·?à·?à¶?. </string>
-  <string name="wizard_permissions_root_msg2">à¶?බට මà·?ය à·?à·?දà·? à¶?à·?රà·?මට à¶?à·?à·?à·?â??යතà·?à·?à¶?à·? නà·?මà·?තà·? නමà·?, Orbot à·?ල à·?à·?ඩà·? à¶?රන යà·?මà·?නà·? පමණà¶?à·? භà·?à·?à·?තà·? à¶?රනà·?න.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot �බල �ල ය�ම�</string>
-  <string name="wizard_tips_play">Google Play ත�ල�න� Guardian Project apps ත�ර��න�න </string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·?</string>
-  <string name="wizard_transproxy_msg">මà·?මà¶?à·?නà·? à¶?බà·? යà·?මà·?නà·?ට à¶?à·?à·?à·?දà·? à·?à·?නà·?â??යà·?à¶?රණයà¶?à·? නà·?මà·?තà·?à·? Tor ජà·?ලය à·?රà·?à·? à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? à¶?à·?â??රà·?යà·?තà·?මà¶? à·?à·?ය à·?à·?à¶?.</string>
-  <string name="wizard_transproxy_hint">(�බට �ප �ද�න� �ල �ර�ණ� ප���බද ��බ�ධය�� න�ම�ත� නම� ම�ම ��ට�� �ල��ණ� �රන�න)</string>
-  <string name="wizard_transproxy_none">������� න�ම�ත</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Wi-Fi à·?à·? USB Tethered à¶?පà·?à¶?à¶? à·?දà·?à·? Tor පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·? à·?à·?à·?à·?à·? à·?බල à¶?රනà·?න (නà·?à·?ත à¶?රමà·?භ à¶?à·?රà·?මà¶?à·? à¶?à·?à·?à·?â??යà·?à·?)</string>
-  <string name="button_grant_superuser">à·?à·?පà·?රà·? පරà·?à·?à·?ලà¶?යà·?à¶?à·? පà·?â??රà·?à·?à·?ය à¶?ලà·?ලනà·?න </string>
-  <string name="pref_select_apps">ය�ම�න� ත�ර��න�න </string>
-  <string name="pref_select_apps_summary">Tor �ර�� ය���මට ය�ම�න� ත�ර��න�න </string>
-  <string name="pref_node_configuration">නà·?ඩà·? à·?à·?නà·?â??යà·?à·?à¶?රණය </string>
-  <string name="pref_node_configuration_summary">මà·?à·?à·? à¶?බà·? නà·?රà·?නà·?මà·?à¶?තà·?à·? à¶?ඩà·? à¶?රන පà·?â??රà¶?මන à·?à·?ටà·?à·?මà·? ය.</string>
-  <string name="pref_entrance_node">�ත��� ��ම� න�ඩ� </string>
-  <string name="pref_entrance_node_summary">ප�ම� hop �ද�� ���ල��ල��ණ�, nicks, රට�ල� �� ල�ප�නයන� </string>
-  <string name="pref_entrance_node_dialog">�ත��� ��ම� න�ඩ��ලට ප�����න�න </string>
-  <string name="pref_proxy_title">Outbound ජ�ල න�ය�ත� </string>
-  <string name="pref_proxy_type_title">Outbound න�ය�ත� �ර��ය�� </string>
-  <string name="pref_proxy_type_summary">නà·?යà·?තà·? à·?à·?à·?à·?දà·?යà¶?යනà·? à·?දà·?à·? පà·?â??රà·?ටà·?à¶?à·?ල: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">න�ය�ත� ���� �ර��ය �ත�ලත� �රන�න </string>
-  <string name="pref_proxy_host_title">Outbound න�ය�ත� �ත���රය��  </string>
-  <string name="pref_proxy_host_summary">න�ය�ත� ����ද�ය��� �ත���ර� න�මය </string>
-  <string name="pref_proxy_host_dialog">න�ය�ත����� �ත���රය �ත�ල� �රන�න </string>
-  <string name="pref_proxy_port_title">Outbound න�ය�ත� ප�ර�ටය�� </string>
-  <string name="pref_proxy_port_summary">න�ය�ත� ����ද�ය� ප�ටය</string>
-  <string name="pref_proxy_port_dialog">න�ය�ත� ���� ප�ටය �ත��� �රන�න </string>
-  <string name="status">තත��ය</string>
-  <string name="setting_up_full_transparent_proxying_">à·?මà·?පà·?රà·?ණ පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? පà·?à·?à·?ටà·?à·?à·?ම...</string>
-  <string name="setting_up_app_based_transparent_proxying_">යà·?මà·? පදනමà·? à¶?රà¶?à·?න à¶?à·?â??රà·?යà·?තà·?මà¶? à·?න පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? පà·?à·?à·?ටà·?à·?à·?ම...</string>
-  <string name="transparent_proxying_enabled">පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? à·?බල à¶?ර à¶?ත </string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering �ද�� �බල �ර �ත!</string>
-  <string name="warning_error_starting_transparent_proxying_">à¶?à·?à·?à·?දයයà·?: පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·?à·?à·?නà·? දà·?à·?යà¶?à·? à·?ටà¶?à·?න à¶?ත!</string>
-  <string name="transproxy_rules_cleared">TransProxy ��න�ද��� ��ත� �ර �ත </string>
-  <string name="couldn_t_start_tor_process_">Tor à¶?à·?â??රà·?යà·?à·?ලà·?නà·? à¶?රමà·?භ à¶?à·?රà·?මට නà·?à·?à·?à¶?à·? à·?à·?ය:</string>
-  <string name="setting_up_port_based_transparent_proxying_">පà·?ට පදනමà·? à¶?රà¶?à·?න à¶?à·?â??රà·?යà·?තà·?මà¶? à·?න පà·?රදà·?à·?à·?â??ය නà·?යà·?තà·?à·?à·?à·?à·? පà·?à·?à·?ටà·?à·?à·?ම...</string>
-  <string name="bridge_error">��ත� ද��ය��</string>
-  <string name="bridge_requires_ip">��ත� �������� භ���ත�ය �ද�� �බ �ඩ� තරම�න� ��� ��ත� IP ල�ප�නය�� �� �ත�ලත� �ල ය�ත�ය.</string>
-  <string name="send_email_for_bridges">\"get bridges\" නමà·? පà·?ලà·?ය à·?à·?දà·?â??යà·?තà·? ලà·?පà·?යà·? දà·?à·?යà·? à¶?තà·?ලතà·? à¶?ර gmail à¶?à·?ණà·?මà¶?à·?නà·? bridges@xxxxxxxxxxxxxx ලà·?පà·?නයට යà·?නà·?න.</string>
-  <string name="error">ද��ය��</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">à¶?බà·? à·?à·?නà·?දà·?à·?න ලà·?පà·?නයà·?à·?à·? à·?à·?ටà·?à·?මà·?à·?ල à·?à·?â??යතà·?රà·?à¶?යà¶?à·? à·?ටà¶?à·?න à¶?ත!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor à¶?à·?â??රà·?යà·?à·?ලà·?නà·? à¶?රමà·?භ à¶?à·?රà·?මට නà·?à·?à·?à¶?à·? à·?à·?ය:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">à¶?බà·? à·?à·?නà·?දà·?à·?න ලà·?පà·?නයà·?à·?à·? à·?à·?ටà·?à·?මà·?à·?ල à·?à·?â??යතà·?රà·?à¶?යà¶?à·? à·?ටà¶?à·?න à¶?ත!</string>
   <string name="your_relay_settings_caused_an_exception_">à¶?බà·? පà·?â??රතà·?යà·?ජà¶? à·?à·?ටà·?à·?මà·?à·?ල à·?à·?â??යතà·?රà·?à¶?යà¶?à·? à·?ටà¶?à·?න à¶?ත!</string>
-  <string name="exit_nodes">ප�ට��ම� න�ඩ�</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">ප�ම� hop �ද�� ���ල��ල��ණ�, nicks, රට�ල� �� ල�ප�නයන�</string>
-  <string name="enter_exit_nodes">ප�ට��ම� න�ඩ��ලට ප�����න�න</string>
-  <string name="exclude_nodes">�ත��ර�න න�ඩ�</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">�ත��ර�න ���ල��ල��ණ�, nicks, රට�ල� �� ල�ප�නයන�</string>
-  <string name="enter_exclude_nodes">�ත��ර�න න�ඩ�ඩ��ලට ප�����න�න</string>
-  <string name="strict_nodes">ද�ඩ� න�ඩ� </string>
-  <string name="use_only_these_specified_nodes">��ත �ද�න� න�ඩ� *පමණ��* භ���ත� �රන�න </string>
-  <string name="bridges">��ත�</string>
-  <string name="use_bridges">��ත� භ���ත� �රන�න </string>
-  <string name="bridges_obfuscated">��ත� �ද�ර� �රන�න </string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor ජ�ලයට ���ල�ප �ත��� ��ම� න�ඩ� �බල �රන�න </string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">à·?à·?නà·?â??යà·?à·? à¶?ර à¶?තà·? à·?à·?තà·? à¶?දà·?රà·? à¶?ල à·?à·?තà·? නමà·? à¶?à·?à·? à·?බල à¶?රනà·?න </string>
-  <string name="ip_address_and_port_of_bridges">IP ල�ප�නය �� ��ත��ල ප�ට</string>
-  <string name="enter_bridge_addresses">��ත� ල�ප�නයන� �ත��� �රන�න </string>
-  <string name="relays">පà·?â??රතà·?යà·?ජà¶?ය</string>
-  <string name="relaying">පà·?â??රතà·?යà·?ජනය </string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">à¶?බà·? à¶?පà·?à¶?à¶?ය නà·?à¶?à·?ම-නà·?යන පà·?â??රතà·?යà·?ජà¶?යà¶?à·? බà·?ට à·?බල à¶?රනà·?න </string>
-  <string name="relay_port">පà·?â??රතà·?යà·?ජà¶? පà·?ටය</string>
-  <string name="listening_port_for_your_tor_relay">Tor පà·?â??රතà·?යà·?ජà¶?යට à·?à·?නà·?දà·?න පà·?ටය </string>
-  <string name="enter_or_port">OR ප�ටය �ත��� �රන�න </string>
-  <string name="relay_nickname">පà·?â??රතà·?යà·?ජà¶? à¶?පනà·?මය</string>
-  <string name="the_nickname_for_your_tor_relay">à¶?බà·? Tor පà·?â??රතà·?යà·?ජà¶?යà·? à¶?පනà·?මය</string>
-  <string name="enter_a_custom_relay_nickname">à·?à·?â??යà·?à·?à·?à·?රà·?à¶? පà·?â??රතà·?යà·?ජà¶? à¶?පනà·?මය à¶?තà·?à·?à·? à¶?රනà·?න </string>
-  <string name="reachable_addresses">��න�ද� ��ය���� ල�ප�නය </string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">à·?à·?à·?à·?දà·?යà¶?යà·?à¶?à·? ලà·?à·? firewall පà·?ටà·?පà·? à·?à·?ට à·?à·?මà·?à¶?à·?රà·? පà·?à·?à·?à·?à·?තà·? à·?මà¶? à¶?à·?â??රà·?යà·?à¶?රනà·?න</string>
-  <string name="reachable_ports">��න�ද� ��ය���� ප�ටයන�</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">��ම���ර� firewall ප�ට�ප� ��න�ද���ය ���� ප�ටයන�</string>
-  <string name="enter_ports">ප�ටයන� �ත��� �රන�න </string>
-  <string name="enable_hidden_services">�����ණ� ���� �ත���ර �රම�න� </string>
-  <string name="run_servers_accessible_via_the_tor_network">à¶?පà·?à¶?à¶? මත දà·?à·?à·?න à·?à·?à·?à·?දà·?යà¶?යà·?ට Tor ජà·?ලයට පà·?â??රà·?à·?à·?à·?à·?මට à¶?ඩදà·?නà·?න</string>
-  <string name="enter_localhost_ports_for_hidden_services">�����ණ� ���� �ද�� �ත� localhost ප�ටයන� �ත��� �රන�න </string>
-  <string name="hidden_service_ports">�����ණ� ���� ප�ටයන�</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">à¶?බà·? à·?à·?à¶?à·?à·?ණà·? à·?à·?à·?à·? à·?දà·?à·? à¶?මතන නà·?මය (à·?à·?à·?යà¶?à¶?à·?â??රà·?යà·? ජනනය à·?à·?)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">නà·?දà·?à·?à·? à¶?à·?රà·?මà·? ලà·?à¶?ය පà·?â??රතà·?දà·?නය à·?දà·?à·? à·?බල à¶?රනà·?න (නà·?රඹà·?ම à·?දà·?à·? adb or aLogCat භà·?à·?à·?තà·? à¶?රනà·?න)</string>
-  <string name="project_home">à·?à·?â??යà·?පà·?තà·? නà·?à·?à·?න(නà·?):</string>
-  <string name="the_tor_license">Tor බලපතà·?â??රය</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3 �න ප�ර��� ම�ද�����</string>
-  <string name="hidden_service_request">ය�ම���ට �����ණ� ����ද�ය� %S ප�ටය Tor ජ�ලයට ����ත ��ර�මට ��මන�ය. ම�ය ��ර����ත�න�න� �බ ම�ම ය�ම�� ������� �රන�� නම�  පමණ�.</string>
-  <string name="found_existing_tor_process">පà·?තà·?න Tor à¶?à·?â??රà·?යà·?à·?ලà·? à·?මà·?à·?à·?ය...</string>
+    <string name="found_existing_tor_process">පà·?තà·?න Tor à¶?à·?â??රà·?යà·?à·?ලà·? à·?මà·?à·?à·?ය...</string>
   <string name="something_bad_happened">යම� න�මන� ද�ය�� ��ද���ය. ල��ය පර����� �ර බලන�න </string>
-  <string name="hidden_service_on">�����ණ� ���� ප���ටන�න�:</string>
-  <string name="unable_to_read_hidden_service_name">�����ණ� ���� න�මය ��ය��මට න�����ය </string>
+    <string name="unable_to_read_hidden_service_name">�����ණ� ���� න�මය ��ය��මට න�����ය </string>
   <string name="unable_to_start_tor">Tor �රම�භ ��ර�මට න�����ය:</string>
-  <string name="pref_use_sys_iptables_title">ප�රන�ම� IP ���� භ���ත� �රන�න </string>
-  <string name="pref_use_sys_iptables_summary">Orbot �� ද���මය ip ��� ��න��ට �ප���ය� ප���ට� ද���මය ip ��� භ���ත� �රන�න </string>
-  <string name="error_installing_binares">Tor දà·?à·?à·?මයනà·? à·?à·?ථà·?පනයට à·?à·? à¶?තà·?à·?à·?â??රà·?ණà·? à¶?à·?රà·?මට නà·?à·?à·?à¶?à·? à·?à·?ය.</string>
-  <string name="pref_use_persistent_notifications">Orbot �ම�බන�ධ �� �ත� ��ම��ටම ��ට ම��ලම� ත�ර��� න�ර�ප�ය තබ��න�න</string>
-  <string name="pref_use_persistent_notifications_title">න���දන ල�බ�මට �ල���න�න </string>
-  <string name="notification_using_bridges">��ත� �බල �ර �ත!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Orbot �ද�� ප�ද���ය �� භ���� ත�රන�න </string>
-  <string name="wizard_locale_title">භ���� ත�රන�න </string>
-  <string name="wizard_locale_msg">�ම�මතය �ත��ර �ර�තම�න භ����ට ම�ර���න�න </string>
-  <string name="btn_save_settings">��ට��ම� ��ර���න�න</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sk-rSK/strings.xml b/orbotservice/src/main/res/values-sk-rSK/strings.xml
index b7578c49..0fe1e9e1 100644
--- a/orbotservice/src/main/res/values-sk-rSK/strings.xml
+++ b/orbotservice/src/main/res/values-sk-rSK/strings.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_info">Pomocník</string>
-  <string name="button_help">Pomocník</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Nastavenia proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sk/strings.xml b/orbotservice/src/main/res/values-sk/strings.xml
index 2f648ef5..fa60df47 100644
--- a/orbotservice/src/main/res/values-sk/strings.xml
+++ b/orbotservice/src/main/res/values-sk/strings.xml
@@ -1,45 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Å¡tart a stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot Å¡tartujeâ?¦</string>
+    <string name="status_starting_up">Orbot Å¡tartujeâ?¦</string>
   <string name="status_activated">Pripojený do Tor siete</string>
   <string name="status_disabled">Orbot je deaktivovaný</string>
   <string name="tor_process_starting">Å tartujem Tor klienta...</string>
   <string name="tor_process_complete">hotovo.</string>
-  <string name="tor_process_waiting">Ä?akám.</string>
-  <string name="not_anonymous_yet">VAROVANIE: Váš prenos nie je ešte anonymný! Prosím, nakonfigurujte aplikácie aby používali HTTP proxy 127.0.0.1:8118 alebo SOCKS4A alebo SOCKS5 proxy server 127.0.0.1:9050</string>
-  <string name="menu_home">Domov</string>
-  <string name="menu_browse">Prehliadať</string>
-  <string name="menu_settings">Nastavenia</string>
-  <string name="menu_info">Pomocník</string>
-  <string name="menu_about">O aplikácií</string>
-  <string name="button_help">Pomocník</string>
-  <string name="button_close">Zatvoriť</string>
-  <string name="button_about">O aplikácií</string>
-  <string name="menu_verify">Skontrolovať</string>
-  <string name="menu_exit">UkonÄ?iÅ¥</string>
-  <string name="btn_back">Späť</string>
-  <string name="btn_cancel">Zrušiť</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Nastavenie proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Všeobecné</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Varovanie</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Žiadny</string>
-  <string name="status">Stav</string>
-  <string name="error">Chyba</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Uložiť nastavenie</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sl/strings.xml b/orbotservice/src/main/res/values-sl/strings.xml
index 1b8a4c6b..e7aa9f3c 100644
--- a/orbotservice/src/main/res/values-sl/strings.xml
+++ b/orbotservice/src/main/res/values-sl/strings.xml
@@ -1,79 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org/?lang=sl</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=sl</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">zaÄ?ni in ustavi Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot se zaganja...</string>
+    <string name="status_starting_up">Orbot se zaganja...</string>
   <string name="status_activated">Povezan v omrežje Tor</string>
   <string name="status_disabled">Orbot ni aktiviran</string>
   <string name="tor_process_starting">Zagon Tor klijenta...</string>
   <string name="tor_process_complete">konÄ?ano.</string>
-  <string name="tor_process_waiting">Ä?akam.</string>
-  <string name="not_anonymous_yet">POZOR: Vaš promet še ni anonimen! Prosimo, nastavite vaše aplikacije da uporabijo HTTP posredniški strežnik 127.0.0.1:8118 ali SOCKS4A ali SOCKS5 posredniški strežnik 127.0.0.1:9050</string>
-  <string name="menu_home">Glavni meni</string>
-  <string name="menu_browse">Brskaj</string>
-  <string name="menu_settings">Nastavitve</string>
-  <string name="menu_log">Dnevnik</string>
-  <string name="menu_info">PomoÄ?</string>
-  <string name="menu_start">ZaÄ?ni</string>
-  <string name="menu_stop">Ustavi</string>
-  <string name="menu_about">O programu</string>
-  <string name="main_layout_download">Prenesi</string>
-  <string name="main_layout_upload">Naloži</string>
-  <string name="button_help">PomoÄ?</string>
-  <string name="button_close">Zapri</string>
-  <string name="button_about">O programu</string>
-  <string name="button_clear_log">PoÄ?isti dnevnik</string>
-  <string name="menu_verify">Preveri</string>
-  <string name="menu_exit">Izhod</string>
-  <string name="press_to_start">- dolg pritisk za zaÄ?etek -</string>
-  <string name="pref_trans_proxy_group">Transparentno delovanje prek posredniškega strežnika (potrebuje root)</string>
-  <string name="pref_trans_proxy_title">Transparentno delovanje prek posredniškega strežnika</string>
-  <string name="pref_trans_proxy_summary">Samodejno preusmerjanje aplikacij preko Tor</string>
-  <string name="pref_transparent_all_title">Tor karkoli</string>
-  <string name="pref_transparent_all_summary">Posredovanje prometa za vse aplikacije preko Tor</string>
-  <string name="pref_transparent_port_fallback_title">Nadomestna posredniška vrata</string>
-  <string name="pref_transparent_port_fallback_summary">OPOZORILO: Obide skupne porte (80, 443, itd.) * UPORABI LE * v primeru Ä?e  \"Vsi\" ali \"App\" naÄ?in ne deluje.</string>
-  <string name="pref_transparent_port_title">Seznam vrat</string>
-  <string name="pref_transparent_port_summary">Seznam portov za posredniÅ¡ki strežnik. * UPORABI LE * v primeru Ä?e \"Vsi\" ali \"App\" naÄ?in ne deluje</string>
-  <string name="pref_transparent_port_dialog">Vnesi vrata za posredniški strežnik</string>
-  <string name="pref_has_root">Zahtevaj korenski dostop</string>
-  <string name="pref_has_root_summary">Zahtevaj korenski dostop za transparentno posredovanje</string>
-  <string name="status_install_success">Tor binarne datoteke so uspeÅ¡no nameÅ¡Ä?ene!</string>
-  <string name="status_install_fail">Ni bilo možno namestiti Tor binarnih datotek. Prosimo preverite log in obvestite tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Napaka v programu</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">O programu Orbot</string>
-  <string name="btn_next">Naprej</string>
-  <string name="btn_back">Nazaj</string>
-  <string name="btn_finish">ZakljuÄ?i</string>
-  <string name="btn_okay">Potrdi</string>
-  <string name="btn_cancel">Prekini</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Nekaj podrobnosti o Orbot-u</string>
-  <string name="wizard_permissions_root">Dovoljenje dodeljeno</string>
-  <string name="wizard_permissions_stock">Orbot dovoljenja</string>
-  <string name="wizard_premissions_msg_root">OdliÄ?no! Ugotovili smo, da imate omogoÄ?eno root dovoljenje za Orbot. To moÄ? bomo modro uporabili.</string>
-  <string name="wizard_permissions_msg_stock">Ä?eprav to ni potrebno, lahko Orbot postane bolj zmogljivo orodje, Ä?e ima vaÅ¡a naprava korenski dostop. Uporabite spodnji gumb za odobritev Orbot velesile!</string>
-  <string name="wizard_permissions_no_root">Ä?e nimate korenski dostop ali nimate pojma o Ä?em je beseda, se le prepriÄ?ajte, da uporabljate aplikacije, narejene za delo z Orbot.</string>
-  <string name="wizard_permissions_consent">Razumem in želim nadaljevati kot Superuporabnik.</string>
-  <string name="wizard_permission_enable_root">Dodeli Root za Orbot</string>
-  <string name="wizard_proxy_help_info">Nastavitve posredniškega (proxy) strežnika</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Splošno</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Opozorilo</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Dovoljenja</string>
-  <!--TipsAndTricks screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="status">Stanje</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Shrani nastavitve</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sn/strings.xml b/orbotservice/src/main/res/values-sn/strings.xml
index ad1cd1de..9b98a0c8 100644
--- a/orbotservice/src/main/res/values-sn/strings.xml
+++ b/orbotservice/src/main/res/values-sn/strings.xml
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="menu_settings">Zvamada</string>
-  <string name="menu_about">Maererano</string>
-  <string name="button_about">Maererano</string>
-  <string name="menu_exit">Buda</string>
-  <string name="wizard_btn_tell_me_more">Maererano Orbot</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Proxy Zvamada</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sq/strings.xml b/orbotservice/src/main/res/values-sq/strings.xml
index 5a7c9897..b80fb51c 100644
--- a/orbotservice/src/main/res/values-sq/strings.xml
+++ b/orbotservice/src/main/res/values-sq/strings.xml
@@ -1,30 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_home">Shpi</string>
-  <string name="menu_browse">Lundro</string>
-  <string name="menu_settings">Zgjedhjet</string>
-  <string name="menu_info">Ndihmë</string>
-  <string name="menu_about">Informacione</string>
-  <string name="button_help">Ndihmë</string>
-  <string name="button_close">Mbylle</string>
-  <string name="button_about">Informacione</string>
-  <string name="menu_exit">Dil</string>
-  <string name="btn_back">Mbrapa</string>
-  <string name="btn_cancel">Anullo</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_proxy_help_info">Konfigurimi i Proxy</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Të Përgjithshme</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Warning</string>
-  <!--Permissions screen-->
+    <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_none">Asnjë</string>
-  <string name="status">Gjëndja</string>
-  <string name="error">Gabim</string>
-  <string name="default_bridges"></string>
-  <string name="btn_save_settings">Shpëto Konfigurmin</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sr/strings.xml b/orbotservice/src/main/res/values-sr/strings.xml
index b3cc7ed5..ac81e996 100644
--- a/orbotservice/src/main/res/values-sr/strings.xml
+++ b/orbotservice/src/main/res/values-sr/strings.xml
@@ -2,199 +2,24 @@
 <resources>
   <string name="app_name">Ð?Ñ?боÑ?</string>
   <string name="app_description">Ð?Ñ?боÑ? Ñ?е беÑ?плаÑ?на пÑ?окÑ?и апликаÑ?иÑ?а коÑ?а даÑ?е моÑ? дÑ?Ñ?гим апликаÑ?иÑ?ама да безбедниÑ?е коÑ?иÑ?Ñ?е инÑ?еÑ?неÑ?. Ð?Ñ?боÑ? коÑ?иÑ?Ñ?и ТоÑ? за Ñ?иÑ?Ñ?оваÑ?е ваÑ?ег инÑ?еÑ?неÑ? Ñ?аобÑ?аÑ?аÑ?а и онда га Ñ?кÑ?ива Ñ?лаÑ?ем кÑ?оз низ Ñ?аÑ?Ñ?наÑ?а Ñ?иÑ?ом Ñ?веÑ?а. ТоÑ? Ñ?е Ñ?лободан Ñ?оÑ?Ñ?веÑ? и оÑ?воÑ?ена мÑ?ежа коÑ?а помаже да Ñ?е одбÑ?аниÑ?е од Ñ?азниÑ? облика надзоÑ?а мÑ?ежа коÑ?и Ñ?гÑ?ожаваÑ?Ñ? лиÑ?нÑ? Ñ?лободÑ? и пÑ?иваÑ?ноÑ?Ñ?, повеÑ?Ñ?иве поÑ?ловне акÑ?ивноÑ?Ñ?и и лиÑ?не одноÑ?е и дÑ?жавне безбедноÑ?Ñ?и познаÑ?е као анализа Ñ?аобÑ?аÑ?аÑ?а.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">покÑ?ени и заÑ?Ñ?Ñ?ави Tor</string>
-  <string name="tor_proxy_service_process">ТоÑ? пÑ?окÑ?и Ñ?Ñ?лÑ?га</string>
-  <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е покÑ?еÑ?е...</string>
+    <string name="status_starting_up">Ð?Ñ?боÑ? Ñ?е покÑ?еÑ?е...</string>
   <string name="status_activated">Ð?овезан Ñ?а ТоÑ? мÑ?ежом</string>
   <string name="status_disabled">Ð?Ñ?боÑ? Ñ?е деакÑ?ивиÑ?ан</string>
   <string name="tor_process_starting">Ð?окÑ?еÑ?е Ñ?е ТоÑ? клиÑ?енÑ?...</string>
   <string name="tor_process_complete">завÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">Ñ?екам.</string>
-  <string name="not_anonymous_yet">УÐ?Ð?Ð?Ð?РÐ?Ð?Ð?: Ð?аÑ? пÑ?омеÑ? Ñ?оÑ? ниÑ?е анониман! Ð?олимо ваÑ? да подеÑ?иÑ?е Ð?аÑ?е апликаÑ?иÑ?е да коÑ?иÑ?Ñ?е HTTP пÑ?окÑ?и 127.0.0.1:8118 или SOCKS4A или SOCKS5 пÑ?окÑ?и 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?оÑ?еÑ?на</string>
-  <string name="menu_browse">РазгледаÑ?е</string>
-  <string name="menu_settings">Ð?одеÑ?аваÑ?а</string>
-  <string name="menu_log">Ð?огови</string>
-  <string name="menu_info">Ð?омоÑ?</string>
-  <string name="menu_apps">Ð?Ð?Ð?</string>
-  <string name="menu_start">Ð?Ñ?ени</string>
-  <string name="menu_stop">Ð?аÑ?Ñ?Ñ?ави</string>
-  <string name="menu_about">Ð? нама</string>
-  <string name="main_layout_download">Ð?Ñ?еÑ?зимаÑ?е</string>
-  <string name="main_layout_upload">Ð?Ñ?пÑ?емаÑ?е</string>
-  <string name="button_help">Ð?омоÑ?</string>
-  <string name="button_close">Ð?аÑ?воÑ?и</string>
-  <string name="button_about">Ð? нама</string>
-  <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?и логове</string>
-  <string name="menu_verify">Ð?Ñ?овеÑ?и</string>
-  <string name="menu_exit">Ð?злаз</string>
-  <string name="press_to_start">- задÑ?жиÑ?е дÑ?жи пÑ?иÑ?иÑ?ак  за поÑ?еÑ?ак -</string>
-  <string name="pref_trans_proxy_group">ТÑ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е (заÑ?Ñ?ева root пÑ?иÑ?Ñ?Ñ?п)</string>
-  <string name="pref_trans_proxy_title">ТÑ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и</string>
-  <string name="pref_trans_proxy_summary">Ð?Ñ?Ñ?омаÑ?Ñ?ко Ñ?оÑ?иÑ?иÑ?иÑ?аÑ?е апликаÑ?иÑ?а</string>
-  <string name="pref_transparent_all_title">ТоÑ?оÑ?икÑ?Ñ? Ñ?ве</string>
-  <string name="pref_transparent_all_summary">Ð?Ñ?оÑ?леди пÑ?омеÑ? од Ñ?виÑ? апликаÑ?иÑ?а кÑ?оз ТоÑ?</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?ван поÑ?Ñ? пÑ?окÑ?иÑ?а</string>
-  <string name="pref_transparent_port_fallback_summary">УÐ?Ð?Ð?Ð?РÐ?Ð?Ð?: Ð?аобилажеÑ?е Ñ?еÑ?Ñ?иÑ? поÑ?Ñ?ова (80, 443 иÑ?д). Ð?Ð?РÐ?СТÐ?ТÐ? СÐ?Ð?Ð? ако подеÑ?аваÑ?а на \"Све\" или \"Ð?пликаÑ?иÑ?а\" не Ñ?аде.</string>
-  <string name="pref_transparent_port_title">Ð?иÑ?Ñ?а поÑ?Ñ?ова</string>
-  <string name="pref_transparent_port_summary">Ð?иÑ?Ñ?а поÑ?Ñ?ова за пÑ?окÑ?и. Ð?оÑ?иÑ?Ñ?иÑ?и СÐ?Ð?Ð? ако опÑ?иÑ?е \"Све\" или \"Ð?пликаÑ?иÑ?е\" не Ñ?аде.</string>
-  <string name="pref_transparent_port_dialog">УпиÑ?иÑ?е поÑ?Ñ?ове за пÑ?оÑ?леÑ?иваÑ?е на пÑ?окÑ?и</string>
-  <string name="pref_has_root">Ð?аÑ?Ñ?ажи root пÑ?иÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?аÑ?Ñ?ажи root пÑ?иÑ?Ñ?Ñ?п за Ñ?Ñ?анÑ?паÑ?енÑ?но пÑ?окÑ?иÑ?аÑ?е</string>
-  <string name="status_install_success">ТоÑ? бинаÑ?и Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ани!</string>
-  <string name="status_install_fail">Ð?инаÑ?не ТоÑ? даÑ?оÑ?еке ниÑ?Ñ? Ñ?Ñ?пеÑ?но инÑ?Ñ?алиÑ?ане. Ð?олимо пÑ?егледаÑ?Ñ?е логове и обавеÑ?Ñ?иÑ?е наÑ? на tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?Ñ?еÑ?ка Ñ? апликаÑ?иÑ?и</string>
-  <string name="wizard_title">Ð?Ñ?боÑ?</string>
-  <string name="wizard_btn_tell_me_more">Ð?нÑ?оÑ?маÑ?иÑ?е о Ð?Ñ?боÑ?Ñ?</string>
-  <string name="btn_next">СледеÑ?е</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?авÑ?Ñ?и</string>
-  <string name="btn_okay">У Ñ?едÑ?</string>
-  <string name="btn_cancel">Ð?Ñ?кажи</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Ð?еÑ?аÑ?и о Ð?Ñ?боÑ?Ñ?</string>
-  <string name="wizard_details_msg">Orbot je otvorena aplikacija koja sadrzi Tor, LibEvent i Polipo. ObezbeÄ?uje lokalni HTTP proksi (8118) i SOCKS proksi (9050) u Tor mrežu. TakoÄ?e poseduje sposobnost, da kroz Tor, Å¡alje sav internet saobraÄ?aj sa rutovanih ureÄ?aja.</string>
-  <string name="wizard_permissions_root">Ð?озвола одобÑ?ена</string>
-  <string name="wizard_permissions_stock">Ð?Ñ?боÑ? дозволе</string>
-  <string name="wizard_premissions_msg_root">Ð?длиÑ?но! Ð?еÑ?екÑ?овали Ñ?мо да имаÑ?е root дозволе за Ð?Ñ?боÑ?. Ð?Ñ?дÑ?о Ñ?емо иÑ?кÑ?оÑ?иÑ?Ñ?иÑ?и овÑ? моÑ?.</string>
-  <string name="wizard_permissions_msg_stock">Ð?ако ниÑ?е заÑ?Ñ?евано, Ð?Ñ?боÑ? поÑ?Ñ?аÑ?е много Ñ?аÑ?и алаÑ? ако Ð?аÑ? Ñ?Ñ?еÑ?аÑ? има root пÑ?иÑ?Ñ?Ñ?п. Ð?оÑ?иÑ?Ñ?иÑ?е дÑ?гме иÑ?под да биÑ?Ñ?е омогÑ?Ñ?или Ð?Ñ?боÑ?Ñ? Ñ?Ñ?пеÑ? моÑ?и.</string>
-  <string name="wizard_permissions_no_root">Ð?ко немаÑ?е root пÑ?иÑ?Ñ?Ñ?п или немаÑ?е поÑ?ма о Ñ?емÑ? пÑ?иÑ?амо, Ñ?амо Ñ?е побÑ?иниÑ?е да коÑ?иÑ?Ñ?иÑ?е апликаÑ?иÑ?е коÑ?е Ñ?Ñ? напÑ?авÑ?ене да Ñ?Ñ?нкÑ?иониÑ?Ñ? Ñ?а Ð?Ñ?боÑ?ом.</string>
-  <string name="wizard_permissions_consent">РазÑ?мем и желео биÑ? да наÑ?Ñ?авим без root пÑ?иÑ?Ñ?Ñ?па</string>
-  <string name="wizard_permission_enable_root">Ð?озволи root за Ð?Ñ?боÑ?</string>
-  <string name="wizard_configure">Ð?одеÑ?и Ñ?оÑ?иÑ?икаÑ?иÑ?Ñ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?боÑ? Ð?ам даÑ?е опÑ?иÑ?Ñ? да пÑ?оÑ?ледиÑ?е Ñ?ав пÑ?омеÑ? од Ñ?Ñ?Ñ?ане Ñ?виÑ? апликаÑ?иÑ?а или да изабеÑ?еÑ?е поÑ?ебно апликаÑ?иÑ?е коÑ?е желиÑ?е да пÑ?оÑ?ледиÑ?е кÑ?оз ТоÑ? мÑ?ежÑ?.</string>
-  <string name="wizard_configure_all">Ð?оÑ?аÑ?и пÑ?омеÑ? од Ñ?виÑ? апликаÑ?иÑ?а кÑ?оз ТоÑ?</string>
-  <string name="wizard_configure_select_apps">Ð?знаÑ?и поÑ?ебно апликаÑ?иÑ?е Ñ?иÑ?и Ñ?е Ñ?е пÑ?омеÑ? пÑ?оÑ?ледиÑ?и кÑ?оз ТоÑ?</string>
-  <string name="wizard_tips_tricks">Ð?Ñ?боÑ?-омогÑ?Ñ?ене Ð?пликаÑ?иÑ?е</string>
-  <string name="wizard_tips_msg">Ð?пликаÑ?иÑ?е наведене иÑ?под Ñ?Ñ? Ñ?азвиÑ?ене да би Ñ?адиле Ñ?а Ð?Ñ?боÑ?ом. Ð?ликниÑ?е Ñ?вако дÑ?гме коÑ?е желиÑ?е Ñ?ада да инÑ?Ñ?алиÑ?аÑ?е, а Ñ? Ñ?Ñ?пÑ?оÑ?ном иÑ? можеÑ?е пÑ?онаÑ?и и Ñ? Google Play пÑ?одавниÑ?и, на GuardianProject.info веб Ñ?Ñ?Ñ?аниÑ?и или пÑ?еко F-Droid.org.</string>
-  <string name="wizard_tips_proxy">Ð?Ñ?окÑ?и поÑ?Ñ?авке - Ð?аÑ?Ñ?иÑ?е како да подеÑ?иÑ?е апликаÑ?иÑ?е да Ñ?аде Ñ?а Ð?Ñ?боÑ?ом</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo апликаÑ?иÑ?а за пÑ?еÑ?Ñ?аживаÑ?е инÑ?еÑ?неÑ?а</string>
-  <string name="wizard_tips_twitter">Ð?одеÑ?иÑ?е ТвиÑ?еÑ? да коÑ?иÑ?Ñ?и поÑ?Ñ? 8118 на локалном Ñ?оÑ?Ñ?Ñ?.</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?Ñ?окÑ?и подеÑ?аваÑ?а</string>
-  <string name="wizard_final">Ð?Ñ?боÑ? Ñ?е Ñ?пÑ?еман!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Ð?во Ñ?е оÑ?воÑ?иÑ?и Ð?аÑ? веб пÑ?еÑ?Ñ?аживаÑ? и поÑ?еÑ?иÑ?и Ñ?Ñ?Ñ?аниÑ?Ñ? https://check.torproject.org да би пÑ?овеÑ?или да ли Ñ?е Ð?Ñ?боÑ? пÑ?авилно подеÑ?ен и да ли Ñ?Ñ?е Ñ?поÑ?ени Ñ?а ТоÑ? мÑ?ежом.</string>
-  <string name="pref_hs_group">ХоÑ?Ñ?инг на Ñ?кÑ?ивеном Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="pref_general_group">Ð?пÑ?Ñ?е</string>
-  <string name="pref_start_boot_title">Ð?окÑ?ени Ð?Ñ?боÑ? пÑ?и покÑ?еÑ?аÑ?Ñ? Ñ?Ñ?еÑ?аÑ?а</string>
-  <string name="pref_start_boot_summary">Ð?Ñ?Ñ?омаÑ?Ñ?ки покÑ?ениÑ?е Ð?Ñ?боÑ? и конекÑ?Ñ?Ñ?Ñ?е Ñ?е Ñ?а ТоÑ? мÑ?ежом када Ñ?е Ñ?пали Ð?аÑ? Ð?ндÑ?оид Ñ?Ñ?еÑ?аÑ?.</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">УпозоÑ?еÑ?е</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?озволе</string>
-  <string name="wizard_permissions_root_msg1">Ð?ожеÑ?е опÑ?ионално дозволиÑ?и Ð?Ñ?боÑ?Ñ? пÑ?иÑ?Ñ?Ñ?п као \"СÑ?пеÑ? коÑ?иÑ?ник\" да би омогÑ?Ñ?или напÑ?едне Ñ?Ñ?нкÑ?иÑ?е као Ñ?Ñ?о Ñ?е Ñ?Ñ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и.</string>
-  <string name="wizard_permissions_root_msg2">Ð?ко не желиÑ?е ово да Ñ?Ñ?адиÑ?е, молимо Ð?аÑ? да Ñ?е Ñ?веÑ?иÑ?е да коÑ?иÑ?Ñ?иÑ?е апликаÑ?иÑ?е коÑ?е Ñ?Ñ? подеÑ?ене да Ñ?аде Ñ?а Ð?Ñ?боÑ?ом.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?пликаÑ?иÑ?е Ñ?а омогÑ?Ñ?еним Ð?Ñ?боÑ?ом.</string>
-  <string name="wizard_tips_play">Ð?Ñ?онаÑ?иÑ?е Ñ?ве Guardian Project апликаÑ?иÑ?е на Google Play Ñ?еÑ?виÑ?Ñ?</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">ТÑ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и</string>
-  <string name="wizard_transproxy_msg">Ð?во омогÑ?Ñ?ава Ð?аÑ?им апликаÑ?иÑ?ама да аÑ?Ñ?омаÑ?Ñ?ки пÑ?еÑ?Ñ?меÑ?аваÑ?Ñ? пÑ?омеÑ? кÑ?оз ТоÑ? мÑ?ежÑ? без икакве конÑ?игÑ?Ñ?аÑ?иÑ?е.</string>
-  <string name="wizard_transproxy_hint">(Ð?знаÑ?иÑ?е оваÑ? квадÑ?аÑ?иÑ? ако немаÑ?е поÑ?ма о Ñ?емÑ? пÑ?иÑ?амо)</string>
-  <string name="wizard_transproxy_none">Ð?иÑ?едан</string>
-  <string name="pref_transparent_tethering_title">Ð?Ñ?ивезиваÑ?е Ñ?оÑ?а</string>
-  <string name="pref_transparent_tethering_summary">Ð?могÑ?Ñ?ава ТоÑ?ово Ñ?Ñ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и за бежиÑ?не и УСÐ? повезиваÑ?Ñ?Ñ?е Ñ?Ñ?еÑ?аÑ?е (заÑ?Ñ?ева Ñ?еÑ?Ñ?аÑ?Ñ?оваÑ?е)</string>
-  <string name="button_grant_superuser">Ð?аÑ?Ñ?ажи пÑ?иÑ?Ñ?Ñ?п као \'Superuser\'</string>
-  <string name="pref_select_apps">Ð?забеÑ?иÑ?е апликаÑ?иÑ?е</string>
-  <string name="pref_select_apps_summary">Ð?забеÑ?иÑ?е апликаÑ?иÑ?е Ñ?иÑ?и пÑ?омеÑ? Ñ?еÑ?е пÑ?оÑ?ледиÑ?и кÑ?оз ТоÑ?</string>
-  <string name="pref_node_configuration">Ð?онÑ?игÑ?Ñ?аÑ?иÑ?а Ñ?воÑ?ова</string>
-  <string name="pref_node_configuration_summary">Ð?во Ñ?Ñ? напÑ?едне поÑ?Ñ?авке коÑ?е могÑ? да Ñ?маÑ?е Ð?аÑ?Ñ? анонимноÑ?Ñ?</string>
-  <string name="pref_entrance_node">Ð?оÑ?еÑ?ни Ñ?воÑ?ови</string>
-  <string name="pref_entrance_node_summary">Ð?Ñ?иÑ?Ñ?и пÑ?Ñ?Ñ?иÑ?Ñ?, надимÑ?и, дÑ?жаве и адÑ?еÑ?е пÑ?вог Ñ?кока</string>
-  <string name="pref_entrance_node_dialog">УнеÑ?иÑ?е поÑ?еÑ?не Ñ?воÑ?ове</string>
-  <string name="pref_proxy_title">Ð?Ñ?ежни пÑ?окÑ?и за одлазеÑ?и пÑ?омеÑ? (Ð?еобавезно)</string>
-  <string name="pref_proxy_type_title">Тип пÑ?окÑ?иÑ?а за одлазеÑ?и пÑ?омеÑ?</string>
-  <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол коÑ?и Ñ?е Ñ?е коÑ?иÑ?Ñ?иÑ?и за пÑ?окÑ?и Ñ?еÑ?веÑ?: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">УнеÑ?иÑ?е Ñ?ип пÑ?окÑ?иÑ?а</string>
-  <string name="pref_proxy_host_title">ХоÑ?Ñ? пÑ?окÑ?иÑ?а за одлазеÑ?и пÑ?омеÑ?</string>
-  <string name="pref_proxy_host_summary">Ð?ме Ñ?оÑ?Ñ?а за пÑ?окÑ?и Ñ?еÑ?веÑ?</string>
-  <string name="pref_proxy_host_dialog">УнеÑ?иÑ?е Ñ?оÑ?Ñ? од пÑ?окÑ?иÑ?а</string>
-  <string name="pref_proxy_port_title">Ð?оÑ?Ñ? пÑ?окÑ?иÑ?а за одлазеÑ?и пÑ?омеÑ?</string>
-  <string name="pref_proxy_port_summary">Ð?оÑ?Ñ? пÑ?окÑ?и Ñ?еÑ?веÑ?а</string>
-  <string name="pref_proxy_port_dialog">УнеÑ?иÑ?е поÑ?Ñ? пÑ?окÑ?иÑ?а</string>
-  <string name="pref_proxy_username_title">Ð?оÑ?иÑ?ниÑ?ко име на пÑ?окÑ?иÑ?Ñ? за одлазеÑ?и пÑ?омеÑ?</string>
-  <string name="pref_proxy_username_summary">Ð?ме пÑ?окÑ?иÑ?а (Ð?еобавезно)</string>
-  <string name="pref_proxy_username_dialog">УнеÑ?иÑ?е коÑ?иÑ?ниÑ?ко име Ð?Ñ?окÑ?иÑ?а  </string>
-  <string name="pref_proxy_password_title">ШиÑ?Ñ?а на пÑ?окÑ?иÑ?Ñ? за одлазеÑ?и пÑ?омеÑ?</string>
-  <string name="pref_proxy_password_summary">ШиÑ?Ñ?а пÑ?окÑ?иÑ?а (необавезно)</string>
-  <string name="pref_proxy_password_dialog">УнеÑ?иÑ?е Ñ?иÑ?Ñ?Ñ? пÑ?окÑ?иÑ?а</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?оÑ?Ñ?авÑ?аÑ?е поÑ?пÑ?но Ñ?Ñ?апÑ?паÑ?енÑ?ног Ñ?лаÑ?а кÑ?оз пÑ?окÑ?и</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?одеÑ?аваÑ?е Ñ?Ñ?апÑ?паÑ?енÑ?ног пÑ?окÑ?иÑ?а од Ñ?Ñ?Ñ?ане апликаÑ?иÑ?е</string>
-  <string name="transparent_proxying_enabled">ТÑ?анÑ?паÑ?енÑ?но Ñ?лаÑ?е кÑ?оз пÑ?окÑ?и Ñ?е Ð?Ð?Ð?Ð?УÐ?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Ñ?е омогÑ?Ñ?ен за пÑ?ивезиваÑ?е</string>
-  <string name="warning_error_starting_transparent_proxying_">УÐ?Ð?Ð?Ð?РÐ?Ð?Ð?: гÑ?еÑ?ка пÑ?и Ñ?Ñ?аÑ?Ñ?оваÑ?Ñ? Ñ?Ñ?анÑ?паÑ?енÑ?ног Ñ?лаÑ?а кÑ?оз пÑ?окÑ?и!</string>
-  <string name="transproxy_rules_cleared">TransProxy пÑ?авила оÑ?иÑ?Ñ?ена</string>
-  <string name="couldn_t_start_tor_process_">Ð?иÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и ТоÑ? пÑ?оÑ?еÑ?:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?одеÑ?аваÑ?е Ñ?Ñ?анÑ?паÑ?енÑ?ног пÑ?окÑ?иÑ?аÑ?а од Ñ?Ñ?Ñ?ане поÑ?Ñ?а...</string>
-  <string name="bridge_error">Ð?Ñ?еÑ?ка Ñ? моÑ?Ñ?Ñ?</string>
-  <string name="bridge_requires_ip">Ð?а биÑ?Ñ?е коÑ?иÑ?Ñ?или bridge могÑ?Ñ?ноÑ?Ñ?, моÑ?аÑ?е Ñ?неÑ?и баÑ? Ñ?еднÑ? bridge IP адÑ?еÑ?Ñ?.</string>
-  <string name="send_email_for_bridges">Ð?оÑ?аÑ?иÑ?е меÑ?л на bridges@xxxxxxxxxxxxxx Ñ?а Ñ?еÑ?има \"get bridges\" Ñ? Ñ?екÑ?Ñ?Ñ? поÑ?Ñ?ке меÑ?ла Ñ?а gmail коÑ?иÑ?ниÑ?ког Ñ?аÑ?Ñ?на.</string>
-  <string name="error">Ð?Ñ?еÑ?ка</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?е ReachableAddresses поÑ?Ñ?авке Ñ?Ñ? изазвале изÑ?зеÑ?ак!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ð?иÑ?е могÑ?Ñ?е покÑ?енÑ?Ñ?и ТоÑ? пÑ?оÑ?еÑ?:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?е ReachableAddresses поÑ?Ñ?авке Ñ?Ñ? изазвале изÑ?зеÑ?ак!</string>
   <string name="your_relay_settings_caused_an_exception_">Ð?аÑ?е поÑ?Ñ?авке Ñ?елеÑ?а Ñ?Ñ? изазвале изÑ?зеÑ?ак!</string>
-  <string name="exit_nodes">Ð?злазни Ñ?воÑ?ови</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ð?Ñ?иÑ?Ñ?и, надимÑ?и, дÑ?жаве и адÑ?еÑ?е задÑ?ег Ñ?кока</string>
-  <string name="enter_exit_nodes">УнеÑ?иÑ?е излазне Ñ?воÑ?ове</string>
-  <string name="exclude_nodes">Ð?дÑ?Ñ?Ñ?аниÑ?е Ñ?воÑ?ове</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ð?Ñ?иÑ?Ñ?и, надимÑ?и, дÑ?жаве и адÑ?еÑ?е за одÑ?Ñ?Ñ?аÑ?еÑ?е</string>
-  <string name="enter_exclude_nodes">УнеÑ?иÑ?е Ñ?воÑ?ове за одÑ?Ñ?Ñ?аÑ?еÑ?е</string>
-  <string name="strict_nodes">СÑ?Ñ?икÑ?ни Ñ?воÑ?ови</string>
-  <string name="use_only_these_specified_nodes">Ð?оÑ?иÑ?Ñ?и СÐ?Ð?Ð? ове наведене Ñ?воÑ?ове</string>
-  <string name="bridges">Ð?оÑ?Ñ?ови</string>
-  <string name="use_bridges">Ð?оÑ?иÑ?Ñ?и bridge</string>
-  <string name="bridges_obfuscated">Ð?оÑ?Ñ?ови Ñ?а bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?могÑ?Ñ?и алÑ?еÑ?наÑ?ивне Ñ?воÑ?ове за Ñ?лаз Ñ? ТоÑ? мÑ?ежÑ?</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?могÑ?Ñ?иÑ?и ако Ñ?Ñ? конÑ?игÑ?Ñ?иÑ?ани моÑ?Ñ?ови моÑ?Ñ?ови Ñ?а баговима</string>
-  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ?а и поÑ?Ñ? bridge-а</string>
-  <string name="enter_bridge_addresses">УнеÑ?иÑ?е bridge адÑ?еÑ?Ñ? </string>
-  <string name="relays">РелеÑ?и</string>
-  <string name="relaying">РелеÑ?иÑ?аÑ?е</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Ð?могÑ?Ñ?иÑ?е ваÑ?ем Ñ?Ñ?еÑ?аÑ?Ñ? да бÑ?де Ñ?елеÑ? без излаза</string>
-  <string name="relay_port">Ð?оÑ?Ñ? за Ñ?елеÑ?</string>
-  <string name="listening_port_for_your_tor_relay">Ð?оÑ?Ñ? за Ñ?лÑ?Ñ?аÑ?е за Ñ?воÑ? ТоÑ? Ñ?елеÑ?</string>
-  <string name="enter_or_port">УкÑ?Ñ?аÑ?Ñ?е Ð?Ð?Ð? поÑ?Ñ?</string>
-  <string name="relay_nickname">Ð?адимак Ñ?елеÑ?а</string>
-  <string name="the_nickname_for_your_tor_relay">Ð?адимак ваÑ?ег ТоÑ? Ñ?елеÑ?а</string>
-  <string name="enter_a_custom_relay_nickname">УнеÑ?иÑ?е по избоÑ?Ñ? надимак за Ñ?елеÑ?</string>
-  <string name="reachable_addresses">Ð?оÑ?Ñ?Ñ?пне адÑ?еÑ?е</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ð?окÑ?ениÑ?е као клиÑ?енÑ?а иза firewall-а коÑ?и Ñ?е Ñ?еÑ?Ñ?Ñ?икÑ?ивно подеÑ?ен</string>
-  <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пни поÑ?Ñ?ови</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?ови доÑ?Ñ?Ñ?пни иза Ñ?еÑ?Ñ?Ñ?икÑ?ивног firewall-а</string>
-  <string name="enter_ports">УнеÑ?иÑ?е поÑ?Ñ?ове</string>
-  <string name="enable_hidden_services">ХоÑ?Ñ?инг на Ñ?кÑ?ивеном Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="run_servers_accessible_via_the_tor_network">дозволиÑ?е Ñ?еÑ?веÑ?Ñ? на Ñ?Ñ?еÑ?аÑ?Ñ? да бÑ?де доÑ?Ñ?Ñ?пан пÑ?еко ТоÑ? мÑ?еже</string>
-  <string name="enter_localhost_ports_for_hidden_services">Ñ?неÑ?иÑ?е localhost поÑ?Ñ?ове за Ñ?кÑ?ивене Ñ?еÑ?виÑ?е</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?ови на Ñ?кÑ?ивеном Ñ?еÑ?виÑ?Ñ?</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адÑ?еÑ?абилно име за Ð?аÑ? Ñ?кÑ?ивени Ñ?еÑ?виÑ? (генеÑ?иÑ?е Ñ?е аÑ?Ñ?омаÑ?Ñ?ко)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">омогÑ?Ñ?иÑ?е debug логовоаÑ?е (моÑ?а Ñ?е коÑ?иÑ?Ñ?иÑ?и adb или aLogCat да би Ñ?е пÑ?егледали)</string>
-  <string name="project_home">Ð?оÑ?еÑ?на за пÑ?оÑ?екÑ?е:</string>
-  <string name="the_tor_license">ТоÑ? лиÑ?енÑ?а</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">СоÑ?Ñ?веÑ? од Ñ?Ñ?Ñ?ане неÑ?лÑ?жбениÑ? издаваÑ?а:</string>
-  <string name="hidden_service_request">Ð?пликаÑ?иÑ?а жели да оÑ?воÑ?и Ñ?акÑ?ивен поÑ?Ñ? %S на Ñ?еÑ?веÑ?Ñ? за ТоÑ? мÑ?ежÑ?. Ð?во Ñ?е Ñ?игÑ?Ñ?ан поÑ?ез Ñ?колико веÑ?Ñ?Ñ?еÑ?е апликаÑ?иÑ?и.</string>
-  <string name="found_existing_tor_process">наÑ?ен покÑ?енÑ?Ñ?и ТоÑ? пÑ?оÑ?еÑ?...</string>
+    <string name="found_existing_tor_process">наÑ?ен покÑ?енÑ?Ñ?и ТоÑ? пÑ?оÑ?еÑ?...</string>
   <string name="something_bad_happened">Ð?еÑ?Ñ?о лоÑ?е Ñ?е догодило. Ð?Ñ?егледаÑ?Ñ?е логове</string>
-  <string name="hidden_service_on">Ñ?акÑ?ивен Ñ?еÑ?виÑ? на:</string>
-  <string name="unable_to_read_hidden_service_name">ниÑ?ам Ñ? могÑ?Ñ?ноÑ?Ñ?и да пÑ?оÑ?иÑ?ам име Ñ?акÑ?ивеног Ñ?еÑ?виÑ?а</string>
+    <string name="unable_to_read_hidden_service_name">ниÑ?ам Ñ? могÑ?Ñ?ноÑ?Ñ?и да пÑ?оÑ?иÑ?ам име Ñ?акÑ?ивеног Ñ?еÑ?виÑ?а</string>
   <string name="unable_to_start_tor">ТоÑ? ниÑ?е Ñ? могÑ?Ñ?ноÑ?Ñ?и да Ñ?е покÑ?ене:</string>
-  <string name="pref_use_sys_iptables_title">Ð?оÑ?иÑ?Ñ?иÑ?и Ñ?обиÑ?аÑ?ене Ð?пÑ?абеле</string>
-  <string name="pref_use_sys_iptables_summary">коÑ?иÑ?Ñ?и Ñ?гÑ?аÑ?ене Ð?Ð?Ñ?абеле Ñ?меÑ?Ñ?о ониÑ? коÑ?е долазе Ñ?а Ð?Ñ?боÑ?ом</string>
-  <string name="error_installing_binares">ТоÑ? бинаÑ?и ниÑ?Ñ? Ñ? могÑ?Ñ?ноÑ?Ñ?и да Ñ?е инÑ?Ñ?алиÑ?аÑ?Ñ? или надогÑ?аде.</string>
-  <string name="pref_use_persistent_notifications">Увек пÑ?икажи иконÑ? Ñ? Ñ?Ñ?лбаÑ?Ñ? када Ñ?е Ð?Ñ?боÑ? конекÑ?ован</string>
-  <string name="pref_use_persistent_notifications_title">СÑ?ално Ñ?кÑ?Ñ?Ñ?ене ноÑ?иÑ?икаÑ?иÑ?е</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?ови омогÑ?Ñ?ени!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Ð?забеÑ?иÑ?е локална и Ñ?езиÑ?ка подеÑ?аваÑ?а за Ð?Ñ?боÑ?</string>
-  <string name="wizard_locale_title">Ð?забеÑ?иÑ?е Ñ?език</string>
-  <string name="wizard_locale_msg">Ð?оÑ?иÑ?Ñ?и подÑ?азÑ?меваÑ?Ñ?Ñ?и или пÑ?ебаÑ?и на Ñ?Ñ?енÑ?Ñ?ни Ñ?език</string>
-  <string name="btn_save_settings">СаÑ?Ñ?ваÑ? подеÑ?аваÑ?а</string>
-  <string name="menu_vpn">Ð?Ð?Ð?</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-sv/strings.xml b/orbotservice/src/main/res/values-sv/strings.xml
index e176cb2a..867bb428 100644
--- a/orbotservice/src/main/res/values-sv/strings.xml
+++ b/orbotservice/src/main/res/values-sv/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot är en gratis proxyapp som möjliggör andra appar att använda internet mer säkert. Orbot använder Tor för att kryptera din internettrafik och döljer den genom att den studsar genom ett antal datorer världen över. Tor är fri programvara och ett öppet nätverk som hjälper dig att skydda dig mot en form av nätverksövervakning som hotar personlig integritet och frihet, hemliga affärsaktiviteter och relationer, och skyddar mot statlig övervakning även kallad trafikanalys.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot startar...</string>
+    <string name="status_starting_up">Orbot startar...</string>
   <string name="status_activated">Uppkopplad till Tor nätverket</string>
   <string name="status_disabled">Orbot är inaktiverad</string>
   <string name="status_shutting_down">TorService avslutas</string>
   <string name="tor_process_starting">Startar Tor klient...</string>
   <string name="tor_process_complete">färdig.</string>
-  <string name="tor_process_waiting">väntar.</string>
-  <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina appar att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Hem</string>
-  <string name="menu_browse">Bläddra</string>
-  <string name="menu_settings">Inställningar</string>
-  <string name="menu_log">Logg</string>
-  <string name="menu_info">Hjälp</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stopp</string>
-  <string name="menu_about">Om</string>
-  <string name="menu_promo_apps">Skaffa appar...</string>
-  <string name="main_layout_download">Ladda Ner</string>
-  <string name="main_layout_upload">Ladda Upp</string>
-  <string name="button_help">Hjälp</string>
-  <string name="button_close">Stäng</string>
-  <string name="button_about">Om</string>
-  <string name="button_clear_log">Rensa logg</string>
-  <string name="menu_verify">Kontrollera</string>
-  <string name="menu_exit">Avsluta</string>
-  <string name="menu_scan">Skanna BridgeQR</string>
-  <string name="menu_share_bridge">Dela BridgeQR</string>
-  <string name="press_to_start">- tryck länge för att starta -</string>
-  <string name="pref_trans_proxy_group">Transparent proxy (kräver root)</string>
-  <string name="pref_trans_proxy_title">Transparent proxy</string>
-  <string name="pref_trans_proxy_summary">Automatisk torifiering av appar</string>
-  <string name="pref_transparent_all_title">Tor:a Allt</string>
-  <string name="pref_transparent_all_summary">Proxy trafik för alla appar genom Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">VARNING: Kringgår vanliga portar (80, 443, etc). *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar.</string>
-  <string name="pref_transparent_port_title">Port-lista</string>
-  <string name="pref_transparent_port_summary">Lista över portar att köra genom proxy. *ANV�ND ENDAST* om \'Alla\' eller \'App\'-läge inte fungerar</string>
-  <string name="pref_transparent_port_dialog">Skriv in portar till proxy</string>
-  <string name="pref_has_root">Begär root-åtkomst</string>
-  <string name="pref_has_root_summary">Begär root-åtkomst för transparent proxy</string>
-  <string name="status_install_success">Tor-filerna installerades utan problem!</string>
-  <string name="status_install_fail">De körbara Tor-filerna kunde inte installeras. Kontrollera loggen och underrätta tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Applikationsfel</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Om Orbot</string>
-  <string name="btn_next">Nästa</string>
-  <string name="btn_back">Tillbaka</string>
-  <string name="btn_finish">Slutför</string>
-  <string name="btn_okay">Okej</string>
-  <string name="btn_cancel">Avbryt</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Orbot-information</string>
-  <string name="wizard_details_msg">Orbot är en mjukvara med öppen källkod som använder sig av Tor, LibEvent och Polipo. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) till Tor-nätverket. Orbot har också möjligheten att, på rootade enheter, skicka all trafik genom Tor.</string>
-  <string name="wizard_permissions_root">Tillstånd givet</string>
-  <string name="wizard_permissions_stock">Orbot rättigheter</string>
-  <string name="wizard_premissions_msg_root">Utmärkt! Vi har upptäckt att du har root tillstånd aktiverat för Orbot. Vi kommer använda denna makt ansvarsfullt.</string>
-  <string name="wizard_permissions_msg_stock">Det är inte nödvändigt, men Orbot kan bli ett kraftfullare verktyg om din enhet har root tillgång. Använd knappen nedan för att ge Orbot superkrafter!</string>
-  <string name="wizard_permissions_no_root">Om du inte har root tillgång eller inte har en aning om vad vi pratar om, använd bara appar som är gjorda att fungera med Orbot.</string>
-  <string name="wizard_permissions_consent">Jag förstår och vill fortsätta utan Superuser.</string>
-  <string name="wizard_permission_enable_root">Ge Orbot root tillgång</string>
-  <string name="wizard_configure">Konfigurera torifikation</string>
-  <string name="wizard_configure_msg">Orbot ger dig möjligheten att skicka all applikationstrafik genom Tor ELLER att själv välja applikationer individuellt.</string>
-  <string name="wizard_configure_all">Proxy alla appar genom Tor</string>
-  <string name="wizard_configure_select_apps">Välj enskilda appar för Tor</string>
-  <string name="wizard_tips_tricks">Orbot-anpassade appar</string>
-  <string name="wizard_tips_msg">Apparna nedanför var utvecklade att fungera med Orbot. Klicka varje knapp för att installera nu, eller hitta dom senare på Google Play, på GuardianProject.info, eller via F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Säker chattklient för Android</string>
-  <string name="wizard_tips_proxy">Proxy-inställningar - Lär dig hur du konfigurerar appar att fungera med Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Sökmotor App</string>
-  <string name="wizard_tips_twitter">Ställ in Twitter proxy till värd \"localhost\" och port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Skapa en story och ge den till Tor för säkerhet!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy-inställningar</string>
-  <string name="wizard_proxy_help_msg">Om Android-appen du använder har stöd för en HTTP- eller SOCKS-proxy, så kan du konfigurera den at ansluta till Orbot och använda Tor.\n\n\nInställningen för värdnamn är 127.0.0.1 eller \"localhost\". För HTTP är portinställningen 8118. För SOCKS är porten 9050. Du bör använda SOCKS4A eller SOCKS5 om möjligt.\n\n\n\nDu kan lära dig mer om proxy på Android via FAQ på: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Orbot är redo!</string>
-  <string name="wizard_final_msg">Miljoner människor världen över använder sig av Tor av flera olika orsaker.\n\nJournalister och bloggare, människorättsförsvarare, brottsbekämpare, soldater, företag, innevånare i repressiva regimer, och bara vanliga innevånare... och nu är du redo också!</string>
-  <string name="wizard_exit_at_first_screen_toast">Vänligen konfigurera Orbot innan du kan använda den!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Du har anslutit till Tor-nätverket - men detta betyder INTE att din enhet är säker. Du kan använda knappen \'Webbläsare\' för att testa din anslutning. \n\nBesök oss på https://guardianproject.info/apps/orbot eller skicka e-post till help@xxxxxxxxxxxxxxxxxxxx för mer information.</string>
-  <string name="tor_check">Det här kommer att öppna din webbläsare mot https://check.torproject.org för att se om Orbot är rätt konfigurerad och du är uppkopplad mot Tor.</string>
-  <string name="pref_hs_group">Gömd Service Hosting</string>
-  <string name="pref_general_group">Allmänt</string>
-  <string name="pref_start_boot_title">Starta Orbot vid Uppstart</string>
-  <string name="pref_start_boot_summary">Starta Orbot automatiskt och anslut till Tor när din Android enhet startar upp</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot tar Tor till Android!\n\nTor hjälper dig att skydda dig från innehållsfiltrering, trafikanalys och nätverksövervakning som hotar integritet, hemlig information och personliga relationer.\n\nDen här guiden hjälper dig att konfigurera Orbot och Tor på din enhet.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Varning</string>
-  <string name="wizard_warning_msg">Bara genom att installera Orbot anonymiseras inte din mobiltrafik.\n\nDu måste ställa in Orbot, din enhet och andra appar för att använda Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Rättigheter</string>
-  <string name="wizard_permissions_root_msg1">Du kan alternativt ge Orbot \'Superuser\' tillgång för att aktivera avancerade inställningar, som till exempel Transparent Proxy.</string>
-  <string name="wizard_permissions_root_msg2">Om du inte vill göra detta, se till att bara använda appar som anpassats till Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Din enhet verkar inte vara rootad eller ge root eller \'Superuser\'-åtkomst.\n\nVänligen försök använda \'Appar\'-läget i huvudmenyn istället.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Anpassade Appar</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Säkert chatt app med Off-the-Record kryptering</string>
-  <string name="wizard_tips_orweb">Orfox: Integritetsförbättrad webbläsare som går genom Tor</string>
-  <string name="wizard_tips_play">Hitta alla Guardian Project appar på Google Play</string>
-  <string name="wizard_tips_fdroid">Hitta alla Guardian Project-appar i F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Hitta alla Guardian Project-appar på https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxy</string>
-  <string name="wizard_transproxy_msg">Detta tillåter dina appar att automatiskt köra genom Tor nätverket utan någon konfiguration.</string>
-  <string name="wizard_transproxy_hint">(Markera denna om du inte har någon aning om vad vi pratar om)</string>
-  <string name="wizard_transproxy_none">Ingen</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Aktivera Tor Transparent Proxy för Wi-Fi och USB Thetered Enheter (omstart krävs)</string>
-  <string name="button_grant_superuser">Begär Superuser Tillgång</string>
-  <string name="pref_select_apps">Välj Appar</string>
-  <string name="pref_select_apps_summary">Välj Appar att Leda Genom Tor</string>
-  <string name="pref_node_configuration">Nod Konfiguration</string>
-  <string name="pref_node_configuration_summary">Det här är avancerade inställningar som kan minska din anonymitet</string>
-  <string name="pref_entrance_node">Ingångsnoder</string>
-  <string name="pref_entrance_node_summary">Fingeravtryck, nicks, länder, och adresser för första hoppet</string>
-  <string name="pref_entrance_node_dialog">Skriv in Ingångs Noder</string>
-  <string name="pref_allow_background_starts_title">Tillåt start i bakgrunden</string>
-  <string name="pref_allow_background_starts_summary">Låt alla appar säga åt Orbot att starta Tor och relaterade tjänster</string>
-  <string name="button_proxy_all">Allt genom proxy</string>
-  <string name="button_proxy_none">Inget genom proxy</string>
-  <string name="button_invert_selection">Invertera val</string>
-  <string name="pref_proxy_title">Utgående nätverksproxy (Valfri)</string>
-  <string name="pref_proxy_type_title">Proxy-typ</string>
-  <string name="pref_proxy_type_summary">Protokoll att använda för proxyserver: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Skriv in Proxy Typ</string>
-  <string name="pref_proxy_host_title">Proxy-värd</string>
-  <string name="pref_proxy_host_summary">Proxyserverns värdnamn</string>
-  <string name="pref_proxy_host_dialog">Skriv in Proxy Värd</string>
-  <string name="pref_proxy_port_title">Utgående Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxyserverns port</string>
-  <string name="pref_proxy_port_dialog">Skriv in Proxy port</string>
-  <string name="pref_proxy_username_title">Utgående proxy användarnamn</string>
-  <string name="pref_proxy_username_summary">Proxyanvändarnamn (Valfri)</string>
-  <string name="pref_proxy_username_dialog">Ange proxyanvändarnamn</string>
-  <string name="pref_proxy_password_title">Utgående proxy lösenord</string>
-  <string name="pref_proxy_password_summary">Proxylösenord (Valfri)</string>
-  <string name="pref_proxy_password_dialog">Ange proxylösenord</string>
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Ställer in full transparent proxyfiering...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ställer in app-baserad transparent proxyfiering...</string>
-  <string name="transparent_proxying_enabled">Transparent proxy AKTIVERAD</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy aktiverad för Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">VARNING: kunde ej starta transparent proxy!</string>
-  <string name="transproxy_rules_cleared">TransProxy regler rensade</string>
-  <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
-  <string name="privoxy_is_running_on_port_">Polipo körs på port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ställer in port-baserad transparent proxyfiering...</string>
-  <string name="bridge_error">Bro Error</string>
-  <string name="bridge_requires_ip">För att använda bro funktionen måste du skriva in minst en bro IP adress.</string>
-  <string name="send_email_for_bridges">Skicka ett email till bridges@xxxxxxxxxxxxxx med linjen \"get bridges\" ensamt som meddelande från ett gmail konto.</string>
-  <string name="error">Fel</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Kunde inte starta Tor-process:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Din NåbaraAdresser inställning orsakade ett undantag!</string>
   <string name="your_relay_settings_caused_an_exception_">Din relä inställning orsakade ett undantag!</string>
-  <string name="exit_nodes">Utgångsnoder</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingeravtryck, nicks, länder, och adresser för sista hoppet</string>
-  <string name="enter_exit_nodes">Skriv in Exit Noder</string>
-  <string name="exclude_nodes">Exkludera Noder</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingeravtryck, nicks, länder och adresser att exkludera</string>
-  <string name="enter_exclude_nodes">Skriv in Exkluderade Noder</string>
-  <string name="strict_nodes">Strikta Noder</string>
-  <string name="use_only_these_specified_nodes">Använd *enbart* dessa specificerade noder</string>
-  <string name="bridges">Broar</string>
-  <string name="use_bridges">Använd Broar</string>
-  <string name="bridges_obfuscated">Förvillande Broar</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Aktivera alternativa ingångsnoder till Tor nätverket</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Aktivera om konfigurerade broar är förvillande broar</string>
-  <string name="ip_address_and_port_of_bridges">IP adress och port för broar</string>
-  <string name="enter_bridge_addresses">Skriv in Bro Adresser</string>
-  <string name="relays">Reläer</string>
-  <string name="relaying">�verföring</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Aktivera din enhet till att vara ett icke-utgångsrelä</string>
-  <string name="relay_port">Relä Port</string>
-  <string name="listening_port_for_your_tor_relay">Lyssningsport för din Tor relä</string>
-  <string name="enter_or_port">Allmänt</string>
-  <string name="relay_nickname">Relä namn</string>
-  <string name="the_nickname_for_your_tor_relay">Namnet för din Tor relä</string>
-  <string name="enter_a_custom_relay_nickname">Skriv in ett anpassat relä namn</string>
-  <string name="reachable_addresses">NÃ¥bara Adresser</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Kör som klient bakom en brandvägg med restriktiva policys</string>
-  <string name="reachable_ports">NÃ¥bara portar</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Portar nåbara bakom en restriktiv brandvägg</string>
-  <string name="enter_ports">Skriv in portar</string>
-  <string name="enable_hidden_services">Gömd Tjänstehosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">Tillåt server på enheten att vara tillgänglig via Tor nätverket</string>
-  <string name="enter_localhost_ports_for_hidden_services">Skriv in localhost portar för gömda tjänster</string>
-  <string name="hidden_service_ports">Gömda Tjänsteportar</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">det adresserade namnet för din gömda tjänst (genereras automatiskt)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktivera debug loggen för output (måste använda adb eller aLogCat för att se)</string>
-  <string name="project_home">Projektets hemsidor:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor-licensen</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Tredjepartsprogramvara:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">En app vill öppna gömd tjänsteport %S till Tor nätverket. Detta är säkert om du litar på appen.</string>
-  <string name="found_existing_tor_process">hittade existerande Tor process...</string>
+    <string name="found_existing_tor_process">hittade existerande Tor process...</string>
   <string name="something_bad_happened">Något dåligt hände. Kolla loggen.</string>
-  <string name="hidden_service_on">gömd tjänst på:</string>
-  <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
+    <string name="unable_to_read_hidden_service_name">kan inte läsa gömda tjänstens namn</string>
   <string name="unable_to_start_tor">Kan inte starta Tor:</string>
-  <string name="unable_to_reset_tor">Starta om din enhet, kunde inte återställa Tor!</string>
-  <string name="pref_use_sys_iptables_title">Använd standard Iptables</string>
-  <string name="pref_use_sys_iptables_summary">Använd den inbyggda iptables binären istället för den som kommer med Orbot</string>
-  <string name="error_installing_binares">Tor binärerna kunde inte installeras eller uppgraderas.</string>
-  <string name="pref_use_persistent_notifications">Behåll alltid ikonen i verktygsfältet när Orbot är ansluten</string>
-  <string name="pref_use_persistent_notifications_title">Alltid-PÃ¥ Notifikationer</string>
-  <string name="pref_use_expanded_notifications">Visa utökad notis med Tors utgångsland och IP</string>
-  <string name="pref_use_expanded_notifications_title">Utökade notiser</string>
-  <string name="notification_using_bridges">Broar aktiverade!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Språk</string>
-  <string name="set_locale_summary">Välj plats och språk för Orbot</string>
-  <string name="wizard_locale_title">Välj språk</string>
-  <string name="wizard_locale_msg">Lämna standard eller byt nuvarande språk</string>
-  <string name="powered_by">drivs av Tor</string>
-  <string name="btn_save_settings">Spara Inställningar</string>
-  <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</string>
-  <string name="bandwidth_">Bandbredd:</string>
-  <string name="down">nere</string>
-  <string name="up">uppe</string>
-  <string name="pref_disable_network_title">Ingen auto-sömn för nätverket</string>
-  <string name="pref_disable_network_summary">Låt Tor sova när inget internet finns tillgängligt</string>
-  <string name="newnym">Du har bytt till en ny Tor identitet!</string>
-  <string name="menu_verify_browser">Webbläsare</string>
-  <string name="menu_use_chatsecure">Använd ChatSecure</string>
-  <string name="permission_manage_tor_label">Hantera Tor</string>
-  <string name="permission_manage_tor_description">LÃ¥t denna app kontrollera Tor-servicen</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Det verkar inte som att du har Orfox installerad. Vill du ha hjälp med det, eller ska vi bara öppna webbläsaren?</string>
-  <string name="install_apps_">Installera appar?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nätverksanslutning. Försätter Tor i dvala...</string>
+    <string name="no_internet_connection_tor">Ingen internetanslutning; Tor är i standby-läge...</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="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Ditt publika IP via Tor:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vänligen inaktivera den här appen i Android-&gt;Inställningar-&gt;Appar om du har problem med Orbot:</string>
-  <string name="app_conflict">Appkonflikt</string>
-  <string name="pref_transproxy_refresh_title">Transproxy auto-uppdatering</string>
-  <string name="pref_transproxy_refresh_summary">Sätt Transproxy regler igen när nätverksstatus ändras</string>
-  <string name="pref_transproxy_flush_title">Transproxy TVINGA BORTTAGNING</string>
-  <string name="pref_transproxy_flush_summary">Klicka här för att rensa alla transproxy nätverksregler NU</string>
-  <string name="transparent_proxy_rules_flushed_">Regler för transparent proxy rensade!</string>
-  <string name="you_do_not_have_root_access_enabled">Du har inte root-Ã¥tkomst aktiverad</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Du kan behöva stänga av och starta Orbot för att ändringar i inställningar ska slå igenom.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kb/s</string>
-  <string name="mbps">mb/s</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bryggor uppdaterade</string>
-  <string name="restart_orbot_to_use_this_bridge_">Vänligen starta om Orbot för att aktivera ändringarna</string>
-  <string name="menu_qr">QR-koder</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Om ditt mobilnätverk aktivt blockerar Tor så kan du använda en brygga för att komma åt nätverket. V�LJ en typ av brygga ovan för att aktivera bryggor.</string>
-  <string name="bridge_mode">Bryggläge</string>
-  <string name="get_bridges_email">E-post</string>
-  <string name="get_bridges_web">Webb</string>
-  <string name="activate">Aktivera</string>
-  <string name="apps_mode">Appars VPN-läge</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Du kan få alla appar på din enhet att köra via Tor-nätverket genom att använda VPN-funktionen i Android.\n\n*VARNING* Det här är en ny, experimentell funktion och kanske i vissa fall inte startas automatiskt, eller avslutas. Det bör INTE användas för anonymitet, tan BARA för att ta sig genom brandväggar och filter.</string>
-  <string name="send_email">Skicka e-post</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Du kan få en brygg-adress via e-post, via webben eller genom att skanna en QR-kod för en brygga. Välj \'E-post\' eller \'Webb\' nedan för att begära en brygg-adress.\n\nNär du väl har en adress, kopiera &amp; klistra in den i inställningen för \"Bryggor\" i Orbot och starta om.</string>
-  <string name="install_orweb">Installera Orfox</string>
-  <string name="standard_browser">Standard-webbläsare</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTERA: Endast vanliga Tor-bryggor fungerar på Intel X86/ATOM-enheter</string>
-  <string name="vpn_default_world">Världen</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ta/strings.xml b/orbotservice/src/main/res/values-ta/strings.xml
index 5a24f449..7c258685 100644
--- a/orbotservice/src/main/res/values-ta/strings.xml
+++ b/orbotservice/src/main/res/values-ta/strings.xml
@@ -2,67 +2,17 @@
 <resources>
   <string name="app_name">�ர�பா�� </string>
   <string name="app_description">�ர�பா��, �ன�ன�ம பாத��ாப�பான ம�ற�யில� �ண�ய பயன�ப��த�த மற�ற பயன�பா���ள� பலப�ப��த�த��ிறார� �ன�ற� �ர� �லவ� ப�ரா��ஸி பயன�பா�� ���ம�. �ர�பா�� ����ள� �ண�ய ப�ா����வரத�த� ��றியா��� த�ார� பயன�ப��த�த��ிறத� மற�ற�ம� �தன� பின�னர� �ல�ம� ம�ழ�வத�ம� �ணினி�ள� �ர� த�ா�ர� ம�லம� �திர����ிறத� �த� மற�த�தவர�. த�ார� �லவ� ம�ன�ப�ார�ள� மற�ற�ம� ந����ள� ப�ா����வரத�த� ப��ப�பாய�வ�
  �ன�ற தனிப�ப��� ��தந�திரம� மற�ற�ம� தனிய�ரிம�, ர��ிய வணி� ந�வ�ி�����ள� மற�ற�ம� �றவ��ள�, மற�ற�ம� மாநில பாத��ாப�ப� �����ற�த�த�ம� ந���வ�ார��� �ண��ாணிப�ப� வ�ிவ �திரா� பாத��ா��� �தவ��ிறத� �ன�ற� �ர� திறந�த ந���வ�ார��� ���ம�.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">த�ர� த�வ��� மற�ற�ம� நிற�த�த</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">�ர�பா�� த�வ�����ிறத�...</string>
+    <string name="status_starting_up">�ர�பா�� த�வ�����ிறத�...</string>
   <string name="status_activated">த�ார� ந���வ�ார��� �ண����ப�ப���</string>
   <string name="status_disabled">�ர�பா�� நிற�த�தப�ப���த�</string>
   <string name="tor_process_starting">த�ர� த�வ���ப�ப���ிறத�...</string>
   <string name="tor_process_complete">ம��ிந�தத�.</string>
-  <string name="tor_process_waiting">�ாத�திர����ிறத�</string>
-  <string name="not_anonymous_yet">����ரி����: ����ள� ப�ா����வரத�த� �ன�ன�ம� �நாமத�ய �ல�ல! HTTP பதிலாள� 127.0.0.1:8118 �ல�லத� SOCKS4A �ல�லத� SOCKS5 ப�ரா��ஸி 127.0.0.1:9050 பயன�ப��த�த ����ள� பயன�பா���ள� ����ம���� ��ாள�ளவ�ம�</string>
-  <string name="menu_home">ஹ�ம�</string>
-  <string name="menu_browse">�லவி��</string>
-  <string name="menu_settings">�ம�ப�ப��ள�</string>
-  <string name="menu_log">பதிவ��ள�</string>
-  <string name="menu_info">�தவி</string>
-  <string name="menu_start">த�வ����</string>
-  <string name="menu_stop">நிற�த�த�</string>
-  <string name="menu_about">�ர�பா�� பற�றி</string>
-  <string name="main_layout_download">பதிவிற����</string>
-  <string name="main_layout_upload">பதிவ�ற�ற�</string>
-  <string name="button_help">�தவி</string>
-  <string name="button_close">ம���</string>
-  <string name="button_about">�ர�பா�� பற�றி </string>
-  <string name="button_clear_log">பதிவ��ள� ந�����</string>
-  <string name="menu_verify">�ரி பார�த�தல�</string>
-  <string name="menu_exit">வ�ளிய�ற�</string>
-  <string name="menu_scan">ஸ���ன� BridgeQR</string>
-  <string name="menu_share_bridge">BridgeQR ப�ிர�ந�தி��</string>
-  <string name="press_to_start">- த�ா���� த��ர�ந�த� �ழ�த�த�� -</string>
-  <string name="pref_transparent_port_fallback_summary">����ரி����: ப�ாத�வான த�ற��ள� (80, 443, ப�ான�றவ�) circumvents. * பயன�ப��த�த ம����ம� * \'�ன�த�த�\' �ல�லத� \'�ப�\' ம�ற�யில� வ�ல� �ல�ல� �ன�றால�.</string>
-  <string name="wizard_title">�ர�பா�� </string>
-  <string name="wizard_btn_tell_me_more">�ர�பா�� பற�றி</string>
-  <string name="btn_next">���த�த�</string>
-  <string name="btn_back">பின� ��ல�</string>
-  <string name="btn_finish">ம��ித�தி��</string>
-  <string name="btn_okay">�ரி</string>
-  <string name="btn_cancel">ரத�த� ��ய�</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">�ர�பா�� பற�றிய த�வல�</string>
-  <string name="wizard_details_msg">Orbot த�ார�, LibEvent மற�ற�ம� Polipo ��ாண���ள�ளத� �ன�ற� �ர� திறந�த ம�ல பயன�பா�� ���ம�. �த� �ர� local HTTP பதிலாள� (8118) மற�ற�ம� த�ார� ந���வ�ார��� �ர� SOCKS ப�ரா��ஸி (9050) வழ�����ிறத�. Orbot ம�ல�ம� த�ார� ம�லம� �ன�த�த� �ண�ய ப�ா����வரத�த� �ன�ப�ப�ம� திறன�, ROOTED �ாதனத�தில� ��ாண��ிர����ிறத�.</string>
-  <string name="wizard_permissions_root">�ன�மதி வழ���ப�ப���த�</string>
-  <string name="wizard_tips_duckgo">��� ��� �� த���ப�ாறி ��யலி</string>
-  <string name="wizard_proxy_help_info">பதிலாள� �ம�ப�ப��ள�</string>
-  <string name="wizard_final">�ர�பா�� தயாரா� �ள�ளத�!</string>
-  <string name="wizard_exit_at_first_screen_toast">தயவ� ��ய�த�, �ர�பா�� ���ம�த�த பின� பயன�ப��த�தவ�ம�</string>
-  <!--END Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">����ரி����</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">�ன�மதி�ள�</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">�ர�பா���ன� ��யல�ப��ம� ��யலி�ள�</string>
-  <!--Transparent Proxy screen-->
-  <string name="pref_select_apps">��யலி�ள� த�ர�ந�த���</string>
-  <string name="pref_proxy_password_summary">பதிலாள� ��வ�����ால� (����ாயமற�ற)</string>
-  <string name="pref_proxy_password_dialog">பதிலாள� ��வ�����ால�ல� �ள�ளி�வ�ம�</string>
-  <string name="status">நில�</string>
-  <string name="default_bridges"></string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
 </resources>
diff --git a/orbotservice/src/main/res/values-th/strings.xml b/orbotservice/src/main/res/values-th/strings.xml
index d73cfbe4..b184f1cc 100644
--- a/orbotservice/src/main/res/values-th/strings.xml
+++ b/orbotservice/src/main/res/values-th/strings.xml
@@ -1,169 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">�ริ�ม�ละหยุ� Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_activated">��ื�อม��อ�ั���รือ��าย Tor</string>
+    <string name="status_activated">��ื�อม��อ�ั���รือ��าย Tor</string>
   <string name="tor_process_complete">�สร��</string>
-  <string name="tor_process_waiting">�ำลั�รอ</string>
-  <string name="not_anonymous_yet">�ำ��ือ�: ��อมูล�รา�ร�อ��ุ�ยั��ม������ิร�าม! �รุ�า�ั����า��ร��รม�อ��ุ��ห���� HTTP �ร�อ��ี�ี� 127.0.0.1:8118 หรือ��� SOCKS4A หรือ SOCKS5 �ร�อ��ี�ี� 127.0.0.1:9050</string>
-  <string name="menu_home">ห��าหลั�</string>
-  <string name="menu_browse">�ลือ�</string>
-  <string name="menu_settings">�ั����า</string>
-  <string name="menu_log">�ูม</string>
-  <string name="menu_info">��วย�หลือ</string>
-  <string name="menu_start">�ริ�ม</string>
-  <string name="menu_stop">หยุ�</string>
-  <string name="menu_about">��ี�ยว�ั�</string>
-  <string name="button_help">��วย�หลือ</string>
-  <string name="button_close">�ิ�</string>
-  <string name="button_about">��ี�ยว�ั�</string>
-  <string name="button_clear_log">ล�า��ูม</string>
-  <string name="menu_verify">�รว�สอ�</string>
-  <string name="menu_exit">ออ�</string>
-  <string name="press_to_start">- ��ะ��า���ื�อ�ริ�ม -</string>
-  <string name="pref_trans_proxy_group">�ร�อ��ีล�อ�ห� (��อ��ารสิ��ิ� Root)</string>
-  <string name="pref_trans_proxy_title">�ร�อ��ีล�อ�ห�</string>
-  <string name="pref_trans_proxy_summary">�ห���ร��รม����า� Tor ��ยอั���มั�ิ</string>
-  <string name="pref_transparent_all_title">��� Tor �ั��ุ�อย�า�</string>
-  <string name="pref_transparent_all_summary">�ห��าร�รา�ร�อ��ุ���ร��รม��า��ร�อ��ี�อ� Tor</string>
-  <string name="pref_transparent_port_fallback_summary">�ำ��ือ�: หลี��ลี�ย��อร���ั�ว�� (���� 80, 443) *�������อ�มื�อ* �หม� \'�ั��หม�\' หรือ \'��ร��รม\' ����า��ม����</string>
-  <string name="pref_transparent_port_title">ราย�าร�อร��</string>
-  <string name="pref_transparent_port_summary">ราย�าร�อร���ี���า��ร�อ��ี *�������อ�มื�อ* �หล� \'�ั��หม�\' หรือ \'��ร��รม\' ����า��ม����</string>
-  <string name="pref_transparent_port_dialog">ระ�ุ�อร���ี��ะ�ห���า��ร�อ��ี</string>
-  <string name="pref_has_root">��อ��ารสิ��ิ� root</string>
-  <string name="pref_has_root_summary">��อ��ารสิ��ิ� root ��ื�อ����า��ร�อ��ีล�อ�ห�</string>
-  <string name="status_install_success">�ิ��ั�����ารี�อ� Tor สำ�ร���ล�ว</string>
-  <string name="status_install_fail">�ม�สามาร��ิ��ั�����ารี�อ� Tor ��� ��ร��รว�สอ��ูม�ละ�����ั�หา�ี� tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">��ร��รม�ำ�า��ิ��ลา�</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">��ี�ยว�ั� Orbot</string>
-  <string name="btn_next">��อ��</string>
-  <string name="btn_back">�อยหลั�</string>
-  <string name="btn_finish">�สร��</string>
-  <string name="btn_okay">��ล�</string>
-  <string name="btn_cancel">ย��ลิ�</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">รายละ�อีย���ี�ยว�ั� Orbot</string>
-  <string name="wizard_permissions_root">�ห�สิ��ิ��ล�ว</string>
-  <string name="wizard_permissions_stock">สิ��ิ��อ� Orbot</string>
-  <string name="wizard_premissions_msg_root">ยอ��ยี�ยม! �รา��ว�า�ุ��ห�สิ��ิ� root �ั� Orbot �รา�ะ���สิ��ิ��ี�อย�า��า��ลา�</string>
-  <string name="wizard_permissions_msg_stock">�ึ��ะ�ม�����รื�อ��ำ���� �����าหา� Orbot �ะ�ำ�า����อย�า�มี�ระสิ��ิภา�มา��ึ����า���รั�สิ��ิ� root ����ุ�ม��า�ล�า���ื�อมอ��ลั��ี��ห� Orbot!</string>
-  <string name="wizard_permissions_no_root">��า�ุ��ม�มีสิ��ิ� root หรือ�ม����า��ว�า�รา�ำลั��ู��ึ�อะ�รอยู� �ห�������าะ��ร��รม�ี�สร�า�มา��ื�อ����ั� Orbot ���า�ั��</string>
-  <string name="wizard_permissions_consent">�ั����า���ละ��อ��าร�ำ��อ��ย�ม����สิ��ิ� Superuser</string>
-  <string name="wizard_permission_enable_root">�ห�สิ��ิ� root ��� Orbot</string>
-  <string name="wizard_configure">�ั����า�าร����า���า� Tor</string>
-  <string name="wizard_configure_msg">Orbot มี�ัว�ลือ��ห��ุ�ส����อมูล�าร�รา�ร�อ��ุ���ร��รม��า� Tor หรือ�ลือ�����า����าะ��ร��รม�����</string>
-  <string name="wizard_configure_all">�ห��ุ���ร��รม��า��ร�อ��ี�อ� Tor</string>
-  <string name="wizard_configure_select_apps">�ลือ���ร��รม�ี��ะ�ห���� Tor</string>
-  <string name="wizard_tips_tricks">��ร��รม�ี��������ั� Orbot</string>
-  <string name="wizard_tips_proxy">�าร�ั����า�ร�อ��ี - �รีย�รู��าร�ั����า��ร��รม�ห��ำ�า��ั� Orbot ���</string>
-  <string name="wizard_proxy_help_info">�ั����า�ร�อ��ี</string>
-  <string name="wizard_final">Orbot �ร�อม����า��ล�ว!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">�ะ����ว����ราว���อร��อ��ุ���ิ�ห��า https://check.torproject.org ��ื�อ�รว�สอ�ว�า�าร�ั����า�อ� Orbot �ู���อ�หรือ�ม� �ละ�ุ������ื�อม��อ�ั� Tor หรือ�ม�</string>
-  <string name="pref_general_group">�ั�ว��</string>
-  <string name="pref_start_boot_title">�ริ�ม Orbot �มื�อ��ิ�ระ��</string>
-  <string name="pref_start_boot_summary">�ริ�ม Orbot ��ยอั���มั�ิ�ละ�ห���ื�อม��อ�ั� Tor �มื�ออุ��ร���อ��รอย���อ��ุ��ริ�ม�ำ�า�</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">�ำ��ือ�</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">สิ��ิ�</string>
-  <string name="wizard_permissions_root_msg1">�ุ�สามาร��ลือ��ห�สิ��ิ� Superuser ��� Orbot ��ื�อ��ิ�����า��ุ�สม�ั�ิ�ั��สู� ���� �ร�อ��ีล�อ�ห����</string>
-  <string name="wizard_permissions_root_msg2">��า�ุ��ม���อ��าร ��ร������ว�า�ุ������ร��รม�ี�สร�า�มา��ื�อ����ั� Orbot</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">��ร��รม�ี��������ั� Orbot</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">�ร�อ��ีล�อ�</string>
-  <string name="wizard_transproxy_msg">�ะอ�ุ�า��ห���ร��รม�อ��ุ��ำ�า���า���รือ��าย Tor อั���มั�ิ��ย�ม���อ��ั����า���</string>
-  <string name="wizard_transproxy_hint">(�ิ���ัว�ลือ��ี���า�ุ��ม����า���รื�อ��ี��รา�ำลั�อ�ิ�าย)</string>
-  <string name="wizard_transproxy_none">�ม�มี</string>
-  <string name="pref_transparent_tethering_title">�าร��ื�อม��อ��ว���า� Tor</string>
-  <string name="pref_transparent_tethering_summary">��ิ�����า��ร�อ��ีล�อ�ห��อ� Tor �ห�อุ��ร��อื���ี���ื�อม��า� Wi-Fi �ละ USB (��อ��ริ�ม�หม�)</string>
-  <string name="button_grant_superuser">ร�อ��อ�าร���า�ึ�สิ��ิ� Superuser</string>
-  <string name="pref_select_apps">�ลือ���ร��รม</string>
-  <string name="pref_select_apps_summary">�ลือ���ร��รม�ี��ะ�ห���ื�อม��อ��า� Tor</string>
-  <string name="pref_node_configuration">�าร�ั����า�ห��</string>
-  <string name="pref_node_configuration_summary">�าร�ั����า�ั��สู��หล�า�ี��ำ�ห��วาม�����ิร�าม�อ��ุ�ล�ล����</string>
-  <string name="pref_entrance_node">�ห���า����า</string>
-  <string name="pref_entrance_node_summary">ลาย�ิ�วมือ, �ื�อ�ล��, �ระ��ศ �ละ�ี�อยู��อ�ฮอ��ร�</string>
-  <string name="pref_entrance_node_dialog">ระ�ุ�ห���า����า</string>
-  <string name="pref_proxy_type_summary">��ร���อล�ี����สำหรั���ิร���วอร��ร�อ��ี: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">ระ�ุ��ิ��อ��ร�อ��ี</string>
-  <string name="pref_proxy_host_dialog">ระ�ุ��รื�อ��ร�อ��ี</string>
-  <string name="pref_proxy_port_dialog">ระ�ุ�อร���อ��ร�อ��ี</string>
-  <string name="status">ส�า�ะ</string>
-  <string name="setting_up_full_transparent_proxying_">�ำลั��ิ��ั���ร�อ��ีล�อ�ห�������ม�</string>
-  <string name="setting_up_app_based_transparent_proxying_">�ำลั��ิ��ั���ร�อ��ีล�อ�ห����ระ�ุ��ร��รม�</string>
-  <string name="transparent_proxying_enabled">�ร�อ��ีล�อ�ห��ู���ิ�����า�</string>
-  <string name="transproxy_enabled_for_tethering_">�ร�อ��ีล�อ�ห��ู���ิ����สำหรั��าร��ื�อม��อ��ว�!</string>
-  <string name="warning_error_starting_transparent_proxying_">�ำ��ือ�: ��ิ���อ�ิ��ลา���ะ�ี��ร�อ��ีล�อ�ห��ริ�ม�ำ�า�</string>
-  <string name="transproxy_rules_cleared">���อ��ร�อ��ีล�อ�ห��ู�ล�า�</string>
-  <string name="couldn_t_start_tor_process_">�ม�สามาร��ริ�ม��ร��ส�อ� Tor</string>
-  <string name="setting_up_port_based_transparent_proxying_">�ำลั��ิ��ั���ร�อ��ีล�อ�ห����ระ�ุ�อร���</string>
-  <string name="bridge_error">สะ�า��ั���อ�</string>
-  <string name="bridge_requires_ip">���าร����า��ุ�สม�ั�ิสะ�า� �ุ���อ�ระ�ุ�ี�อยู��อ�ี�อ�สะ�า�อย�า���อย 1 �อ�ี </string>
-  <string name="send_email_for_bridges">ส��อี�มล���ี� bridges@xxxxxxxxxxxxxx ��ยระ�ุ��� \"get bridges\" ����ื�อ�วามอี�มล �ล�วส����ย����ั��ี�ู���� gmail</string>
-  <string name="error">�ิ��ลา�</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">�าร�ั����า ReachableAddresses �อ��ุ��ำ�ห���ิ���อ�ิ��ลา�</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">�ม�สามาร��ริ�ม��ร��ส�อ� Tor</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">�าร�ั����า ReachableAddresses �อ��ุ��ำ�ห���ิ���อ�ิ��ลา�</string>
   <string name="your_relay_settings_caused_an_exception_">�าร�ั����ารี�ลย��อ��ุ��ำ�ห���ิ���อ�ิ��ลา�</string>
-  <string name="exit_nodes">�ห���า�ออ�</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">ลาย�ิ�วมือ, �ื�อ�ล��, �ระ��ศ �ละ�ี�อยู��อ�ฮอ�สุ���าย</string>
-  <string name="enter_exit_nodes">ระ�ุ�ห���า�ออ�</string>
-  <string name="exclude_nodes">�ห��ย��ว��</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">ลาย�ิ�วมือ, �ื�อ�ล��, �ระ��ศ �ละ�ี�อยู��ี�ละ�ว��</string>
-  <string name="enter_exclude_nodes">ระ�ุ�ห��ย��ว��</string>
-  <string name="strict_nodes">�ห�����ม�ว�</string>
-  <string name="use_only_these_specified_nodes">��� *���าะ* �ห���ี�ระ�ุ�หล�า�ี����า�ั��</string>
-  <string name="bridges">สะ�า�</string>
-  <string name="use_bridges">����า�สะ�า�</string>
-  <string name="bridges_obfuscated">สะ�า��ี��ู�อำ�รา�</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">��ิ�����า��ห���า����าอื�����าสู���รือ��าย Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">��ิ�����า���าสะ�า��ี��ู��ั����า����สะ�า�อำ�รา�</string>
-  <string name="ip_address_and_port_of_bridges">�ี�อยู��อ�ี�ละ�อร���อ�สะ�า�</string>
-  <string name="enter_bridge_addresses">ระ�ุ�ี�อยู��อ�สะ�า�</string>
-  <string name="relays">รี�ลย�</string>
-  <string name="relaying">�ารรี�ลย�</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">�ำ�ห�อุ��ร���อ��ุ��ำ�า�����รี�ลย�����ม�����า�ออ�</string>
-  <string name="relay_port">�อร��รี�ลย�</string>
-  <string name="listening_port_for_your_tor_relay">�อร���ี��ห�รี�ลย��อ� Tor �ำ�า�</string>
-  <string name="enter_or_port">ระ�ุ�อร���อ� OR</string>
-  <string name="relay_nickname">�ื�อ�ล���อ�รี�ลย�</string>
-  <string name="the_nickname_for_your_tor_relay">�ื�อ�ล��สำหรั�รี�ลย��อ� Tor �อ��ุ�</string>
-  <string name="enter_a_custom_relay_nickname">ระ�ุ�ื�อ�ล���อ�รี�ลย���ย�ำห���อ�</string>
-  <string name="reachable_addresses">�ี�อยู��ึ�����า�ึ����</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">�ำ�า�������รื�อ�ลู���ายหลั���ร�วอลล���วย��ย�าย������ม�ว�</string>
-  <string name="reachable_ports">�อร���ี����า�ึ����</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">�อร���ี����า�ึ����หลั���ร�วอลล�������ม�ว�</string>
-  <string name="enter_ports">ระ�ุ�อร��</string>
-  <string name="enter_localhost_ports_for_hidden_services">ระ�ุ�อร���อ� localhost สำหรั��ห��ริ�าร�ม���ิ���ย�ำ�า� </string>
-  <string name="hidden_service_ports">�อร���อ��ริ�าร�ม���ิ���ย</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">�ื�อ�ี����ระ�ุสำหรั��ริ�าร�ม���ิ���ย�อ��ุ� (สร�า���ยอั���มั�ิ)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">��ิ��ห��ูม�ี�ั���ส���ล (��อ���� adb หรือ aLogCat ��ื�อ�ู)</string>
-  <string name="project_home">�ี�อยู���ร��าร:</string>
-  <string name="the_tor_license">สั��าอ�ุ�า��อ� Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">�อ����วร���ย�ู��ลิ�อื��:</string>
-  <string name="hidden_service_request">��ร��รม��อ��าร��ิ��อร�� %S �ี���อ�อยู��อ���ิร���วอร��ห���ื�อม�ั���รือ��าย Tor �าร�ระ�ำ�ี��ลอ�ภัย��า�ุ���ื�อ�ือ��ร��รม�ั��</string>
-  <string name="something_bad_happened">��ิ�อะ�ร�ม��ีสั�อย�า� �ห��รว��ู�า��ูม</string>
-  <string name="hidden_service_on">�ริ�าร�ม���ิ���ยอยู���:</string>
-  <string name="unable_to_read_hidden_service_name">�ม�สามาร�อ�า��ื�อ�อ��ริ�าร�ม���ิ���ย</string>
+    <string name="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_sys_iptables_title">��� Iptables �ริยาย</string>
-  <string name="pref_use_sys_iptables_summary">������ารี�อ� iptables �ี�มีอยู��ล�ว����ัว�ี���มมา�ั� Orbot</string>
-  <string name="error_installing_binares">�ม�สามาร��ิ��ั��หรือ�รั�รุ�����ารี�อ� Tor</string>
-  <string name="pref_use_persistent_notifications">�ส���อ�อ����ูล�าร��สมอ�มื�อ Orbot ��ื�อม��ออยู�</string>
-  <string name="pref_use_persistent_notifications_title">�าร������ือ�����ลอ��วลา</string>
-  <string name="notification_using_bridges">��ิ�����า�สะ�า��ล�ว!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">�ลือ��ล��ล�ละภาษาสำหรั� Orbot</string>
-  <string name="wizard_locale_title">�ลือ�ภาษา</string>
-  <string name="wizard_locale_msg">�����า�ริยายหรือ�ลือ�ภาษา�ั��ุ�ั�</string>
-  <string name="btn_save_settings">�ั��ึ��าร�ั����า</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-tl/strings.xml b/orbotservice/src/main/res/values-tl/strings.xml
index ab165c1e..84374004 100644
--- a/orbotservice/src/main/res/values-tl/strings.xml
+++ b/orbotservice/src/main/res/values-tl/strings.xml
@@ -1,249 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">simulan at ihinto ang Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Nagsisimula na ang Orbotâ?¦</string>
+    <string name="status_starting_up">Nagsisimula na ang Orbotâ?¦</string>
   <string name="status_activated">Konektado sa Tor network</string>
   <string name="status_disabled">Naka-deactivate ang Orbot</string>
   <string name="tor_process_starting">Binubuksan ang Tor clientâ?¦</string>
   <string name="tor_process_complete">kumpleto na.</string>
-  <string name="tor_process_waiting">nag-hihintay</string>
-  <string name="not_anonymous_yet">BABALA: Ang iyong traffic ay hindi pa anonimo! Kung maaari sana ay ikompigura muna ang iyong applications na gumamit ng HTTP proxy 127.0.0.1:8118 o kaya ay SOCKS4A o kaya ay SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Tahanan</string>
-  <string name="menu_browse">Mag-browse</string>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Tala</string>
-  <string name="menu_info">Tulong</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Simulan</string>
-  <string name="menu_stop">Ihinto</string>
-  <string name="menu_about">Tungkol</string>
-  <string name="main_layout_download">Download</string>
-  <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Tulong</string>
-  <string name="button_close">Isara</string>
-  <string name="button_about">Tungkol</string>
-  <string name="button_clear_log">Linisin ang tala</string>
-  <string name="menu_verify">Tiyakin</string>
-  <string name="menu_exit">Labasan</string>
-  <string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>
-  <string name="press_to_start">- pindutin ng matagal para mag umpisa -</string>
-  <string name="pref_trans_proxy_group">Nanganganinag na pag Po-proxy (Kailangan ang Root)</string>
-  <string name="pref_trans_proxy_title">Nanganganinag na pag Po-proxy </string>
-  <string name="pref_trans_proxy_summary">Kusang pag Torifying ng mga Apps</string>
-  <string name="pref_transparent_all_title">Tor lahat</string>
-  <string name="pref_transparent_all_summary">I-proxy ang traffic ng lahat ng apps gamit ang Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">BABALA: Dayain ang mga karaniwang ports (80, 443, etc). *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
-  <string name="pref_transparent_port_title">Lisatahan ng Port</string>
-  <string name="pref_transparent_port_summary">Lisatahan ng mga ports sa proxy. *GAMITIN LAMANG* kung \'Lahat\' o kaya ang \'App\' na paraan ay hindi gumagana.</string>
-  <string name="pref_transparent_port_dialog">Ipasok ang ports sa proxy</string>
-  <string name="pref_has_root">Humiling ng daanan sa Root</string>
-  <string name="pref_has_root_summary">Humiling ng daanan sa Root para sa nanganganinag na pag Po-proxy</string>
-  <string name="status_install_success">Ang Tor binaries ay matagumpay na i-install.</string>
-  <string name="status_install_fail">Ang Tor binary files ay hindi na install. Paki tignan ang tala at magbigay alam sa tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">May mali sa Application</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Tungkol sa Orbot</string>
-  <string name="btn_next">Susunod</string>
-  <string name="btn_back">Balik</string>
-  <string name="btn_finish">Wakas</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Kanselahin</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Ilang detalye sa Orbot</string>
-  <string name="wizard_details_msg">Ang Orbot ay isang open-source application na naglalaman ng Tor, LibEvent at Polipo. Ito ay nagbibigay ng local HTTP proxy (8118) at SOCKS proxy (9050) sa Tor network. Ang Orbot ay nagbibigay din ng kakayahan, sa mga rooted device, na ipadala ang lahat ng trapiko sa internet sa pamamagitan  ng Tor.</string>
-  <string name="wizard_permissions_root">Napahintulotan na</string>
-  <string name="wizard_permissions_stock">Pahintulot ng Orbot</string>
-  <string name="wizard_premissions_msg_root">Mahusay! Natuklasan namin na mayroon pahintulot ang Orbot para sa root. Gagamitin namin ito ng mabuti.</string>
-  <string name="wizard_permissions_msg_stock">Ito ay hindi kinakailangan, ngunit mas mapapalawig ang kakayahan ng Orbot kung ang iyong device ay meron access sa root. Gamitin ang pindutan sa ibaba para bigyan ng superpowers ang Orbot!</string>
-  <string name="wizard_permissions_no_root">Kung wala kang access sa root o wala kang alam sa sinasabi namin, siguraduhin mu nalamang na gagamit ka ng mga apps na ginawa para sa Orbot.</string>
-  <string name="wizard_permissions_consent">Nauunawaan ko at mag-papatuloy ng walang Superuser</string>
-  <string name="wizard_permission_enable_root">Pahintulutan ang Orbot para sa Root</string>
-  <string name="wizard_configure">Kompigurahin ang Torification</string>
-  <string name="wizard_configure_msg">Binibigyan ka ng Orbot ng pagpipilian na i-route lahat ng application traffic gamit ang Tor o piliin ang application isa-isa.</string>
-  <string name="wizard_configure_all">I-proxy lahat ng Apps gamit ang Tor</string>
-  <string name="wizard_configure_select_apps">Pumili ng isa-isang apps para sa Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">Ang mga apps sa ibaba ay dinevelop upang gumana sa Orbot. I-click ang button para i-install, o sila ay mahahanap sa Google Play, sa GuardianProject.info website o sa F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Isang Secure instant messaging client para sa Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Alamin paano magkompigura ng apps para gumana sa Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
-  <string name="wizard_tips_twitter">I-set ang Twitter proxy sa host \"localhost\" at port 8118</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">Kung ang ginagamit na Android app ay gumagamit ng HTTP o SOCKS proxy, ibig sabihin lang noon ay pwede mong isaayos para kumunekta sa Orbot sa paggamit ng Tor.\n\n\n Ang host settings ay 127.0.0.1 o \"localhost\". Para naan sa HTTP, ang port setting ay 8118. Para naman sa SOCKS, ang proxy ay 9050. Kailangan mong gamitin ang SOCKS4A o SOCKS5 kung posible.\n \n\n\n Mas marami kang matututunan sa proxying sa Android sa pamamagitan ng FAQ sa: http://tinyurl.com/proxyandroid .\n </string>
-  <string name="wizard_final">Handa na ang Orbot!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Bubuksan nito ang iyong browser sa https://check.torproject.org para matignan kung ang Orbot ay na-kompigura at konektado ka sa Tor.</string>
-  <string name="pref_hs_group">Tagong Service Hosting</string>
-  <string name="pref_general_group">Pangkalahatan</string>
-  <string name="pref_start_boot_title">Umpisahan ang Orboot sa Boot</string>
-  <string name="pref_start_boot_summary">Kusang umpisahan ang Orbot at kumonekta sa Tor sa pag bukas ng iyong Android Device</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Ang Orbot ang nagdala ng Tor sa Android!\n\nAng Tor ay tumutulong sa iyo na sanggain ang pagsala ng nilalaman, pag-analisa ng trapiko at pangmamatyag sa network na mapanganib sa iyong privacy, conpidensyal na impormasyon at personal na relasyon.\n\nAng wizard ang makakatulong sa iyo para isaayos ang Orbot at Tor sa iyong device.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Babala</string>
-  <string name="wizard_warning_msg">Sa pag-install nang Orbot, hindi nito awtomatikong ina-anonymize ang iyong trapiko sa iyong mobile.\n\nKailangan mong isaayos ng tama ang Orbot, sa iyong device at sa iba pang apps para matagumpay na magamit ang Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Mga Pahintulot</string>
-  <string name="wizard_permissions_root_msg1">Maari mong piliin bigyan ng pahintulot ang Orbot ng \'Superuser\' access para ma-enable ang mga advanced features tulad ng Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">Kapag ayaw mo itong gawin, siguraduhing gumamit ng apps na ginawa upang gumana kasama ang Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Mukang ang iyong device ay hindi pa rooted o hindi nagbibigay ng daan sa root o \'Superuser\'.\n\nPakiusap, o hindi kaya subukan ang paraan ng \'Apps\' sa pangunahing screen.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Isang secure chat app na may Off-the-Record Encryption</string>
-  <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser na gumagana sa pamamagitan ng Tor.</string>
-  <string name="wizard_tips_play">Hanapin ang lahat ng Guardian Project apps sa Google Play</string>
-  <string name="wizard_tips_fdroid">Hanapin ang lahat ng Guardian Project apps sa F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Hanapin ang lahat ng Guardian Project apps sa https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Transparent Proxying</string>
-  <string name="wizard_transproxy_msg">Ito ay bibigyan ng pahintulot ang iyong mga apps na kusang mag-run sa Tor network kahit walang pag-kompigura na ginawa.</string>
-  <string name="wizard_transproxy_hint">(Lagyan ng check ang box na ito kung wala kang alam sa sinasabi namin)</string>
-  <string name="wizard_transproxy_none">Wala</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">I-enable ang Tor Transparent Proxying para sa Wi-Fi at USB Tethered Devices (kailangan mag restart)</string>
-  <string name="button_grant_superuser">Humiling ng Superuser Access</string>
-  <string name="pref_select_apps">Pumili ng Apps</string>
-  <string name="pref_select_apps_summary">Pumili ng Apps para i-route sa Tor</string>
-  <string name="pref_node_configuration">Pagkompigura ng Node</string>
-  <string name="pref_node_configuration_summary">Ang mga ito ay advanced settings na maaring bawasan ang iyong anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, mga bansa at mga address para sa unang lukso</string>
-  <string name="pref_entrance_node_dialog">Pumasok sa Entrance Nodes</string>
-  <string name="pref_allow_background_starts_title">Pahintulutan na magsimula sa background</string>
-  <string name="pref_allow_background_starts_summary">Hayaan ang kahit anong app na sabihin kay Orbot na magsimula ng Tor at anumang malapit na serbisyo.</string>
-  <string name="button_proxy_all">Proxy All</string>
-  <string name="button_proxy_none">Proxy None</string>
-  <string name="button_invert_selection">Baliktarin ang napili</string>
-  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
-  <string name="pref_proxy_type_summary">Mga protocol na gagamitin para sa proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Ilagay ang Proxy Type</string>
-  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy Server hostname</string>
-  <string name="pref_proxy_host_dialog">Ilagay ang Proxy Host</string>
-  <string name="pref_proxy_port_title">Outbound Proxy</string>
-  <string name="pref_proxy_port_summary">Proxy Server Port</string>
-  <string name="pref_proxy_port_dialog">Ilagay ang Proxy port</string>
-  <string name="pref_proxy_username_title">Outbound Proxy Username</string>
-  <string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
-  <string name="pref_proxy_username_dialog">Ilagay ang Proxy Username</string>
-  <string name="pref_proxy_password_title">Outbound Proxy Password</string>
-  <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
-  <string name="pref_proxy_password_dialog">Ilagay ang Proxy Password</string>
-  <string name="status">Katayuan</string>
-  <string name="setting_up_full_transparent_proxying_">Isinasaayos ang kabuuang transparent proxying...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Isinasaayos ang app-based transparent proxying...</string>
-  <string name="transparent_proxying_enabled">Na i-enable na ang Transparent proxying</string>
-  <string name="transproxy_enabled_for_tethering_">Na i-enable na ang TransProxy para sa Thethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">BABALA: error sa pag start ng transparent proxying!</string>
-  <string name="transproxy_rules_cleared">Nalinis na ang mga batas ng TransProxy</string>
-  <string name="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</string>
-  <string name="privoxy_is_running_on_port_">Ang Polipo ay gumagana ngayon sa port:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Isinasaayos ang port-based transpaprent proxying...</string>
-  <string name="bridge_error">Error sa Bridge</string>
-  <string name="bridge_requires_ip">Para magamit ang feature ng bridge, kailangan mong mag lagay ng kahit isang bridge IP address.</string>
-  <string name="send_email_for_bridges">Magpadala ng email sa bridges@xxxxxxxxxxxxxx na mayroong linyang  \"get bridges\" at wala ng iba pang kasama sa katawa ng email gamit ang isang gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ang iyong ReachableAddresses settings ay nag sanhi ng exception!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Hindi ma umpisahan ang proseso ng Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Ang iyong ReachableAddresses settings ay nag sanhi ng exception!</string>
   <string name="your_relay_settings_caused_an_exception_">Ang iyong relay settings ay nag sanhi ng exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, mga bansa at address para sa huling talon</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Hindi kasama ang Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, mga bansa at mga address na hindi isasama</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Gumamit ng *only* sa mga ispesipikong nodes </string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Gumamit ng Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">I-enable ang kahaliling entrance nodes sa Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">I-enable kung ang naisaayos na bridges ay obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address at port ng bridges</string>
-  <string name="enter_bridge_addresses">Ilagay ang Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">I-enable ang iyong device na non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Pinapakinggan ang port para sa iyong Tor relay</string>
-  <string name="enter_or_port">I-lagay ang OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">Ang nickname para sa iyong Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">I-lagay ang pasadyang relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Patakbuhin bilang kliente sa likod ng firewall na may istriktong polisiya</string>
-  <string name="reachable_ports">Reachable Ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable sa likod ng istriktong firewall</string>
-  <string name="enter_ports">I-lagay ang ports</string>
-  <string name="enable_hidden_services">Nakatagong Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">pahintulutan sa on-device server na maging malalapitan sa pamamagitan ng Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">I-lagay ang localhost ports para sa nakatagong serbisyo</string>
-  <string name="hidden_service_ports">Tagong Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">ang addressable na pangalan sa iyong tagong serbisyo (awtomatikong nabuo)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">paganahiin ang debug log para sa output (kailangang gamitin ang adb o aLogCat para makita)</string>
-  <string name="project_home">Project Home(s):</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/
-</string>
-  <string name="the_tor_license">Ang Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">May app na gustong buksan ang nakatagong server port %S sa Tor network. Ito ay ligtas kung pinagkakatiwalaan ang app.</string>
-  <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
+    <string name="found_existing_tor_process"> nakakita ng umiiral na Tor process...</string>
   <string name="something_bad_happened">May nangyaring masama. Tingnan ang log</string>
-  <string name="hidden_service_on">nakatagong serbisyo sa:</string>
-  <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
+    <string name="unable_to_read_hidden_service_name">hindi mabasa ang pangalan ng tagong serbisyo</string>
   <string name="unable_to_start_tor">Hindi masimulan ang Tor:</string>
-  <string name="unable_to_reset_tor">I-reboot ang iyong device, hindi ma-reset ang Tor!</string>
-  <string name="pref_use_sys_iptables_title">Gumamit ng Default na Iptables</string>
-  <string name="pref_use_sys_iptables_summary">gamitin ang built-in iptables binary kaysa sa isang nabigkis kasama ng Orbot</string>
-  <string name="error_installing_binares">Ang Tor binaries ay hindi ma-install o ma-upgrade.</string>
-  <string name="pref_use_persistent_notifications">Palaging panatilihin ang icon sa toolbar kapag ang Orbot ay naka-connect</string>
-  <string name="pref_use_persistent_notifications_title">Palaging i-On ang Notifications</string>
-  <string name="pref_use_expanded_notifications">Ipakita ang pinalaking notification kasama ng Tor exit country at IP</string>
-  <string name="pref_use_expanded_notifications_title">Pinalawak na Notifications</string>
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Wika</string>
-  <string name="set_locale_summary">Pumili ng locale at wika para sa Orbot</string>
-  <string name="wizard_locale_title">Pumili ng Wika</string>
-  <string name="wizard_locale_msg">Iwanang default o palitan ang kasalukuyang wika</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">I-Save ang Settings</string>
-  <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">baba</string>
-  <string name="up">taas</string>
-  <string name="pref_disable_network_title">Walang Auto-Sleep sa Network</string>
-  <string name="pref_disable_network_summary">Ilagay ang Tor sa sleep kapag walang internet na pwede</string>
-  <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string>
-  <string name="menu_verify_browser">Browser</string>
-  <string name="menu_use_chatsecure">Gamitin ang ChatSecure</string>
-  <string name="permission_manage_tor_label">Manage Tor</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Activate</string>
-  <string name="apps_mode">Apps VPN Mode</string>
-  <string name="send_email">Send Email</string>
-  <string name="install_orweb">I-install ang Orfox</string>
-  <string name="standard_browser">Standard Browser</string>
-  <string name="vpn_default_world">Mundo</string>
+    <string name="no_internet_connection_tor">Walang connection sa internet; Ang Tor ay naka-standby mode...</string>
+    <string name="newnym">Ikaw ay nagpalit ng bagong pagkakakilanlan sa Tor!</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-tr/strings.xml b/orbotservice/src/main/res/values-tr/strings.xml
index ac750255..cdfd067f 100644
--- a/orbotservice/src/main/res/values-tr/strings.xml
+++ b/orbotservice/src/main/res/values-tr/strings.xml
@@ -2,281 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot baÅ?ka uygulamaların interneti daha güvenli olarak kullanmasını saÄ?layan ücretsiz bir proxy uygulamasıdır. Orbot Tor\'u kullanarak internet trafiÄ?inizi Å?ifreler ve dünya üzerindeki pek çok farklı bilgisayardan geçirerek gizler. Tor sizin kiÅ?isel özgürlüÄ?ünüzü ve mahremiyetinizi, gizli ticari aktivitelerinizi ve baÄ?lantılarınızı koruma altına alan bir yazılım ve açık aÄ?dır.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">https://check.torproject.org/?lang=tr</string>
-  <string name="secure_default_web_url">https://check.torproject.org/?lang=tr</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">Tor\'u baÅ?lat ve durdur</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot baÅ?latılıyor...</string>
+    <string name="status_starting_up">Orbot baÅ?latılıyor...</string>
   <string name="status_activated">Tor aÄ?ına baÄ?landı</string>
   <string name="status_disabled">Orbot devre dıÅ?ı bırakıldı</string>
   <string name="status_shutting_down">Tor hizmeti kapatılıyor</string>
   <string name="tor_process_starting">Tor kullanımı baÅ?latılıyor...</string>
   <string name="tor_process_complete">tamamlandı.</string>
-  <string name="tor_process_waiting">bekliyor.</string>
-  <string name="not_anonymous_yet">UYARI: BaÄ?lantınız henüz anonim deÄ?ildir! Lütfen uygulamalarınızı HTTP 127.0.0.1:8118  veya SOCKS4A / SOCKS5 127.0.0.1:9050 vekil sunucusu kullanacak Å?ekilde yapılandırınız.</string>
-  <string name="menu_home">BaÅ?langıç</string>
-  <string name="menu_browse">Göz At</string>
-  <string name="menu_settings">Ayarlar</string>
-  <string name="menu_log">Günlük</string>
-  <string name="menu_info">Yardım</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">BaÅ?lat</string>
-  <string name="menu_stop">Durdur</string>
-  <string name="menu_about">Hakkında</string>
-  <string name="menu_promo_apps">Uygulamaları alın... </string>
-  <string name="main_layout_download">Ä°ndir</string>
-  <string name="main_layout_upload">Yükle</string>
-  <string name="button_help">Yardım</string>
-  <string name="button_close">Kapat</string>
-  <string name="button_about">Hakkında</string>
-  <string name="button_clear_log">GünlüÄ?ü Temizle</string>
-  <string name="menu_verify">Kontrol Et</string>
-  <string name="menu_exit">Ã?ıkıÅ?</string>
-  <string name="menu_scan">QR kodu tarama</string>
-  <string name="menu_share_bridge">QR kodu paylaÅ?</string>
-  <string name="press_to_start">- baÅ?latmak için uzun basın -</string>
-  <string name="pref_trans_proxy_group">Å?effaf Vekillendirme (Yeniden BaÅ?latma Gerektirir)</string>
-  <string name="pref_trans_proxy_title">Å?effaf Vekillendirme</string>
-  <string name="pref_trans_proxy_summary">Uygulamalar için Otomatik Tor Uyarlaması</string>
-  <string name="pref_transparent_all_title">HerÅ?eyi Tor ile Uyarla</string>
-  <string name="pref_transparent_all_summary">Tor\'a uyarlanmıÅ? uygulamaların vekil sunucu baÄ?lantıları</string>
-  <string name="pref_transparent_port_fallback_title">Vekil Sunucu Yanıtsız Kalma Bildirim Portu</string>
-  <string name="pref_transparent_port_fallback_summary">UYARI: Genel portlardan (80,443, v.b.) kaçınınız. SADECE \'Hepsi\' veya \'Uygulama\' modu çalıÅ?madıÄ?ında kullanınız.</string>
-  <string name="pref_transparent_port_title">Port Listesi</string>
-  <string name="pref_transparent_port_summary">Vekil sunucu port listesi. *SADECE* \'Hepsi\' veya \'Uygulama\' modu çalıÅ?madıÄ?ında kullanınız.</string>
-  <string name="pref_transparent_port_dialog">Vekil sunucu portlarını giriniz</string>
-  <string name="pref_has_root">Yönetici EriÅ?imi Talebi</string>
-  <string name="pref_has_root_summary">Å?effaf Vekillendirme için Yönetici EriÅ?imi Talebi</string>
-  <string name="status_install_success">Tor binarileri baÅ?arıyla yüklendi!</string>
-  <string name="status_install_fail">Tor binary dosyaları yüklenemedi. Lütfen günlüÄ?ü kontrol ediniz ve tor-assistants@xxxxxxxxxxxxxx adresini kullanarak bilgilendirme yapınız.</string>
-  <string name="title_error">Uygulama Hatası</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Orbot Hakkında</string>
-  <string name="btn_next">Ä°leri</string>
-  <string name="btn_back">Geri</string>
-  <string name="btn_finish">Bitir</string>
-  <string name="btn_okay">Tamam</string>
-  <string name="btn_cancel">Ä°ptal
-            </string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Bazı Orbot detayları</string>
-  <string name="wizard_details_msg">Orbot; Tor, Libevent ve Polipo içeren bir açık kaynak uygulamadır. Yerel bir HTTP proxy (8118) ve Tor aÄ?ı içine SOCKS proxy (9050) saÄ?lamaktadır. Orbot ayrıca rootlu cihazlar için tüm internet trafiÄ?ini Tor üzerinden gönderme yeteneÄ?ine sahiptir. </string>
-  <string name="wizard_permissions_root">Ä°zin Verildi</string>
-  <string name="wizard_permissions_stock">Orbot Ä°zinleri</string>
-  <string name="wizard_premissions_msg_root">Mükemmel! Root izinlerinizin Orbot için aktif olduÄ?unu saptadık. Bu gücü akıllıca kullanacaÄ?ız.</string>
-  <string name="wizard_permissions_msg_stock">Gerekli olmamakla birlikte, eÄ?er cihazınızın root eriÅ?imi varsa Orbot daha güçlü bir araç olabilir. Orbot\'a süper güçlerini vermek için aÅ?aÄ?ıdaki butonu kullanın!</string>
-  <string name="wizard_permissions_no_root">Root(superuser) eriÅ?iminiz ya da neden bahsettiÄ?imiz hakkında bir fikriniz yoksa sadece eklentilerin Orbot\'la birlikte çalıÅ?abilmeleri için yapıldıÄ?ından emin olun.</string>
-  <string name="wizard_permissions_consent">Anlıyorum ve Superuser olmadan devam etmek istiyorum</string>
-  <string name="wizard_permission_enable_root">Orbot\'a root eriÅ?imi ver</string>
-  <string name="wizard_configure">Tor Bildirimlerini Ayarla</string>
-  <string name="wizard_configure_msg">Orbot, tüm uygulamaların veya seçtiÄ?iniz uygulamaların trafiÄ?ini Tor üzerinden yönlendirme seçeneÄ?i sunar.</string>
-  <string name="wizard_configure_all">Tüm Uygulamaları Tor �zerinden Vekillendir</string>
-  <string name="wizard_configure_select_apps">Tor için ayrı ayrı uygulamalar seç.</string>
-  <string name="wizard_tips_tricks">Orbot\'un Etkin OlduÄ?u Eklentiler</string>
-  <string name="wizard_tips_msg">AÅ?aÄ?ıdaki uygulamalar Orbot ile birlikte çalıÅ?mak üzere geliÅ?tirilmiÅ?tir. Uygulamaları hemen kurmak için ilgili düÄ?melere tıklayabilir veya uygulamalara daha sonra Google Play, GuardianProject.info web adresi veya F-Droid.org üzerinden eriÅ?ebilirsiniz.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android için güvenli anında mesajlaÅ?ma istemcisi</string>
-  <string name="wizard_tips_proxy">Vekil Ayarları - Uygulamaların, Orbot ile birlikte çalıÅ?malarını nasıl ayarlayacaÄ?ınızı öÄ?renin.</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Arama Motoru uygulaması</string>
-  <string name="wizard_tips_twitter">Twitter proxy sunucusunu \"localhost\" ve baÄ?lantı noktası 8118 olarak ayarlayın</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Bir öykü yarat ve güvenliÄ?i tor\'a bırak!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy Ayarları</string>
-  <string name="wizard_final">Orbot hazır!</string>
-  <string name="wizard_exit_at_first_screen_toast">Lütfen kullanmadan önce Orbot\'u yapılandırın!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Bu, Orbot\'un ayarlanıp ayarlanmadıÄ?ını ve Tor\'a baÄ?lanıp baÄ?lanmadıÄ?ınızı anlamanız amacıyla tarayıcınızda https://check.torproject.org adresini açacak.</string>
-  <string name="pref_hs_group">GizlenmiÅ? servis sunucusu</string>
-  <string name="pref_general_group">Genel</string>
-  <string name="pref_start_boot_title">Orbot\'u Telefonla Birlikte BaÅ?lat</string>
-  <string name="pref_start_boot_summary">Android cihaz açıldıÄ?ında otomatik olarak Orbot\'u baÅ?lat ve Tor\'a baÄ?lan.</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">Uyarı</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ä°zinler</string>
-  <string name="wizard_permissions_root_msg1">Ä°sterseniz Orbot\'a \'Superuser\' eriÅ?imi vererek saydam proxy gibi geliÅ?miÅ? ayarları aktif hale getirebilirsiniz.</string>
-  <string name="wizard_permissions_root_msg2">Bunu yapmak istemiyorsanız, lütfen Orbot ile çalıÅ?mak üzere yapılmıÅ? uygulamalar kullandıÄ?ınızdan emin olun</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot\'un aktif olduÄ?u eklentiler</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Güvenli Kayıt-dıÅ?ı Å?ifreleme yapabilen sohbet uygulaması</string>
-  <string name="wizard_tips_orweb">Orfox: GizliliÄ?i geliÅ?tirilmiÅ? bir tarayıcı Tor üzerinden çalıÅ?ır</string>
-  <string name="wizard_tips_play">Google Play\'deki tüm Guardian Projesi uygulamalarına bakın</string>
-  <string name="wizard_tips_fdroid">Tüm Guardian Project uygulamalarını F-Droid vasıtasıyla bulun</string>
-  <string name="wizard_tips_fdroid_org">Tüm Guardian Project uygulamalarına bu adresten eriÅ?in https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Å?effaf Vekillendirme</string>
-  <string name="wizard_transproxy_msg">Bu, uygulamalarınızı Tor üzerinden, herhangi bir ayar yapmadan çalıÅ?tırmanıza olanak saÄ?lar.</string>
-  <string name="wizard_transproxy_hint">(Neden bahsettiÄ?imiz hakkında bir fikriniz yoksa bu kutucuÄ?u iÅ?aretleyin)</string>
-  <string name="wizard_transproxy_none">Hiçbiri</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Kablosuz aÄ?lar için Tor açık proxy ve USB Tethering\'e izin ver (yeniden baÅ?latmayı gerektirir)</string>
-  <string name="button_grant_superuser">Superuser EriÅ?imi Talebi</string>
-  <string name="pref_select_apps">Uygulamaları Seç</string>
-  <string name="pref_select_apps_summary">Tor �zerinden Yönlendirilecek Uygulamaları Seç</string>
-  <string name="pref_node_configuration">DüÄ?üm Ayarları</string>
-  <string name="pref_node_configuration_summary">Bu ayarlar baÄ?lantınızın anonimliÄ?ini azaltabilecek geliÅ?miÅ? ayarlardır.</string>
-  <string name="pref_entrance_node">GiriÅ? Noktaları</string>
-  <string name="pref_entrance_node_summary">Ä°lk düÄ?üm için parmak izleri, rumuzlar, ülkeler, adresler</string>
-  <string name="pref_entrance_node_dialog">GiriÅ? DüÄ?ümlerini Girin</string>
-  <string name="pref_allow_background_starts_title">Arka planda çalıÅ?maya izin ver</string>
-  <string name="pref_allow_background_starts_summary">Herhangi bir uygulamanın Orbot aracılıÄ?ıyla Tor ve ilgili hizmetleri baÅ?latması için izin ver</string>
-  <string name="button_proxy_all">Tüm baÄ?lantılar için Vekil Sunucu kullan</string>
-  <string name="button_proxy_none">Vekil Sunucu kullanma</string>
-  <string name="button_invert_selection">Ters seçim</string>
-  <string name="pref_proxy_title">Giden AÄ? Sunucusu (tercihe baÄ?lı)</string>
-  <string name="pref_proxy_type_title">Giden proxy tipi</string>
-  <string name="pref_proxy_type_summary">Proxy sunucusunu kullanmak için protokoller: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Proxy tipini girin</string>
-  <string name="pref_proxy_host_title">Giden proxy sunucusu</string>
-  <string name="pref_proxy_host_summary">Vekil Sunucusu adı</string>
-  <string name="pref_proxy_host_dialog">Vekil Host\'u girin</string>
-  <string name="pref_proxy_port_title">Giden vekil baÄ?lantı noktası</string>
-  <string name="pref_proxy_port_summary">Vekil Sunucusu baÄ?lantı noktası</string>
-  <string name="pref_proxy_port_dialog">Vekil baÄ?lantı noktasını girin</string>
-  <string name="pref_proxy_username_title">Giden Vekil Kullanıcı Adı</string>
-  <string name="pref_proxy_username_summary">Vekil Kullanıcı Adı (tercihe baÄ?lı)</string>
-  <string name="pref_proxy_username_dialog">Vekil Kullanıcı Adı girin</string>
-  <string name="pref_proxy_password_title">Giden Vekil Parolası</string>
-  <string name="pref_proxy_password_summary">Vekil parolası (tercihe baÄ?lı)</string>
-  <string name="pref_proxy_password_dialog">Vekil Parolası girin</string>
-  <string name="status">Durum</string>
-  <string name="setting_up_full_transparent_proxying_">Tamamen saydam vekil kuruluyor...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Uygulamaya özel saydam proxy kuruluyor...</string>
-  <string name="transparent_proxying_enabled">Saydam vekil AKTÄ°F</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Tethering\'e açıldı!</string>
-  <string name="warning_error_starting_transparent_proxying_">UYARI: Å?effaf proxy baÅ?latılırken hata oluÅ?tu</string>
-  <string name="transproxy_rules_cleared">TransProxy kuralları temizlendi</string>
-  <string name="couldn_t_start_tor_process_">Tor iÅ?lemi baÅ?latılamadı</string>
-  <string name="privoxy_is_running_on_port_">Polipo bu port üzerinde çalıÅ?ıyor:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Port tabanlı Å?effaf vekillendirme ayarlanıyor...</string>
-  <string name="bridge_error">Köprü hatası</string>
-  <string name="bridge_requires_ip">Köprü özelliÄ?ini kullanmak adına, en az bir tane köprü IP adresi girmelisiniz.</string>
-  <string name="send_email_for_bridges">Gmail hesabınızdan bridges@xxxxxxxxxxxxxx adresine içinde sadece \"get bridges\" yazılı bir eposta gönderin.</string>
-  <string name="error">Hata</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">EriÅ?ilebilirAdresleriniz ayarlarınız bir istisnaya yol açtı!</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Tor iÅ?lemi baÅ?latılamadı</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">EriÅ?ilebilirAdresleriniz ayarlarınız bir istisnaya yol açtı!</string>
   <string name="your_relay_settings_caused_an_exception_">Tor aktarıcı ayarlarınız bir istisnaya yol açtı!</string>
-  <string name="exit_nodes">Ã?ıkıÅ? DüÄ?ümleri</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Son düÄ?üm için parmak izleri, rumuzlar, ülkeler, adresler</string>
-  <string name="enter_exit_nodes">Ã?ıkıÅ? baÄ?lantılarını girin</string>
-  <string name="exclude_nodes">Å?u baÄ?lantıları dahil etmeyin</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Dahil edilmeyecek parmak izleri, takma adlar, ülkeler ve adresler</string>
-  <string name="enter_exclude_nodes">GiriÅ? baÄ?lantılarını girin</string>
-  <string name="strict_nodes">DeÄ?iÅ?meyen baÄ?lantılar</string>
-  <string name="use_only_these_specified_nodes">*Sadece* bu baÄ?lantıları kullan</string>
-  <string name="bridges">Köprüler</string>
-  <string name="use_bridges">Köprü kullan</string>
-  <string name="bridges_obfuscated">GizlenmiÅ? köprüler</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Tor aÄ?ına baÅ?ka giriÅ? baÄ?lantılarına izin ver</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Yapılandırılan köprüler gizlenmiÅ? ise izin ver</string>
-  <string name="ip_address_and_port_of_bridges">Köprülerin IP adresleri ve baÄ?lantı noktaları</string>
-  <string name="enter_bridge_addresses">Köprü Adresleri Gir</string>
-  <string name="relays">Aktarıcılar</string>
-  <string name="relaying">Aktarmak</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Cihazınızı çıkıÅ? yapmayan aktarıcı olması için aktif edin</string>
-  <string name="relay_port">Aktarıcı Portu</string>
-  <string name="listening_port_for_your_tor_relay">Tor aktarıcınız için dinleme port\'u</string>
-  <string name="enter_or_port">OR port\'u gir</string>
-  <string name="relay_nickname">Aktarıcı rumuzu</string>
-  <string name="the_nickname_for_your_tor_relay">Tor aktarıcınız için rumuz</string>
-  <string name="enter_a_custom_relay_nickname">�zel aktarıcı rumuzu girin</string>
-  <string name="reachable_addresses">UlaÅ?ılabilir adresler</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Bir güvenlik duvarı arkasındaki sınırlı kullanıcı olarak baÄ?lan</string>
-  <string name="reachable_ports">UlaÅ?ılabilir baÄ?lantı noktaları</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Sınırlayıcı güvenlik duvarı ardındaki ulaÅ?ılabilir baÄ?lantı noktaları</string>
-  <string name="enter_ports">BaÄ?lantı noktaları gir</string>
-  <string name="enable_hidden_services">GizlenmiÅ? Servis Sunucusu</string>
-  <string name="run_servers_accessible_via_the_tor_network">cihazdaki sunucunun Tor aÄ?ından ulaÅ?ılmasına izin ver</string>
-  <string name="enter_localhost_ports_for_hidden_services">gizlenmiÅ? servis sunucuları için localhost baÄ?lantı noktası gir</string>
-  <string name="hidden_service_ports">GizlenmiÅ? Servis BaÄ?lantı Noktaları</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">GizlenmiÅ? servisiniz için adreslenebilir ad (otomatik olarak verilmiÅ?tir)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">hata giderme kaydını tut (görüntülemek için adb veya aLogCat gerekir)</string>
-  <string name="project_home">Proje adres(ler)i:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor Lisansı</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">�çüncü Parti Yazılım:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Bir uygulama Tor aÄ?ında gizlenmiÅ? sunucu baÄ?lantı noktası %S açmak istiyor. EÄ?er uygulamaya güveniyorsanız bu güvenlidir.</string>
-  <string name="found_existing_tor_process">varolan bir Tor iÅ?lemi bulundu...</string>
+    <string name="found_existing_tor_process">varolan bir Tor iÅ?lemi bulundu...</string>
   <string name="something_bad_happened">Kötü bir Å?ey oldu. Kayıtlara bakınız</string>
-  <string name="hidden_service_on">gizlenmiÅ? servis:</string>
-  <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string>
+    <string name="unable_to_read_hidden_service_name">gizli hizmet adı okunamıyor</string>
   <string name="unable_to_start_tor">Tor baÅ?latılamadı:</string>
-  <string name="unable_to_reset_tor">Cihazınızı yeniden baÅ?latın, Tor\'u sıfırlamak mümkün deÄ?il! </string>
-  <string name="pref_use_sys_iptables_title">Varsayılan Ip tablolarını kullan</string>
-  <string name="pref_use_sys_iptables_summary">Orbot ile birlikte gelenler yerine kurulu iptables binary kullan</string>
-  <string name="error_installing_binares">Tor binary kurulumu veya yükseltilmesi mümkün deÄ?il.</string>
-  <string name="pref_use_persistent_notifications">Orbot baÄ?lı olduÄ?u sürece simgeyi araç çubuÄ?unda tut</string>
-  <string name="pref_use_persistent_notifications_title">Bildirimler her zaman açık</string>
-  <string name="pref_use_expanded_notifications">Tor çıkıÅ? ülkesi ve IP için geniÅ?letilmiÅ? bildirim göster</string>
-  <string name="pref_use_expanded_notifications_title">GeniÅ?letilmiÅ? Bildirimler</string>
-  <string name="notification_using_bridges">Köprüler etkinleÅ?tirildi!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Dil</string>
-  <string name="set_locale_summary">Orbot için yerel ayarları ve dili seç</string>
-  <string name="wizard_locale_title">Dili seçin</string>
-  <string name="wizard_locale_msg">Varsayılanda bırak veya geçerli dile geç</string>
-  <string name="powered_by">Tor tarafından desteklenmektedir</string>
-  <string name="btn_save_settings">Ayarları kaydet</string>
-  <string name="no_internet_connection_tor">Ä°nternet baÄ?lantısı yok; Tor bekleme modunda...</string>
-  <string name="bandwidth_">Bant geniÅ?liÄ?i:</string>
-  <string name="down">aÅ?aÄ?ı</string>
-  <string name="up">yukarı</string>
-  <string name="pref_disable_network_title">BaÄ?lantı yokken Otomatik Uykuya Geç</string>
-  <string name="pref_disable_network_summary">Ä°nternet olmadıÄ?ında Tor\'u uykuya al</string>
-  <string name="newnym">Yeni bir Tor kimliÄ?ine geçiÅ? yaptınız!</string>
-  <string name="menu_verify_browser">Tarayıcı</string>
-  <string name="menu_use_chatsecure">ChatSecure Kullan</string>
-  <string name="permission_manage_tor_label">Tor\'u Yönet</string>
-  <string name="permission_manage_tor_description">Tor servisini kontrol etmek için bu uygulamayı etkinleÅ?tir</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Orfox yüklü gibi görünmüyor. Bu konuyla alakalı yardım istiyor musun, ya da sadece tarayıcı mı açılsın?</string>
-  <string name="install_apps_">Uygulamalar kurulsun mu?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Hiçbir aÄ? baÄ?lantısı yok. Tor uyku moduna alınıyor...</string>
+    <string name="no_internet_connection_tor">Ä°nternet baÄ?lantısı yok; Tor bekleme modunda...</string>
+    <string name="newnym">Yeni bir Tor kimliÄ?ine geçiÅ? yaptınız!</string>
+    <string name="no_network_connectivity_putting_tor_to_sleep_">Hiçbir aÄ? baÄ?lantısı yok. Tor uyku moduna alınıyor...</string>
   <string name="network_connectivity_is_good_waking_tor_up_">AÄ? baÄ?lantısı iyi. Tor uyandırılıyor... </string>
   <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncellemesi</string>
-  <string name="pref_socks_title">SOCKS için Tor kullan</string>
-  <string name="pref_socks_dialog">SOCKS Port Yapılandırma</string>
-  <string name="pref_transport_title">Tor TransProxy Port</string>
-  <string name="pref_transport_summary">Tor Å?effaf Vekil Proxy Port\'u için (varsayılan olarak: 9040 veya devre dıÅ?ı bırakmak için 0) deÄ?erlerini öneriyor</string>
-  <string name="pref_transport_dialog">TransProxy Port Yapılandırma</string>
-  <string name="pref_dnsport_title">Tor DNS Port</string>
-  <string name="pref_dnsport_dialog">DNS Port Yapılandırma</string>
-  <string name="pref_torrc_title">Torrc �zel Yapılandırma</string>
-  <string name="pref_torrc_summary">SADECE UZMANLAR: DoÄ?rudan torrc yapılandırma satırları girin</string>
-  <string name="pref_torrc_dialog">Torrc yapılandırma</string>
-  <string name="wizard_tips_martus">Mobil Martus - Benetech İnsan Hakları Belgeleri Uygulaması</string>
-  <string name="your_tor_public_ips_">Umumi Tor IP adresiniz:</string>
-  <string name="app_conflict">Uygulama çatıÅ?ması</string>
-  <string name="pref_transproxy_refresh_title">TransProxy Otomatik Yenileme</string>
-  <string name="pref_transproxy_refresh_summary">AÄ? durumu deÄ?iÅ?tiÄ?inde TransProxy kurallarını yeniden uygula</string>
-  <string name="pref_transproxy_flush_title">TransProxy Kurallarını KALDIR</string>
-  <string name="pref_transproxy_flush_summary">Tüm TransProxy aÄ? kurallarını temizlemek için buraya dokunun</string>
-  <string name="transparent_proxy_rules_flushed_">Å?effaf vekil kuralları silindi!</string>
-  <string name="you_do_not_have_root_access_enabled">ROOT eriÅ?im izniniz yok</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ayarların etkin olması için Orbot\'u durdurup yeniden baÅ?latmak gerekebilir.</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Köprüler Güncellendi</string>
-  <string name="restart_orbot_to_use_this_bridge_">DeÄ?iÅ?iklikleri etkinleÅ?tirmek için lütfen Orbot\'u yeniden baÅ?latın</string>
-  <string name="menu_qr">QR Kodları</string>
-  <string name="bridge_mode">Köprü Modu</string>
-  <string name="get_bridges_email">Eposta</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">EtkinleÅ?tirin</string>
-  <string name="apps_mode">Uygulamalar için VPN Modu</string>
-  <string name="send_email">Eposta Gönder</string>
-  <string name="install_orweb">Orfox yükle</string>
-  <string name="standard_browser">Standart Tarayıcı</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOT: Sadece standart Tor köprüleri Intel X86/ATOM cihazlarda çalıÅ?ır</string>
-  <string name="vpn_default_world">Dünya</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-uk/strings.xml b/orbotservice/src/main/res/values-uk/strings.xml
index 9672e2c2..23551efb 100644
--- a/orbotservice/src/main/res/values-uk/strings.xml
+++ b/orbotservice/src/main/res/values-uk/strings.xml
@@ -2,277 +2,29 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot â?? Ñ?е вÑ?лÑ?на пÑ?огÑ?ама длÑ? пÑ?окÑ?Ñ?-з\'Ñ?днанÑ?, Ñ?ка дозволÑ?Ñ? Ñ?нÑ?им додаÑ?кам безпеÑ?нÑ?Ñ?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?. Orbot викоÑ?иÑ?Ñ?овÑ?Ñ? Tor длÑ? Ñ?иÑ?Ñ?Ñ?ваннÑ? Ñ?нÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?Ñ?кÑ?, Ñ?кий далÑ? пÑ?иÑ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?д Ñ?аÑ? пеÑ?еÑ?иланнÑ? Ñ?еÑ?ез кÑ?лÑ?ка комп\'Ñ?Ñ?еÑ?Ñ?в Ñ? Ñ?Ñ?зниÑ? Ñ?аÑ?Ñ?инаÑ? планеÑ?и. Tor Ñ? вÑ?лÑ?ним пÑ?огÑ?амним забезпеÑ?еннÑ?м, а Ñ?акож вÑ?дкÑ?иÑ?оÑ? меÑ?ежеÑ?, Ñ?о допомагаÑ? заÑ?иÑ?Ñ?иÑ?иÑ?Ñ? вÑ?д меÑ?ежевого Ñ?Ñ?еженнÑ?, Ñ?ке загÑ?ожÑ?Ñ? оÑ?обиÑ?Ñ?Ñ?й Ñ?вободÑ? Ñ?а пÑ?иваÑ?номÑ? жиÑ?Ñ?Ñ?, конÑ?Ñ?денÑ?Ñ?йнÑ?й бÑ?знеÑ?-дÑ?Ñ?лÑ?ноÑ?Ñ?Ñ? Ñ? конÑ?акÑ?ам, а Ñ?акож деÑ?жавноÑ? пÑ?огÑ?ами безпеки, Ñ?о в
 Ñ?дома Ñ?к аналÑ?з Ñ?Ñ?аÑ?Ñ?кÑ?.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">запÑ?Ñ?к Ñ? зÑ?пинка Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Ð?апÑ?Ñ?к Orbot...</string>
+    <string name="status_starting_up">Ð?апÑ?Ñ?к Orbot...</string>
   <string name="status_activated">Ð?Ñ?д\'Ñ?днаний до меÑ?ежÑ? Tor</string>
   <string name="status_disabled">«Orbot» вÑ?д\'Ñ?днаний</string>
   <string name="tor_process_starting">Ð?апÑ?Ñ?каÑ?Ñ?Ñ?Ñ?Ñ? клÑ?Ñ?нÑ? Tor...</string>
   <string name="tor_process_complete">завеÑ?Ñ?ено.</string>
-  <string name="tor_process_waiting">оÑ?Ñ?кÑ?ваннÑ?...</string>
-  <string name="not_anonymous_yet">Ð?опеÑ?едженнÑ?: Ð?аÑ? Ñ?Ñ?аÑ?Ñ?к Ñ?е не анонÑ?мний! Ð?Ñ?дÑ? лаÑ?ка, налаÑ?Ñ?Ñ?йÑ?е Ñ?воÑ? додаÑ?ки длÑ? викоÑ?иÑ?Ñ?аннÑ? HTTP пÑ?окÑ?Ñ? 127.0.0.1:8118 або ж SOCKS4A або SOCKS5 пÑ?окÑ?Ñ? 127.0.0.1:9050</string>
-  <string name="menu_home">Ð?омÑ?вка</string>
-  <string name="menu_browse">Ð?еÑ?еглÑ?д</string>
-  <string name="menu_settings">Ð?алаÑ?Ñ?Ñ?ваннÑ?</string>
-  <string name="menu_log">Ð?Ñ?Ñ?нал</string>
-  <string name="menu_info">Ð?овÑ?дка</string>
-  <string name="menu_start">Ð?апÑ?Ñ?Ñ?иÑ?и</string>
-  <string name="menu_stop">Ð?Ñ?пиниÑ?и</string>
-  <string name="menu_about">Ð?Ñ?о пÑ?огÑ?амÑ?</string>
-  <string name="main_layout_download">Ð?аванÑ?ажиÑ?и</string>
-  <string name="main_layout_upload">Ð?аванÑ?ажиÑ?и</string>
-  <string name="button_help">Ð?овÑ?дка</string>
-  <string name="button_close">Ð?акÑ?иÑ?и</string>
-  <string name="button_about">Ð?Ñ?о пÑ?огÑ?амÑ?</string>
-  <string name="button_clear_log">Ð?Ñ?иÑ?Ñ?иÑ?и жÑ?Ñ?нал</string>
-  <string name="menu_verify">Ð?еÑ?евÑ?Ñ?ка</string>
-  <string name="menu_exit">Ð?иÑ?Ñ?д</string>
-  <string name="menu_scan">СканÑ?ваÑ?и BridgeQR</string>
-  <string name="menu_share_bridge">Ð?одÑ?лиÑ?иÑ?Ñ? BridgeQR</string>
-  <string name="press_to_start">- довге наÑ?иÑ?неннÑ? длÑ? запÑ?Ñ?кÑ? -</string>
-  <string name="pref_trans_proxy_group">Ð?Ñ?озоÑ?ий пÑ?окÑ?Ñ? (Ð?оÑ?Ñ?Ñ?бен root)</string>
-  <string name="pref_trans_proxy_title">Ð?Ñ?озоÑ?ий пÑ?окÑ?Ñ?</string>
-  <string name="pref_trans_proxy_summary">Ð?вÑ?омаÑ?иÑ?на Ñ?оÑ?иÑ?Ñ?каÑ?Ñ?Ñ? додаÑ?кÑ?в</string>
-  <string name="pref_transparent_all_title">Ð?апÑ?авлÑ?Ñ?и вÑ?е Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_all_summary">Ð?апÑ?авлÑ?Ñ?и Ñ?Ñ?аÑ?Ñ?к вÑ?Ñ?Ñ? додаÑ?кÑ?в Ñ?еÑ?ез Tor</string>
-  <string name="pref_transparent_port_fallback_title">РезеÑ?вний пÑ?окÑ?Ñ? поÑ?Ñ?</string>
-  <string name="pref_transparent_port_fallback_summary">Ð?Ð?Ð?Ð?РÐ?Ð?Ð?Ð?Ð?Ð?Я: Ð?бÑ?одиÑ?Ñ? загалÑ?нÑ? поÑ?Ñ?и (80, 443, Ñ? Ñ?.д.). *Ð?Ð?Ð?Ð?РÐ?СТУÐ?УÐ?Ð?ТÐ? ТÐ?Ð?ЬÐ?Ð?* Ñ?кÑ?о Ñ?ежими «Ð?Ñ?е» або «Ð?одаÑ?ки» не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_title">СпиÑ?ок Ð?оÑ?Ñ?Ñ?в</string>
-  <string name="pref_transparent_port_summary">СпиÑ?ок поÑ?Ñ?Ñ?в длÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?. *Ð?Ð?Ð?Ð?РÐ?СТÐ?Ð?УÐ?Ð?ТÐ? ТÐ?Ð?ЬÐ?Ð?* Ñ?кÑ?о Ñ?ежими «Ð?Ñ?е» або «Ð?одаÑ?ки» не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?.</string>
-  <string name="pref_transparent_port_dialog">Ð?ведÑ?Ñ?Ñ? поÑ?Ñ?и длÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="pref_has_root">Ð?апиÑ?аÑ?и root доÑ?Ñ?Ñ?п</string>
-  <string name="pref_has_root_summary">Ð?апиÑ?аÑ?и root доÑ?Ñ?Ñ?п длÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="status_install_success">Ð?одаÑ?ок Tor Ñ?Ñ?пÑ?Ñ?но вÑ?Ñ?ановленей!</string>
-  <string name="status_install_fail">Ð?е вдалоÑ?Ñ? вÑ?Ñ?ановиÑ?и додаÑ?ок Tor. Ð?Ñ?дÑ? лаÑ?ка, пеÑ?евÑ?Ñ?Ñ?е Ñ?иÑ?Ñ?емний жÑ?Ñ?нал Ñ? повÑ?домÑ?е нам: tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ð?омилка додаÑ?кÑ?</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Ð?Ñ?о Orbot</string>
-  <string name="btn_next">Ð?пеÑ?ед</string>
-  <string name="btn_back">Ð?азад</string>
-  <string name="btn_finish">Ð?авеÑ?Ñ?иÑ?и</string>
-  <string name="btn_okay">OK</string>
-  <string name="btn_cancel">Ð?Ñ?дмÑ?на</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Ð?еÑ?кÑ? вÑ?домоÑ?Ñ?Ñ? пÑ?о пÑ?огÑ?амÑ? Orbot</string>
-  <string name="wizard_details_msg">Orbot â?? Ñ?е пÑ?огÑ?ама з вÑ?дкÑ?иÑ?им кодом, Ñ?ка мÑ?Ñ?Ñ?иÑ?Ñ? Tor, LibEvent Ñ?а Polipo. Ð?Ñ?н надаÑ? локалÑ?ний HTTP-пÑ?окÑ?Ñ? (8118) Ñ? SOCKS-пÑ?окÑ?Ñ? (9050) Ñ? меÑ?ежÑ? Tor. Orbot Ñ?акож дозволÑ?Ñ? на пÑ?иÑ?Ñ?Ñ?оÑ?Ñ? з пÑ?авами root пеÑ?еÑ?илаÑ?и веÑ?Ñ? Ñ?нÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?Ñ?к Ñ?еÑ?ез Tor.</string>
-  <string name="wizard_permissions_root">Ð?озвÑ?л оÑ?Ñ?имано</string>
-  <string name="wizard_permissions_stock">Ð?озволи Orbot</string>
-  <string name="wizard_premissions_msg_root">ЧÑ?дово! Ð?и визнаÑ?или, Ñ?о ви надалили root пÑ?ава длÑ? Orbot. Ð?и бÑ?демо викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?Ñ? можливÑ?Ñ?Ñ?Ñ? з Ñ?озÑ?мом.</string>
-  <string name="wizard_permissions_msg_stock"> ХоÑ?а Ñ?е й не вимагаÑ?Ñ?Ñ?Ñ?Ñ?, Orbot може бÑ?Ñ?и поÑ?Ñ?жнÑ?Ñ?им Ñ?нÑ?Ñ?Ñ?Ñ?менÑ?ом, Ñ?кÑ?о ваÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й маÑ? пÑ?ава root. Ð?аÑ?иÑ?нÑ?Ñ?Ñ? на кнопкÑ? нижÑ?е Ñ? надайÑ?е Orbot Ñ?Ñ?пеÑ?Ñ?илÑ?! </string>
-  <string name="wizard_permissions_no_root">ЯкÑ?о Ñ? ваÑ? немаÑ? root пÑ?ав або ви не Ñ?озÑ?мÑ?Ñ?Ñ?е пÑ?о Ñ?о говоÑ?имо, пÑ?оÑ?Ñ?о впевнÑ?Ñ?Ñ?Ñ?Ñ?, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е додаÑ?ки, Ñ?озÑ?обленÑ? длÑ? Orbot.</string>
-  <string name="wizard_permissions_consent">Я Ñ?озÑ?мÑ?Ñ? Ñ? Ñ?оÑ?Ñ? пÑ?одовжиÑ?и без пÑ?ав Ñ?Ñ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а</string>
-  <string name="wizard_permission_enable_root">Ð?адаÑ?и root пÑ?ава Orbot</string>
-  <string name="wizard_configure">Ð?алаÑ?Ñ?Ñ?ваÑ?и Tor-иÑ?Ñ?каÑ?Ñ?Ñ?</string>
-  <string name="wizard_configure_msg">Ð?Ñ?огÑ?ама Orbot даÑ? вам можливÑ?Ñ?Ñ?Ñ? маÑ?Ñ?Ñ?Ñ?Ñ?изÑ?ваÑ?и Ñ?Ñ?аÑ?Ñ?к вÑ?Ñ?Ñ? додаÑ?кÑ?в Ñ?еÑ?ез Tor Ð?Ð?Ð? вибÑ?аÑ?и додаÑ?ки длÑ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?Ñ?Ñ? Ñ?амоÑ?Ñ?Ñ?йно.</string>
-  <string name="wizard_configure_all">Ð?аÑ?Ñ?Ñ?Ñ?Ñ?изÑ?ваÑ?и вÑ?Ñ? додаÑ?ки Ñ?еÑ?ез Tor</string>
-  <string name="wizard_configure_select_apps">Ð?ибеÑ?Ñ?Ñ?Ñ? додаÑ?ки длÑ? маÑ?Ñ?Ñ?Ñ?Ñ?изаÑ?Ñ?Ñ? Ñ?еÑ?ез Tor</string>
-  <string name="wizard_tips_tricks">Orbot-задÑ?Ñ?нÑ? додаÑ?ки</string>
-  <string name="wizard_tips_msg">Ð?и Ñ?адимо вам заванÑ?ажиÑ?и Ñ? викоÑ?иÑ?Ñ?овÑ?ваÑ?и додаÑ?ки, Ñ?кÑ? вмÑ?Ñ?Ñ?Ñ? пÑ?аÑ?Ñ?ваÑ?и напÑ?Ñ?мÑ? Ñ?еÑ?ез Orbot. Ð?аÑ?иÑ?нÑ?Ñ?Ñ? на кнопки нижÑ?е, Ñ?об запÑ?Ñ?Ñ?иÑ?и пÑ?оÑ?еÑ? вÑ?Ñ?ановленнÑ?.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ð?аÑ?иÑ?ений обмÑ?н повÑ?домленнÑ?ми в Android</string>
-  <string name="wizard_tips_proxy">Ð?алаÑ?Ñ?Ñ?ваннÑ? пÑ?окÑ?Ñ? â?? дÑ?знайÑ?еÑ?Ñ? Ñ?к налаÑ?Ñ?Ñ?ваÑ?и додаÑ?ки длÑ? Ñ?обоÑ?и з Orbot</string>
-  <string name="wizard_tips_duckgo">Ð?одаÑ?ок поÑ?Ñ?ковоÑ? Ñ?иÑ?Ñ?еми DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Twitter пÑ?дÑ?Ñ?имÑ?Ñ? http пÑ?окÑ?Ñ? «localhost:8118»</string>
-  <string name="wizard_tips_story_maker">StoryMaker â?? Ð?апиÑ?Ñ?Ñ?Ñ? Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? Ñ? залиÑ?Ñ?е Ñ?Ñ? Tor\'Ñ? длÑ? безпеки!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Ð?алаÑ?Ñ?Ñ?ваннÑ? Ð?Ñ?окÑ?Ñ?</string>
-  <string name="wizard_proxy_help_msg">ЯкÑ?о пÑ?огÑ?амка длÑ? Android, Ñ?кÑ? Ð?и викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е, пÑ?дÑ?Ñ?имÑ?Ñ? HTTP або SOCKS пÑ?окÑ?Ñ?, Ñ?о Ð?и можеÑ?е налаÑ?Ñ?Ñ?ваÑ?и Ñ?Ñ? на пÑ?д\'Ñ?днаннÑ? до Orbot Ñ? викоÑ?иÑ?Ñ?аннÑ? Tor.\n\n\n Ð?наÑ?еннÑ? Ñ?оÑ?Ñ?а â?? 127.0.0.1 або «localhost». Ð?лÑ? HTTP, номеÑ? поÑ?Ñ?Ñ? â?? 8118. Ð?лÑ? SOCKS пÑ?окÑ?Ñ? â?? 9050. Ð?о можливоÑ?Ñ?Ñ?, викоÑ?иÑ?Ñ?овÑ?йÑ?е SOCKS4A або SOCKS5.\n \n\n\n Ð?и можеÑ?е дÑ?знаÑ?иÑ?Ñ? бÑ?лÑ?Ñ?е пÑ?о Ñ?обоÑ?Ñ? Ñ?еÑ?ез пÑ?окÑ?Ñ? на Android, пÑ?оÑ?иÑ?авÑ?и Ñ?ей FAQ: http://tinyurl.com/proxyandroid\n</string>
-  <string name="wizard_final">Ð?Ñ?огÑ?ама Orbot гоÑ?ова до викоÑ?иÑ?Ñ?аннÑ?!</string>
-  <string name="wizard_final_msg">Ð?Ñ?лÑ?йони лÑ?дей Ñ? вÑ?Ñ?омÑ? Ñ?вÑ?Ñ?Ñ? викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ? Tor з Ñ?Ñ?зниÑ? пÑ?иÑ?ин.\n\nÐ?Ñ?Ñ?налÑ?Ñ?Ñ?и Ñ? блогеÑ?и, акÑ?ивÑ?Ñ?Ñ?и заÑ?иÑ?Ñ?Ñ? пÑ?ав лÑ?дини, Ñ?Ñ?довÑ? виконавÑ?Ñ?, Ñ?олдаÑ?и, коÑ?поÑ?аÑ?Ñ?Ñ?, гÑ?омадÑ?ни кÑ?аÑ?н з Ñ?епÑ?еÑ?ивним Ñ?ежимом, Ñ? пÑ?оÑ?Ñ?Ñ? лÑ?диâ?¦ а Ñ?епеÑ? гоÑ?овÑ? Ñ? Ð?и!</string>
-  <string name="wizard_exit_at_first_screen_toast">Ð?Ñ?дÑ? лаÑ?ка, налаÑ?Ñ?Ñ?йÑ?е Orbot, пеÑ?Ñ? нÑ?ж поÑ?неÑ?е ним коÑ?иÑ?Ñ?Ñ?ваÑ?иÑ?Ñ?!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="tor_check">Це пÑ?изведе до запÑ?Ñ?кÑ? веб-бÑ?аÑ?зеÑ?а, вибÑ?аного на ваÑ?омÑ? пÑ?иÑ?Ñ?Ñ?оÑ? за замовÑ?Ñ?ваннÑ?м, Ñ? пÑ?дклÑ?Ñ?еннÑ? до Ñ?айÑ?Ñ? https://check.torproject.org, з меÑ?оÑ? пеÑ?евÑ?Ñ?ки пÑ?авилÑ?ноÑ?Ñ?Ñ? Ñ?обоÑ?и Orbot Ñ? визнаÑ?еннÑ?, Ñ?и пÑ?д\'Ñ?днанÑ? ви до меÑ?ежÑ? Tor.</string>
-  <string name="pref_hs_group">Ð?Ñ?иÑ?ованÑ? Ñ?еÑ?вÑ?Ñ?и</string>
-  <string name="pref_general_group">Ð?Ñ?новнÑ?</string>
-  <string name="pref_start_boot_title">Ð?апÑ?Ñ?к Orbot пÑ?и ввÑ?мкненнÑ?</string>
-  <string name="pref_start_boot_summary">Ð?вÑ?омаÑ?иÑ?ний запÑ?Ñ?к Orbot Ñ?а з\'Ñ?днаннÑ? Tor пÑ?д Ñ?аÑ? запÑ?Ñ?кÑ? ваÑ?ого пÑ?иÑ?Ñ?Ñ?оÑ?</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot дозволÑ?Ñ? викоÑ?иÑ?Ñ?овÑ?ваÑ?и Tor на Android!\n\nTor дозволÑ?Ñ? Ð?ам заÑ?иÑ?Ñ?иÑ?иÑ?Ñ? вÑ?д Ñ?Ñ?лÑ?Ñ?Ñ?аÑ?Ñ?Ñ? вмÑ?Ñ?Ñ?Ñ?, аналÑ?зÑ? Ñ?Ñ?аÑ?Ñ?кÑ? Ñ? Ñ?поÑ?Ñ?еÑ?еженнÑ? за меÑ?ежеÑ?, Ñ?кÑ? Ñ?Ñ?авлÑ?Ñ?Ñ? пÑ?д загÑ?озÑ? пÑ?иваÑ?нÑ?Ñ?Ñ?Ñ?, конÑ?Ñ?денÑ?Ñ?йнÑ? Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? Ñ?а оÑ?обиÑ?Ñ?Ñ? Ñ?Ñ?оÑ?Ñ?нки.\n\nЦей майÑ?Ñ?еÑ? допоможе Ð?ам налаÑ?Ñ?Ñ?ваÑ?и Orbot Ñ? Tor на Ð?аÑ?омÑ? пÑ?иÑ?Ñ?Ñ?оÑ?.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Ð?опеÑ?едженнÑ?</string>
-  <string name="wizard_warning_msg">Ð?Ñ?оÑ?Ñ?е вÑ?Ñ?ановленнÑ? Orbot не зÑ?обиÑ?Ñ? авÑ?омаÑ?иÑ?но Ð?аÑ? мобÑ?лÑ?ний Ñ?Ñ?аÑ?Ñ?к анонÑ?мним.\n\nÐ?и повиннÑ? пÑ?авилÑ?но налаÑ?Ñ?Ñ?ваÑ?и Orbot, Ð?аÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й Ñ?а Ñ?нÑ?Ñ? додаÑ?ки, Ñ?об Ñ?Ñ?пÑ?Ñ?но викоÑ?иÑ?Ñ?овÑ?ваÑ?и Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Ð?озволи</string>
-  <string name="wizard_permissions_root_msg1">Ð?и Ñ?акож можеÑ?е за бажаннÑ?м надаÑ?и Orbot пÑ?ава «СÑ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а» длÑ? доÑ?Ñ?Ñ?пÑ? до пÑ?оÑ?Ñ?нÑ?Ñ?иÑ? можливоÑ?Ñ?ей, Ñ?ипÑ? \"Ð?Ñ?озоÑ?а Ð?Ñ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?\".</string>
-  <string name="wizard_permissions_root_msg2">ЯкÑ?о ви не Ñ?оÑ?еÑ?е Ñ?обиÑ?и Ñ?е, Ñ?одÑ? бÑ?дÑ? лаÑ?ка, впевнÑ?Ñ?Ñ?Ñ?Ñ?, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е додаÑ?ки Ñ?Ñ?воÑ?енÑ? длÑ? Ñ?обоÑ?и з Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">СÑ?оже, ваÑ? пÑ?иÑ?Ñ?Ñ?Ñ?й не маÑ? root-пÑ?ав або не надаÑ? доÑ?Ñ?Ñ?пÑ? до «СÑ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а».\n\nÐ?Ñ?дÑ? лаÑ?ка, Ñ?пÑ?обÑ?йÑ?е наÑ?омÑ?Ñ?Ñ?Ñ? Ñ?ежим «Ð?одаÑ?ки» на головномÑ? екÑ?анÑ?.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Ð?одаÑ?ки, Ñ?о пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Orbot:</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: додаÑ?ок длÑ? Ñ?пÑ?лкÑ?ваннÑ? з пÑ?дÑ?Ñ?имкоÑ? Off-the-Record Ñ?иÑ?Ñ?Ñ?ваннÑ?</string>
-  <string name="wizard_tips_play">Ð?найÑ?и вÑ?Ñ? додаÑ?ки Guardian Project на Google Play</string>
-  <string name="wizard_tips_fdroid">Ð?найÑ?и вÑ?Ñ? додаÑ?ки Guardian Project на F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Ð?найÑ?и вÑ?Ñ? додаÑ?ки Guardian Project на https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Ð?Ñ?озоÑ?е Ð?Ñ?окÑ?Ñ?ваннÑ?</string>
-  <string name="wizard_transproxy_msg">Це дозволиÑ?Ñ? ваÑ?им додаÑ?кам авÑ?омаÑ?иÑ?но пÑ?аÑ?Ñ?ваÑ?и в меÑ?ежÑ? Tor без бÑ?дÑ?-Ñ?коÑ? конÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ?.</string>
-  <string name="wizard_transproxy_hint">(Ð?ознаÑ?Ñ?е даний пÑ?нкÑ?, Ñ?кÑ?о ви не знаÑ?Ñ?е пÑ?о Ñ?о йде мова)</string>
-  <string name="wizard_transproxy_none">Ð?Ñ?</string>
-  <string name="pref_transparent_tethering_title">РоздаÑ?а Tor</string>
-  <string name="pref_transparent_tethering_summary">Ð?вÑ?мкнÑ?Ñ?и Ð?Ñ?озоÑ?Ñ? Ð?Ñ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ? Tor длÑ? пÑ?иÑ?Ñ?Ñ?оÑ?в з Ñ?оздаÑ?еÑ? по Wi-Fi Ñ? USB (поÑ?Ñ?Ñ?бен пеÑ?езапÑ?Ñ?к)</string>
-  <string name="button_grant_superuser">Ð?апиÑ?аÑ?и Ð?оÑ?Ñ?Ñ?п СÑ?пеÑ?коÑ?иÑ?Ñ?Ñ?ваÑ?а</string>
-  <string name="pref_select_apps">Ð?ибÑ?анÑ? додаÑ?ки</string>
-  <string name="pref_select_apps_summary">Ð?ибÑ?аÑ?и додаÑ?ки длÑ? напÑ?авленнÑ? Ñ?еÑ?ез Tor</string>
-  <string name="pref_node_configuration">Ð?онÑ?Ñ?гÑ?Ñ?аÑ?Ñ?Ñ? вÑ?зла</string>
-  <string name="pref_node_configuration_summary">Це додаÑ?ковÑ? налаÑ?Ñ?Ñ?ваннÑ?, Ñ?кÑ? можÑ?Ñ?Ñ? знизиÑ?и ваÑ?Ñ? анонÑ?мнÑ?Ñ?Ñ?Ñ?</string>
-  <string name="pref_entrance_node">Ð?Ñ?Ñ?днÑ? вÑ?зли</string>
-  <string name="pref_entrance_node_summary">Ð?Ñ?дбиÑ?ки, нÑ?ки, кÑ?аÑ?ни Ñ?а адÑ?еÑ?и длÑ? пеÑ?Ñ?ого Ñ?Ñ?Ñ?ибка</string>
-  <string name="pref_entrance_node_dialog">Ð?ведÑ?Ñ?Ñ? вÑ?Ñ?днÑ? вÑ?зли</string>
-  <string name="button_proxy_all">УÑ?Ñ? Ñ?еÑ?ез пÑ?окÑ?Ñ?</string>
-  <string name="button_proxy_none">Ð?оден Ñ?еÑ?ез пÑ?окÑ?Ñ?</string>
-  <string name="button_invert_selection">Ð?нвеÑ?Ñ?Ñ?ваÑ?и видÑ?леннÑ?</string>
-  <string name="pref_proxy_title">Ð?иÑ?Ñ?дна пÑ?окÑ?Ñ? меÑ?ежа</string>
-  <string name="pref_proxy_type_title">Тип Ð?Ñ?окÑ?Ñ?</string>
-  <string name="pref_proxy_type_summary">Ð?Ñ?оÑ?окол длÑ? викоÑ?иÑ?Ñ?аннÑ? пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ?ом: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Ð?ведÑ?Ñ?Ñ? Тип Ð?Ñ?окÑ?Ñ?</string>
-  <string name="pref_proxy_host_title">ХоÑ?Ñ? Ð?Ñ?окÑ?Ñ?</string>
-  <string name="pref_proxy_host_summary">Ð?м\'Ñ? Ñ?оÑ?Ñ?а пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ?а</string>
-  <string name="pref_proxy_host_dialog">Ð?ведÑ?Ñ?Ñ? ХоÑ?Ñ? Ð?Ñ?окÑ?Ñ?</string>
-  <string name="pref_proxy_port_title">Ð?оÑ?Ñ? Ð?Ñ?окÑ?Ñ?</string>
-  <string name="pref_proxy_port_summary">Ð?оÑ?Ñ? пÑ?окÑ?Ñ?-Ñ?еÑ?веÑ?а</string>
-  <string name="pref_proxy_port_dialog">Ð?ведÑ?Ñ?Ñ? поÑ?Ñ? Ð?Ñ?окÑ?Ñ?</string>
-  <string name="pref_proxy_username_title">Ð?м\'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а длÑ? виÑ?Ñ?дного пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ?</string>
-  <string name="pref_proxy_username_summary">Ð?м\'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а длÑ? пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ? (вказÑ?ваÑ?и не обов\'Ñ?зково)</string>
-  <string name="pref_proxy_username_dialog">Ð?ведÑ?Ñ?Ñ? Ð?м\'Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?а пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ?</string>
-  <string name="pref_proxy_password_title">Ð?аÑ?олÑ? виÑ?Ñ?дного пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ?</string>
-  <string name="pref_proxy_password_summary">Ð?аÑ?олÑ? пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ? (вказÑ?ваÑ?и не обов\'Ñ?зково)</string>
-  <string name="pref_proxy_password_dialog">Ð?ведÑ?Ñ?Ñ? паÑ?олÑ? пÑ?окÑ?Ñ?-з\'Ñ?днаннÑ?</string>
-  <string name="status">СÑ?аÑ?Ñ?Ñ?</string>
-  <string name="setting_up_full_transparent_proxying_">Ð?Ñ?Ñ?ановленнÑ? загалÑ?ноÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ð?Ñ?Ñ?ановленнÑ? заÑ?нованоÑ? на додаÑ?каÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?...</string>
-  <string name="transparent_proxying_enabled">Ð?Ñ?озоÑ?а пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy пÑ?дÑ?Ñ?имÑ?Ñ? РоздаÑ?Ñ?!</string>
-  <string name="warning_error_starting_transparent_proxying_">УÐ?Ð?Ð?Ð?: помилка запÑ?Ñ?кÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?!</string>
-  <string name="transproxy_rules_cleared">Ð?Ñ?авила TransProxy видаленÑ?</string>
-  <string name="couldn_t_start_tor_process_">Ð?еможливо запÑ?Ñ?Ñ?иÑ?и Tor: </string>
-  <string name="privoxy_is_running_on_port_">Polipo пÑ?аÑ?Ñ?Ñ? на поÑ?Ñ?Ñ?: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Ð?Ñ?Ñ?ановленнÑ? заÑ?новане на поÑ?Ñ?аÑ? пÑ?озоÑ?оÑ? пÑ?окÑ?иÑ?Ñ?каÑ?Ñ?Ñ?...</string>
-  <string name="bridge_error">Ð?омилка Ð?оÑ?Ñ?Ñ?</string>
-  <string name="bridge_requires_ip">Ð?лÑ? викоÑ?иÑ?Ñ?аннÑ? моÑ?Ñ?Ñ?, необÑ?Ñ?дно задаÑ?и IP адÑ?еÑ?Ñ? Ñ?к мÑ?нÑ?мÑ?м одного моÑ?Ñ?Ñ?.</string>
-  <string name="send_email_for_bridges">Ð?Ñ?дпÑ?авÑ?е email на адÑ?еÑ?Ñ? bridges@xxxxxxxxxxxxxx з Ñ?Ñ?дком «get bridges» в Ñ?Ñ?лÑ? повÑ?домленнÑ? Ñ?з облÑ?кового запиÑ?Ñ? gmail.</string>
-  <string name="error">Ð?омилка</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?Ñ? налаÑ?Ñ?Ñ?ваннÑ? Ð?оÑ?Ñ?Ñ?пниÑ? Ð?дÑ?еÑ? викликали виклÑ?Ñ?еннÑ?!</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Ð?еможливо запÑ?Ñ?Ñ?иÑ?и Tor: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Ð?аÑ?Ñ? налаÑ?Ñ?Ñ?ваннÑ? Ð?оÑ?Ñ?Ñ?пниÑ? Ð?дÑ?еÑ? викликали виклÑ?Ñ?еннÑ?!</string>
   <string name="your_relay_settings_caused_an_exception_">Ð?алаÑ?Ñ?Ñ?ваннÑ? ваÑ?ого Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а викликали виклÑ?Ñ?еннÑ?!</string>
-  <string name="exit_nodes">Ð?иÑ?Ñ?днÑ? Ð?Ñ?зли</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Ð?Ñ?дбиÑ?ки, нÑ?ки, кÑ?аÑ?ни Ñ?а адÑ?еÑ?и длÑ? оÑ?Ñ?аннÑ?ого Ñ?Ñ?Ñ?ибка</string>
-  <string name="enter_exit_nodes">Ð?ведÑ?Ñ?Ñ? Ð?иÑ?Ñ?днÑ? Ð?Ñ?зли</string>
-  <string name="exclude_nodes">Ð?иклÑ?Ñ?енÑ? Ð?Ñ?зли</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Ð?Ñ?дбиÑ?ки, нÑ?ки, кÑ?аÑ?ни Ñ?а адÑ?еÑ?и на виклÑ?Ñ?еннÑ?</string>
-  <string name="enter_exclude_nodes">Ð?ведÑ?Ñ?Ñ? Ð?иклÑ?Ñ?енÑ? Ð?Ñ?зли</string>
-  <string name="strict_nodes">ТоÑ?нÑ? Ð?Ñ?зли</string>
-  <string name="use_only_these_specified_nodes">Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и *Ñ?Ñ?лÑ?ки* Ñ?Ñ? заданÑ? вÑ?зли</string>
-  <string name="bridges">Ð?оÑ?Ñ?и</string>
-  <string name="use_bridges">Ð?икоÑ?иÑ?Ñ?Ñ?вÑ?ваÑ?и Ð?оÑ?Ñ?и</string>
-  <string name="bridges_obfuscated">Ð?бÑ?Ñ?Ñ?кованÑ? Ð?оÑ?Ñ?и</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Ð?клÑ?Ñ?иÑ?и алÑ?Ñ?еÑ?наÑ?ивнÑ? вÑ?Ñ?днÑ? вÑ?зли в меÑ?ежÑ? Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Ð?аданÑ? моÑ?Ñ?и обÑ?Ñ?Ñ?кованÑ?</string>
-  <string name="ip_address_and_port_of_bridges">IP адÑ?еÑ?и Ñ? поÑ?Ñ?и моÑ?Ñ?Ñ?в</string>
-  <string name="enter_bridge_addresses">Ð?ведÑ?Ñ?Ñ? Ð?дÑ?еÑ?и Ð?оÑ?Ñ?Ñ?в</string>
-  <string name="relays">РеÑ?Ñ?анÑ?лÑ?Ñ?оÑ?и</string>
-  <string name="relaying">РеÑ?Ñ?анÑ?лÑ?Ñ?Ñ?Ñ?</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Ð?озволиÑ?и ваÑ?омÑ? пÑ?иÑ?Ñ?Ñ?оÑ? бÑ?Ñ?и невиÑ?Ñ?дним Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?ом</string>
-  <string name="relay_port">Ð?оÑ?Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</string>
-  <string name="listening_port_for_your_tor_relay">СлÑ?Ñ?аÑ?Ñ?ий поÑ?Ñ? длÑ? ваÑ?ого Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Tor</string>
-  <string name="enter_or_port">Ð?ведÑ?Ñ?Ñ? поÑ?Ñ? OR</string>
-  <string name="relay_nickname">Ð?м\'Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</string>
-  <string name="the_nickname_for_your_tor_relay">Ð?м\'Ñ? длÑ? ваÑ?ого Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а Tor</string>
-  <string name="enter_a_custom_relay_nickname">Ð?ведÑ?Ñ?Ñ? коÑ?иÑ?Ñ?Ñ?ваÑ?Ñ?ке Ñ?м\'Ñ? Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?а</string>
-  <string name="reachable_addresses">Ð?оÑ?Ñ?Ñ?пнÑ? Ð?дÑ?еÑ?и</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Ð?апÑ?Ñ?каÑ?и Ñ?к клÑ?Ñ?нÑ? за бÑ?андмаÑ?еÑ?ом з обмежÑ?Ñ?Ñ?ими полÑ?Ñ?иками</string>
-  <string name="reachable_ports">Ð?оÑ?Ñ?Ñ?пнÑ? поÑ?Ñ?и</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ð?оÑ?Ñ?и доÑ?Ñ?Ñ?пнÑ? Ñ?з обмежÑ?ваного бÑ?андмаÑ?еÑ?а</string>
-  <string name="enter_ports">Ð?ведÑ?Ñ?Ñ? поÑ?Ñ?и</string>
-  <string name="enable_hidden_services">Ð?вÑ?мкнÑ?Ñ?и Ð?Ñ?иÑ?ованÑ? СлÑ?жби</string>
-  <string name="run_servers_accessible_via_the_tor_network">запÑ?Ñ?Ñ?иÑ?и Ñ?еÑ?веÑ?и доÑ?Ñ?Ñ?пнÑ? Ñ?еÑ?ез меÑ?ежÑ? Tor</string>
-  <string name="enter_localhost_ports_for_hidden_services">введÑ?Ñ?Ñ? локалÑ?нÑ? поÑ?Ñ?и длÑ? пÑ?иÑ?ованиÑ? Ñ?лÑ?жб</string>
-  <string name="hidden_service_ports">Ð?оÑ?Ñ?и Ð?Ñ?иÑ?ованоÑ? СлÑ?жби</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">адÑ?еÑ?оване Ñ?м\'Ñ? длÑ? ваÑ?оÑ? пÑ?иÑ?ованоÑ? Ñ?лÑ?жби (Ñ?генеÑ?овано авÑ?омаÑ?иÑ?но)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">ввÑ?мкнÑ?Ñ?и вивÑ?д логÑ? налогодженнÑ? (поÑ?Ñ?Ñ?бно викоÑ?иÑ?Ñ?овÑ?ваÑ?и adb або aLogCat длÑ? пеÑ?еглÑ?дÑ?)</string>
-  <string name="project_home">Ð?омаÑ?нÑ? Ñ?Ñ?оÑ?Ñ?нка(и) пÑ?оекÑ?Ñ?: </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Ð?Ñ?Ñ?ензÑ?Ñ? Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Ð?Ñ?огÑ?ами Ñ?Ñ?оÑ?оннÑ?Ñ? Ñ?озÑ?обникÑ?в: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="hidden_service_request">Ð?одаÑ?ок Ñ?оÑ?е вÑ?дкÑ?иÑ?и пÑ?иÑ?ований поÑ?Ñ? Ñ?еÑ?веÑ?а %S меÑ?ежÑ? Tor. Це безпеÑ?но, Ñ?кÑ?о ви довÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?Ñ?омÑ? додаÑ?кÑ?.</string>
-  <string name="found_existing_tor_process">знайдено Ñ?Ñ?нÑ?Ñ?Ñ?ий пÑ?оÑ?еÑ? Tor...</string>
+    <string name="found_existing_tor_process">знайдено Ñ?Ñ?нÑ?Ñ?Ñ?ий пÑ?оÑ?еÑ? Tor...</string>
   <string name="something_bad_happened">Ð?иникла Ñ?каÑ?Ñ? помилка. Ð?еÑ?евÑ?Ñ?Ñ?е лог</string>
-  <string name="hidden_service_on">пÑ?иÑ?ована Ñ?лÑ?жба на:</string>
-  <string name="unable_to_read_hidden_service_name">неможливо пÑ?оÑ?иÑ?аÑ?и Ñ?м\'Ñ? пÑ?иÑ?ованоÑ? Ñ?лÑ?жби</string>
+    <string name="unable_to_read_hidden_service_name">неможливо пÑ?оÑ?иÑ?аÑ?и Ñ?м\'Ñ? пÑ?иÑ?ованоÑ? Ñ?лÑ?жби</string>
   <string name="unable_to_start_tor">Ð?еможливо запÑ?Ñ?Ñ?иÑ?и Tor:</string>
-  <string name="unable_to_reset_tor">Ð?еÑ?езаванÑ?ажÑ?е Ñ?вÑ?й пÑ?иÑ?Ñ?Ñ?Ñ?й, не вдаÑ?Ñ?Ñ?Ñ?Ñ? пеÑ?езапÑ?Ñ?Ñ?иÑ?и Tor!</string>
-  <string name="pref_use_sys_iptables_title">Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и Iptables за замовÑ?Ñ?ваннÑ?м</string>
-  <string name="pref_use_sys_iptables_summary">викоÑ?иÑ?Ñ?овÑ?ваÑ?и вбÑ?дований бÑ?наÑ?ник iptables замÑ?Ñ?Ñ?Ñ? Ñ?ого Ñ?о надаÑ?Ñ?Ñ?Ñ?Ñ? з Orbot</string>
-  <string name="error_installing_binares">Ð?Ñ?наÑ?нÑ? Ñ?айли Tor не змогли вÑ?Ñ?ановиÑ?иÑ?Ñ? або оновиÑ?иÑ?Ñ?.</string>
-  <string name="pref_use_persistent_notifications">Ð?авжди показÑ?ваÑ?и Ñ?конкÑ? в панелÑ? завданÑ? коли Orbot пÑ?дклÑ?Ñ?ений</string>
-  <string name="pref_use_persistent_notifications_title">СповÑ?Ñ?еннÑ? пÑ?о поÑ?Ñ?Ñ?йнÑ? Ñ?обоÑ?Ñ?</string>
-  <string name="pref_use_expanded_notifications">Ð?оказаÑ?и Ñ?озÑ?иÑ?ене Ñ?повÑ?Ñ?еннÑ? з кÑ?аÑ?ноÑ? виÑ?одÑ? Tor Ñ?а IP</string>
-  <string name="pref_use_expanded_notifications_title">РозÑ?иÑ?енÑ? Ñ?повÑ?Ñ?еннÑ?</string>
-  <string name="notification_using_bridges">Ð?оÑ?Ñ?и ввÑ?мкнÑ?Ñ?Ñ?!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ð?ова</string>
-  <string name="set_locale_summary">Ð?ибÑ?аÑ?и локалÑ? Ñ? мовÑ? длÑ? Orbot</string>
-  <string name="wizard_locale_title">Ð?ибÑ?аÑ?и Ð?овÑ?</string>
-  <string name="wizard_locale_msg">Ð?алиÑ?иÑ?и за замовÑ?Ñ?ваннÑ?м або пеÑ?еклÑ?Ñ?иÑ?и поÑ?оÑ?нÑ? мовÑ?</string>
-  <string name="powered_by">вÑ?д Tor</string>
-  <string name="btn_save_settings">Ð?беÑ?егÑ?и Ð?алаÑ?Ñ?Ñ?ваннÑ?</string>
-  <string name="no_internet_connection_tor">Ð?емаÑ? Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?; Tor в Ñ?ежимÑ? оÑ?Ñ?кÑ?ваннÑ?â?¦</string>
-  <string name="bandwidth_">Ð?анал:</string>
-  <string name="down">вÑ?</string>
-  <string name="up">виÑ?</string>
-  <string name="pref_disable_network_title">Ð?е викоÑ?иÑ?Ñ?овÑ?ваÑ?и Ñ?ежим Ñ?нÑ?</string>
-  <string name="pref_disable_network_summary">Ð?еÑ?еводиÑ?и в Ñ?ежим Ñ?нÑ? пÑ?и вÑ?дÑ?Ñ?Ñ?ноÑ?Ñ?Ñ? Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?</string>
-  <string name="newnym">Ð?и пеÑ?емкнÑ?лиÑ?Ñ? на новий Ñ?денÑ?иÑ?Ñ?каÑ?оÑ? Tor!</string>
-  <string name="menu_use_chatsecure">Ð?икоÑ?иÑ?Ñ?овÑ?ваÑ?и ChatSecure</string>
-  <string name="permission_manage_tor_label">Ð?еÑ?Ñ?ваннÑ? Tor</string>
-  <string name="permission_manage_tor_description">Ð?озволиÑ?и додаÑ?кÑ? кеÑ?Ñ?ваÑ?и Ñ?еÑ?вÑ?Ñ?ом Tor</string>
-  <string name="install_apps_">Ð?Ñ?Ñ?ановиÑ?и додаÑ?ки?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Ð?емаÑ? доÑ?Ñ?Ñ?пÑ? до меÑ?ежÑ? Ñ?нÑ?еÑ?неÑ?. Tor пеÑ?еÑ?одиÑ?Ñ? в Ñ?ежим Ñ?нÑ?â?¦</string>
+    <string name="no_internet_connection_tor">Ð?емаÑ? Ñ?нÑ?еÑ?неÑ?-з\'Ñ?днаннÑ?; 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">Ð?алаÑ?Ñ?Ñ?ваннÑ? поÑ?Ñ?Ñ? Tor TransProxy</string>
-  <string name="pref_dnsport_title">Ð?оÑ?Ñ? Tor DNS</string>
-  <string name="pref_dnsport_summary">Ð?оÑ?Ñ?, Ñ?кий Tor надаÑ? Ñ?воÑ?мÑ? DNS (за замовÑ?Ñ?ваннÑ?м: 5400 або 0 длÑ? вимкненнÑ?)</string>
-  <string name="pref_dnsport_dialog">Ð?алаÑ?Ñ?Ñ?ваннÑ? поÑ?Ñ?Ñ? DNS</string>
-  <string name="pref_torrc_title">Ð?одаÑ?ковÑ? налаÑ?Ñ?Ñ?ваннÑ? Torrc</string>
-  <string name="pref_torrc_summary">Ð?Ð?ШÐ? Ð?Ð?Я Ð?Ð?СÐ?Ð?РТÐ?Ð?: введÑ?Ñ?Ñ? безпоÑ?еÑ?еднÑ? Ñ?Ñ?дки налаÑ?Ñ?Ñ?ванÑ? torrc</string>
-  <string name="pref_torrc_dialog">Ð?одаÑ?кове Ñ? Torrc</string>
-  <string name="wizard_tips_martus">Mobile Martus â?? пÑ?огÑ?ама Benetech Human Rights Documentation </string>
-  <string name="your_tor_public_ips_">Ð?аÑ?Ñ? пÑ?блÑ?Ñ?нÑ? Tor IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Ð?Ñ?дÑ? лаÑ?ка, вимкнÑ?Ñ?Ñ? Ñ?ей додаÑ?ок Ñ? Android-&gt;Ð?алаÑ?Ñ?Ñ?ваннÑ?-&gt;Ð?Ñ?огÑ?ами, Ñ?кÑ?о Ñ? Ð?аÑ? виникаÑ?Ñ?Ñ? пÑ?облеми з Orbot: </string>
-  <string name="app_conflict">Ð?онÑ?лÑ?кÑ? пÑ?огÑ?ам</string>
-  <string name="pref_transproxy_refresh_title">Ð?вÑ?опеÑ?езапÑ?Ñ?к Transproxy</string>
-  <string name="pref_transproxy_refresh_summary">Ð?овÑ?оÑ?но заÑ?Ñ?оÑ?Ñ?ваÑ?и пÑ?авила Transproxy, коли змÑ?ниÑ?Ñ?Ñ?Ñ? Ñ?Ñ?ан меÑ?ежÑ?</string>
-  <string name="pref_transproxy_flush_title">Ð?РÐ?Ð?УСÐ?Ð?Ð? Ð?Ð?Ð?УЧÐ?Ð?Ð?Я Transproxy</string>
-  <string name="pref_transproxy_flush_summary">Ð?аÑ?иÑ?нÑ?Ñ?Ñ? Ñ?Ñ?Ñ?, Ñ?об зÑ?Ñ?внÑ?Ñ?и Ñ?Ñ?Ñ? пÑ?авила меÑ?ежÑ? transproxy Ð?Ð?РÐ?Ð?</string>
-  <string name="transparent_proxy_rules_flushed_">Ð?Ñ?авила пÑ?озоÑ?ого пÑ?окÑ?Ñ? зÑ?Ñ?внÑ?но!</string>
-  <string name="you_do_not_have_root_access_enabled">У Ð?аÑ? не ввÑ?мкнено ROOT-доÑ?Ñ?Ñ?п</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Ð?ам може бÑ?Ñ?и поÑ?Ñ?Ñ?бно зÑ?пиниÑ?и Ñ? запÑ?Ñ?Ñ?иÑ?и Orbot, Ñ?об змÑ?ни налаÑ?Ñ?Ñ?ванÑ? вÑ?Ñ?Ñ?пили в дÑ?Ñ?.</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Ð?оÑ?Ñ?и оновлено</string>
-  <string name="restart_orbot_to_use_this_bridge_">Ð?Ñ?дÑ? лаÑ?ка, пеÑ?езапÑ?Ñ?Ñ?Ñ?Ñ?Ñ? Orbot, Ñ?об змÑ?ни ввÑ?йÑ?ли в Ñ?илÑ?</string>
-  <string name="menu_qr">QR-коди</string>
-  <string name="bridge_mode">Режим моÑ?Ñ?Ñ?</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Ð?еб</string>
-  <string name="activate">Ð?кÑ?ивÑ?ваÑ?и</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Ð?и можеÑ?е Ñ?вÑ?мкнÑ?Ñ?и пÑ?опÑ?Ñ?каннÑ? Ñ?Ñ?аÑ?Ñ?кÑ? Ñ?Ñ?Ñ?Ñ? пÑ?огÑ?ам на Ð?аÑ?омÑ? пÑ?оÑ?Ñ?Ñ?оÑ? Ñ?еÑ?ез меÑ?ежÑ? Tor, Ñ?коÑ?иÑ?Ñ?авÑ?иÑ?Ñ? Ñ?Ñ?нкÑ?Ñ?Ñ?Ñ? VPN в Android.\n\n*УÐ?Ð?Ð?Ð?* Це нова, екÑ?пеÑ?именÑ?алÑ?на Ñ?Ñ?нкÑ?Ñ?Ñ? Ñ? в деÑ?киÑ? випадкаÑ? може не запÑ?Ñ?Ñ?иÑ?иÑ?Ñ? авÑ?омаÑ?иÑ?но або зÑ?пиниÑ?иÑ?Ñ?. Ð?Ñ? Ð?Ð? ваÑ?Ñ?о викоÑ?иÑ?Ñ?овÑ?ваÑ?и длÑ? анонÑ?мноÑ?Ñ?Ñ? Ñ? Ð?Ð?ШÐ? длÑ? обÑ?одÑ? Ñ?аÑ?Ñ?волÑ?в Ñ?а Ñ?Ñ?лÑ?Ñ?Ñ?Ñ?в.</string>
-  <string name="send_email">Ð?адÑ?Ñ?лаÑ?и лиÑ?Ñ?а</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ð?и можеÑ?е оÑ?Ñ?имаÑ?и адÑ?еÑ?Ñ? моÑ?Ñ?Ñ? Ñ?еÑ?ез елекÑ?Ñ?оннÑ? поÑ?Ñ?Ñ?, веб або вÑ?дÑ?канÑ?вавÑ?и QR-код моÑ?Ñ?Ñ?. Ð?беÑ?Ñ?Ñ?Ñ? «Email» Ñ?и «Ð?еб» Ñ?низÑ?, Ñ?об подаÑ?и запиÑ? на адÑ?еÑ?Ñ? моÑ?Ñ?Ñ?.\n\nÐ?оли Ñ? Ð?аÑ? бÑ?де адÑ?еÑ?а, Ñ?копÑ?Ñ?йÑ?е Ñ? вÑ?Ñ?авÑ?е Ñ?Ñ? Ñ? Ñ?оздÑ?лÑ? «Ð?оÑ?Ñ?и» налаÑ?Ñ?Ñ?ванÑ? Orbot Ñ? пеÑ?езапÑ?Ñ?Ñ?Ñ?Ñ?Ñ? його.</string>
-  <string name="standard_browser">СÑ?андаÑ?Ñ?ний бÑ?аÑ?зеÑ?</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">Ð?РÐ?Ð?Ð?ТÐ?Ð?: Ð?иÑ?е Ñ?Ñ?андаÑ?Ñ?нÑ? моÑ?Ñ?и Tor пÑ?аÑ?Ñ?Ñ?Ñ?Ñ? на пÑ?иÑ?Ñ?Ñ?оÑ?Ñ? з Intel X86/Atom</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-ur/strings.xml b/orbotservice/src/main/res/values-ur/strings.xml
index 21abd16d..05e2b960 100644
--- a/orbotservice/src/main/res/values-ur/strings.xml
+++ b/orbotservice/src/main/res/values-ur/strings.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="menu_browse">براؤز Ú©Û?جÛ?Û?</string>
-  <string name="menu_info">Ù?دد</string>
-  <string name="button_help">Ù?دد</string>
-  <string name="button_close">بÙ?د Ú©Û?جÛ?Û?</string>
-  <string name="btn_back">Ù¾Û?Ú?Ú¾Û?</string>
-  <string name="btn_cancel">تÙ?سÛ?Ø® Ú©Û?جÛ?Û?</string>
-  <!--Welcome Wizard strings (DJH)-->
+    <!--Welcome Wizard strings (DJH)-->
   <!--END Welcome Wizard strings (DJH)-->
   <!--New Wizard Strings-->
   <!--Title Screen-->
@@ -14,5 +8,4 @@
   <!--Permissions screen-->
   <!--TipsAndTricks screen-->
   <!--Transparent Proxy screen-->
-  <string name="default_bridges"></string>
 </resources>
diff --git a/orbotservice/src/main/res/values-uz/strings.xml b/orbotservice/src/main/res/values-uz/strings.xml
index 785d9672..639c0fd3 100644
--- a/orbotservice/src/main/res/values-uz/strings.xml
+++ b/orbotservice/src/main/res/values-uz/strings.xml
@@ -1,47 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="app_name">Orbot</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="status_starting_up">Orbot ishga tushirilmoqdaâ?¦</string>
+    <string name="status_starting_up">Orbot ishga tushirilmoqdaâ?¦</string>
   <string name="status_activated">Tor tarmog\'iga ulangan</string>
-  <string name="menu_home">Uy</string>
-  <string name="menu_settings">Moslamalar</string>
-  <string name="menu_info">Yordam</string>
-  <string name="menu_about">Dastur haqida</string>
-  <string name="main_layout_download">Yuklab olish</string>
-  <string name="main_layout_upload">Yuklash</string>
-  <string name="button_help">Yordam</string>
-  <string name="button_close">Yopish</string>
-  <string name="button_about">Dasur haqida</string>
-  <string name="menu_verify">Tekshirish</string>
-  <string name="menu_exit">Chiqish</string>
-  <string name="title_error">Dastur xatosi</string>
-  <string name="wizard_title">Orbot</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proksi moslamalari</string>
-  <string name="wizard_final">Orbot tayyor!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">Umumiy</string>
-  <!--New Wizard Strings-->
+    <!--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="pref_proxy_type_dialog">Proksi turini kiriting</string>
-  <string name="pref_proxy_password_summary">Proksi maxfiy so\'zi (Qo\'shimcha)</string>
-  <string name="pref_proxy_password_dialog">Proksi maxfiy so\'zini kiriting</string>
-  <string name="status">Holati</string>
-  <string name="error">Xato</string>
-  <string name="the_tor_license">Tor litsenziyasi</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_summary">Orbot uchun lokal va tilni tanlash</string>
-  <string name="wizard_locale_title">Tilni tanlansh</string>
-  <string name="btn_save_settings">Moslamalarni saqlash</string>
+    <string name="found_existing_tor_process">Mavjud bo\'lgan Tor jarayoni topildi...</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-vi/strings.xml b/orbotservice/src/main/res/values-vi/strings.xml
index 0401b9ce..ea17ed96 100644
--- a/orbotservice/src/main/res/values-vi/strings.xml
+++ b/orbotservice/src/main/res/values-vi/strings.xml
@@ -2,292 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot là má»?t ứng dụng proxy miá»?n phí, Ä?ược thiết kế Ä?á»? làm cho các ứng dụng khác kết ná»?i vá»?i Internet má»?t cách an toàn. Orbot sá»­ dụng Tor Ä?á»? mã hóa các kết ná»?i Internet rá»?i ẩn danh nó thông qua má»?t loạt các nút trong mạng Tor. Tor là phần má»?m miá»?n phí và là má»?t mạng lÆ°á»?i má»? giúp bạn chá»?ng lại sá»± giám sát mạng, vá»?n Ä?e dá»?a riêng tÆ° trá»±c tuyến, hay các hoạt Ä?á»?ng bí mật...</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">khá»?i Ä?á»?ng và ngừng Tor</string>
-  <string name="tor_proxy_service_process">d�ch vụ tor proxy</string>
-  <string name="status_starting_up">Ortbot Ä?ang khá»?i Ä?á»?ng...</string>
+    <string name="status_starting_up">Ortbot Ä?ang khá»?i Ä?á»?ng...</string>
   <string name="status_activated">Ä?ã kết ná»?i vá»?i mạng Tor</string>
   <string name="status_disabled">Orbot Ä?ã Ä?ược vô hiá»?u hóa</string>
   <string name="status_shutting_down">Ä?ang tắt dá»?ch vụ Tor</string>
   <string name="tor_process_starting">Bắt Ä?ầu Tor</string>
   <string name="tor_process_complete">hoàn thành.</string>
-  <string name="tor_process_waiting">Ä?ang chá»?.</string>
-  <string name="not_anonymous_yet">Chú ý: Kết ná»?i của bạn chÆ°a phải là ẩn danh! Hãy cài Ä?ặt các ứng dụng của bạn Ä?á»? sá»­ dụng HTTP Proxy 127.0.0.1:8118, Proxy SOCKS4A hoặc proxy SOCKS5 127.0.0.1:9050</string>
-  <string name="menu_home">Trang chủ</string>
-  <string name="menu_browse">Trình duy�t</string>
-  <string name="menu_settings">Thiết lập</string>
-  <string name="menu_log">Nhật ký</string>
-  <string name="menu_info">Giúp Ä?ỡ</string>
-  <string name="menu_apps">Mạng riêng ảo</string>
-  <string name="menu_start">Bắt Ä?ầu</string>
-  <string name="menu_stop">Ngừng</string>
-  <string name="menu_about">Vá»?</string>
-  <string name="menu_promo_apps">Các ứng dụng khác...</string>
-  <string name="main_layout_download">Tải v�</string>
-  <string name="main_layout_upload">Tải lên</string>
-  <string name="button_help">Giúp Ä?ỡ</string>
-  <string name="button_close">Ä?óng</string>
-  <string name="button_about">Giá»?i thiá»?u</string>
-  <string name="button_clear_log">Xóa nhật ký</string>
-  <string name="menu_verify">Kiá»?m tra</string>
-  <string name="menu_exit">Thoát</string>
-  <string name="menu_scan">Quét mã BridgeQR</string>
-  <string name="menu_share_bridge">Xuất mã BridgeQR</string>
-  <string name="press_to_start">- nhấn giữ Ä?á»? khá»?i Ä?á»?ng -</string>
-  <string name="pref_trans_proxy_group">Proxy trong su�t (Yêu cầu root)</string>
-  <string name="pref_trans_proxy_title">Proxy trong suá»?t</string>
-  <string name="pref_trans_proxy_summary">Tá»± Ä?á»?ng áp dụng Tor cho ứng dụng</string>
-  <string name="pref_transparent_all_title">�p dụng Tor cho tất cả ứng dụng</string>
-  <string name="pref_transparent_all_summary">Chuy�n tất cả các kết n�i của các ứng dụng qua Tor</string>
-  <string name="pref_transparent_port_fallback_title">C�ng Proxy dự phòng</string>
-  <string name="pref_transparent_port_fallback_summary">CHÃ? Ã?: Tránh dùng các cá»?ng thông dụng (80, 443, v.v...). *CHá»?* dùng nếu chế Ä?á»? \"áp dụng Tor cho tất cả\" hoặc \"chá»?n ứng dụng\" không dùng Ä?ược.</string>
-  <string name="pref_transparent_port_title">Danh sách c�ng</string>
-  <string name="pref_transparent_port_summary">Liá»?t kê các cá»?ng Ä?á»? áp dụng proxy. *CHá»?* dùng nếu chế Ä?á»? \"áp dụng Tor cho tất cả\" hoặc \"chá»?n ứng dụng\" không dùng Ä?ược.</string>
-  <string name="pref_transparent_port_dialog">Ä?iá»?n sá»? cá»?ng Ä?á»? áp dụng proxy</string>
-  <string name="pref_has_root">Yêu cầu root</string>
-  <string name="pref_has_root_summary">Yêu cầu root Ä?á»? kích hoạt proxy trong suá»?t</string>
-  <string name="status_install_success">Tập nhá»? phân của Tor Ä?ã Ä?ược cài Ä?ặt!</string>
-  <string name="status_install_fail">Tập nhá»? phân của Tor bá»? lá»?i khi cài Ä?ặt. Xin hãy kiá»?m tra nhật ký và thông báo cho tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Ứng dụng b� l�i</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">Vá»? Orbot</string>
-  <string name="btn_next">Tiếp</string>
-  <string name="btn_back">Trá»? vá»?</string>
-  <string name="btn_finish">Kết thúc</string>
-  <string name="btn_okay">Ä?á»?ng ý</string>
-  <string name="btn_cancel">Hủy</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Vài chi tiết v� Orbot</string>
-  <string name="wizard_details_msg">Orbot là má»?t ứng dụng mã nguá»?n má»? có chứa Tor, LibEvent và Polipo. Nó cung cấp má»?t proxy HTTP ná»?i bá»? (8118) và má»?t proxy SOCKS (9050) tá»?i mạng Tor. Orbot cÅ©ng có khả nÄ?ng chuyá»?n tất cả các kết ná»?i Internet thông qua Tor trên các thiết bá»? Ä?ã root.</string>
-  <string name="wizard_permissions_root">Ä?ã cho phép quyá»?n</string>
-  <string name="wizard_permissions_stock">Quy�n truy cập của Orbot</string>
-  <string name="wizard_premissions_msg_root">Tuyá»?t! Chúng tôi Ä?ã nhận ra máy bạn có root Ä?ược kích hoạt cho Orbot. Chúng tôi sẽ tận dụng Ä?iá»?u này.</string>
-  <string name="wizard_permissions_msg_stock">Mặc dù không cần thiết, nhÆ°ng Orbot có thá»? trá»? thành má»?t công cụ mạnh mẽ hÆ¡n nếu thiết bá»? của bạn có root. Hãy ấn nút dÆ°á»?i Ä?ây Ä?á»? cho phép Orbot có \"siêu nÄ?ng lá»±c\"!</string>
-  <string name="wizard_permissions_no_root">Nếu bạn không root hoặc không rành vá»? những gì chúng tôi trình bày, xin chá»? dùng những ứng dụng Ä?ã Ä?ược tạo ra Ä?á»? dùng kết hợp vá»?i Orbot.</string>
-  <string name="wizard_permissions_consent">Tôi hi�u rõ và sẽ tiếp tục dùng mà không cần root</string>
-  <string name="wizard_permission_enable_root">Cho phép Orbot truy cập root</string>
-  <string name="wizard_configure">Cài Ä?ặt thông báo cho Tor</string>
-  <string name="wizard_configure_msg">Orbot cho phép chuy�n tất cả các kết n�i của các ứng dụng qua Tor HOẶC áp dụng cho từng ứng dụng riêng lẻ.</string>
-  <string name="wizard_configure_all">�p dụng proxy Tor cho tất cả các ứng dụng</string>
-  <string name="wizard_configure_select_apps">Lá»±a chá»?n từng ứng dụng Ä?á»? áp dụng Tor</string>
-  <string name="wizard_tips_tricks">Các ứng dụng Ä?ã Ä?ược áp dụng Tor</string>
-  <string name="wizard_tips_msg">Những ứng dụng sau Ä?ây Ä?ã Ä?ược thiết lập Ä?á»? dùng vá»?i Orbot. Nhấn ứng dụng bất kỳ Ä?á»? cài Ä?ặt ngay bây giá»?, hoặc bạn có thá»? tìm những ứng dụng này trên Google Play, tại trang GuardianProject.info hoặc qua F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Ứng dụng IM (tin nhắn tức th�i) bảo mật cho Android</string>
-  <string name="wizard_tips_proxy">Cài Ä?ặt Proxy - Tìm hiá»?u cách thiết lập ứng dụng Ä?á»? dùng vá»?i Orbot</string>
-  <string name="wizard_tips_duckgo">Ứng dụng tìm kiếm DuckDuckGo</string>
-  <string name="wizard_tips_twitter">Cài proxy của Twitter v�i host là \"localhost\" và c�ng là 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Viết má»?t câu chuyá»?n rá»?i Ä?á»? nó cho Tor Ä?á»? bảo mật!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Cài Ä?ặt proxy</string>
-  <string name="wizard_proxy_help_msg">Nếu ứng dụng Android mà bạn Ä?ang dùng há»? trợ giao thức proxy HTTP hay SOCKS, thì bạn có thá»? cấu hình nó kết ná»?i tá»?i Orbot và sá»­ dụng Tor.\n\n\n Cài Ä?ặt host mặc Ä?á»?nh là 127.0.0.1 hoặc \"localhost\". Vá»?i HTTP, cá»?ng là 8118, còn SOCKS là 9050. Bạn nên dùng SOCKS4A hoặc SOCKS5 nếu có thá»?.\n \n\n\n Bạn có thá»? tìm hiá»?u thêm vá»? cấu hình proxy trên Android qua mục FAQ tại: http://tinyurl.com/proxyandroid</string>
-  <string name="wizard_final">Orbot Ä?ã sẵn sàng!</string>
-  <string name="wizard_final_msg">Hàng trÄ?m ngàn ngÆ°á»?i trên toàn thế giá»?i dùng Tor vá»?i nhiá»?u lý do. Những nhà báo, blogger, các nhà hoạt Ä?á»?ng nhân quyá»?n, an ninh, quân Ä?á»?i, tá»? chức, công dân của những nÆ°á»?c bá»? Ä?ang bá»? Ä?àn áp, hoặc chá»? là những ngÆ°á»?i dân bình thÆ°á»?ng... và bây giá»? là bạn cÅ©ng Ä?ang chuẩn bá»? là má»?t trong sá»? há»?!</string>
-  <string name="wizard_exit_at_first_screen_toast">Vui lòng thiết lập Orbot trư�c khi bạn sử dụng nó!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">Bạn Ä?ã kết ná»?i thành công tá»?i mạng Tor - nhÆ°ng Ä?iá»?u Ä?ó KHÃ?NG có nghÄ©a là thiết bá»? của bạn Ä?ã hoàn toàn an toàn. Bạn có thá»? kiá»?m tra kết ná»?i của bạn qua nút \"Trình duyá»?t\". \n\nTruy cập ttps://guardianproject.info/apps/orbot hoặc gá»­i email tá»?i help@xxxxxxxxxxxxxxxxxxxx Ä?á»? biết thêm chi tiết.</string>
-  <string name="tor_check">Sẽ má»? trang web https://check.torproject.org Ä?á»? kiá»?m tra xem Orbot Ä?ã Ä?ược cài Ä?ặt Ä?úng chÆ°a và bạn có Ä?ang kết ná»?i qua Tor hay không.</string>
-  <string name="pref_hs_group">D�ch vụ web hosting ẩn</string>
-  <string name="pref_general_group">T�ng quát</string>
-  <string name="pref_start_boot_title">Chạy Orbot khi khá»?i Ä?á»?ng thiết bá»?</string>
-  <string name="pref_start_boot_summary">Tá»± khá»?i Ä?á»?ng Orbot và kết ná»?i vào mạng Tor sau khi thiết bá»? Android của bạn khá»?i Ä?á»?ng</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot mang Tor Ä?ến Android! \n\nTor giúp bạn chá»?ng lại bá»? lá»?c ná»?i dung mạng, các hoạt Ä?á»?ng phân tích kết ná»?i mạng và theo dõi mạng, vá»?n Ä?e dá»?a tá»?i sá»± riêng tÆ°, các thông tin bí mật và các má»?i quan há»? cá nhân trên mạng. \n\nHÆ°á»?ng dẫn này sẽ giúp bạn thiết lập Orbot và Tor trên thiết bá»? của bạn.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Cảnh báo</string>
-  <string name="wizard_warning_msg">Chá»? Ä?Æ¡n thuần cài Ä?ặt Orbot sẽ không tá»± Ä?á»?ng ẩn danh các kết ná»?i mạng di Ä?á»?ng của bạn.\n\nBạn bắt buá»?c phải thiết lập Orbot Ä?úng cách, Ä?á»? thiết bá»? của bạn và các ứng dụng khác sá»­ dụng Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Quy�n ứng dụng</string>
-  <string name="wizard_permissions_root_msg1">Bạn có thá»? tuỳ ý cho phép Orbot có truy cập root Ä?á»? kích hoạt những tính nÄ?ng nâng cao, nhÆ° dùng proxy trong suá»?t chẳng hạn.</string>
-  <string name="wizard_permissions_root_msg2">Nếu bạn không muá»?n làm Ä?iá»?u này, xin hãy dùng những ứng dụng Ä?ược tạo Ä?á»? dùng vá»?i Orbot.</string>
-  <string name="wizard_permissions_no_root_msg">Thiết bá»? của bạn hình nhÆ° chÆ°a root hoặc Ä?ã cấp quyá»?n root hoặc truy cập root.\n\nVui lòng chá»?n chế Ä?á»? \"VPN\" trên màn hình chính Ä?á»? thay thế.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Các ứng dụng Ä?ã Ä?ược áp dụng Orbot</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: ứng dụng chat an toàn v�i mã hóa không-theo-dõi</string>
-  <string name="wizard_tips_orweb">Orfox: Trình duyá»?t vá»?i tính nÄ?ng bảo mật nâng cao, hoạt Ä?á»?ng thông qua Tor</string>
-  <string name="wizard_tips_play">Tìm những ứng dụng của Guardian Project trên Google Play</string>
-  <string name="wizard_tips_fdroid">Tìm những ứng dụng của Guardian Project trên F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Tìm những ứng dụng của Guardian Project trên https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Proxy trong suá»?t</string>
-  <string name="wizard_transproxy_msg">Cài Ä?ặt này cho phép các ứng dụng của bạn tá»± Ä?á»?ng kết ná»?i qua mạng Tor mà không cần thiết lập.</string>
-  <string name="wizard_transproxy_hint">(Hãy chá»?n ô này nếu bạn không hiá»?u những gì chúng tôi Ä?ang nói)</string>
-  <string name="wizard_transproxy_none">Không có</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Kích hoạt proxy Tor trong suá»?t Ä?á»? dùng cho Wi-Fi/USB Tethering (cần khá»?i Ä?á»?ng lại)</string>
-  <string name="button_grant_superuser">Y�u cầu truy cập root</string>
-  <string name="pref_select_apps">Ch�n ứng dụng</string>
-  <string name="pref_select_apps_summary">Ch�n những ứng dụng mà bạn mu�n kết n�i qua Tor</string>
-  <string name="pref_node_configuration">Cấu hình nút</string>
-  <string name="pref_node_configuration_summary">Những cài Ä?ặt nâng cao này có thá»? giảm sá»± ẩn danh của bạn</string>
-  <string name="pref_entrance_node">Nút vào (Entrace Nodes)</string>
-  <string name="pref_entrance_node_summary">Dấu theo dõi (Fingerprint), biá»?t hiá»?u, quá»?c gia và Ä?á»?a chá»? cho nút Ä?ầu tiên</string>
-  <string name="pref_entrance_node_dialog">Nhập thông tin nút vào</string>
-  <string name="pref_allow_background_starts_title">Cho phép khá»?i Ä?á»?ng ngầm</string>
-  <string name="pref_allow_background_starts_summary">Cho phép ứng dụng bất kỳ yêu cầu Orbot khá»?i Ä?á»?ng Tor và các dá»?ch vụ liên quan</string>
-  <string name="button_proxy_all">Proxy tất cả</string>
-  <string name="button_proxy_none">Không dùng proxy</string>
-  <string name="button_invert_selection">Ä?ảo ngược lá»±a chá»?n</string>
-  <string name="pref_proxy_title">Proxy mạng ngõ ra (Outbound Network) (Tùy ch�n)</string>
-  <string name="pref_proxy_type_title">Loại proxy ngõ ra</string>
-  <string name="pref_proxy_type_summary">Giao thức dùng cho proxy: HTTP, HTTPS, SOCKS4, SOCKS5</string>
-  <string name="pref_proxy_type_dialog">Nhập loại proxy</string>
-  <string name="pref_proxy_host_title">Host proxy ngõ ra</string>
-  <string name="pref_proxy_host_summary">Hostname của proxy</string>
-  <string name="pref_proxy_host_dialog">Nhập host của proxy</string>
-  <string name="pref_proxy_port_title">C�ng Proxy ngõ ra</string>
-  <string name="pref_proxy_port_summary">C�ng của proxy</string>
-  <string name="pref_proxy_port_dialog">Nhập c�ng Proxy</string>
-  <string name="pref_proxy_username_title">Tên tài khoản proxy ngõ ra</string>
-  <string name="pref_proxy_username_summary">Tên tài khoản proxy (tùy ch�n)</string>
-  <string name="pref_proxy_username_dialog">Nhập tên tài khoản proxy</string>
-  <string name="pref_proxy_password_title">Mật khẩu Proxy ngõ ra</string>
-  <string name="pref_proxy_password_summary">Mật khẩu proxy (tùy ch�n)</string>
-  <string name="pref_proxy_password_dialog">Nhập mật khẩu proxy</string>
-  <string name="status">Tình trạng</string>
-  <string name="setting_up_full_transparent_proxying_">Ä?ang cấu hình proxy trong suá»?t cho tất cả...</string>
-  <string name="setting_up_app_based_transparent_proxying_">Ä?ang cấu hình proxy trong suá»?t cho các ứng dụng Ä?ược chá»?n...</string>
-  <string name="transparent_proxying_enabled">Proxy trong suá»?t Ä?ƯỢC KÃ?CH HOẠT</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy Ä?ã Ä?ược kích hoạt Ä?á»? dùng cho tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">CHÃ? Ã?: có lá»?i khi khá»?i Ä?á»?ng proxy trong suá»?t!</string>
-  <string name="transproxy_rules_cleared">Quy tắc TransProxy Ä?ã Ä?ược xóa</string>
-  <string name="couldn_t_start_tor_process_">Không thá»? khá»?i Ä?á»?ng tiến trình Tor:</string>
-  <string name="privoxy_is_running_on_port_">Polipo Ä?ang chạy á»? cá»?ng:</string>
-  <string name="setting_up_port_based_transparent_proxying_">Ä?ang cài Ä?ặt proxy trong suá»?t theo cá»?ng</string>
-  <string name="bridge_error">Lá»?i bridge</string>
-  <string name="bridge_requires_ip">Ä?á»? dùng chức nÄ?ng bridge, bạn phải nhập ít nhất má»?t Ä?á»?a chá»? IP dùng cho bridge.</string>
-  <string name="send_email_for_bridges">Gá»­i má»?t email Ä?ến bridges@xxxxxxxxxxxxxx vá»?i dòng chữ \"get bridges\" trong thÆ° từ má»?t tài khoản gmail.</string>
-  <string name="error">Lá»?i</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Thiết lập ReachableAddresses Ä?ã gây ra má»?t vấn Ä?á»?! </string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">Không thá»? khá»?i Ä?á»?ng tiến trình Tor:</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Thiết lập ReachableAddresses Ä?ã gây ra má»?t vấn Ä?á»?! </string>
   <string name="your_relay_settings_caused_an_exception_">Thiết lập relay của bạn Ä?ã gây ra má»?t vấn Ä?á»?!</string>
-  <string name="exit_nodes">Nút cu�i (Exit Nodes)</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Dấu theo dõi, biá»?t hiá»?u, quá»?c gia và Ä?á»?a chá»? cho nút cuá»?i cùng</string>
-  <string name="enter_exit_nodes">Nhập thông tin nút cu�i</string>
-  <string name="exclude_nodes">Loại trừ nút</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Dấu theo dõi, biá»?t hiá»?u, quá»?c gia và Ä?á»?a chá»? Ä?á»? loại trừ</string>
-  <string name="enter_exclude_nodes">Nhập vào những nút Ä?á»? loại trừ</string>
-  <string name="strict_nodes">Nút chá»? Ä?á»?nh</string>
-  <string name="use_only_these_specified_nodes">*Chá»?* dùng những nút Ä?ược liá»?t kê</string>
-  <string name="bridges">Bridge</string>
-  <string name="use_bridges">Dùng bridge</string>
-  <string name="bridges_obfuscated">Các bridge Ä?ược che giấu</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Kích hoạt các nút vào khác Ä?á»? vào mạng Tor</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Kích hoạt nếu nhÆ° các bridge Ä?ã Ä?ược cấu hình là bridge Ä?ã Ä?ược che giấu</string>
-  <string name="ip_address_and_port_of_bridges">Ä?á»?a chá»? IP và cá»?ng của bridge</string>
-  <string name="enter_bridge_addresses">Nhập Ä?á»?a chá»? bridge</string>
-  <string name="relays">Relay</string>
-  <string name="relaying">Chức nÄ?ng relay</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Cho phép thiết b� bạn tr� thành m�t nút relay (không phải nút cu�i)</string>
-  <string name="relay_port">Cá»?ng cho relay</string>
-  <string name="listening_port_for_your_tor_relay">C�ng tiếp nhận cho vi�c relay</string>
-  <string name="enter_or_port">Nhập c�ng OR</string>
-  <string name="relay_nickname">Bi�t hi�u nút relay</string>
-  <string name="the_nickname_for_your_tor_relay">Bi�t hi�u cho nút Tor-relay của bạn</string>
-  <string name="enter_a_custom_relay_nickname">Nhập bi�t hi�u tuỳ ý</string>
-  <string name="reachable_addresses">Ä?á»?a chá»? truy cập Ä?ược (Reachable Addresses)</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Chạy nhÆ° má»?t máy con (client) Ä?ằng sau tÆ°á»?ng lá»­a vá»?i các thiết lập thu hẹp</string>
-  <string name="reachable_ports">Cá»?ng truy cập Ä?ược</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Cá»?ng truy cập Ä?ược Ä?ằng sau tÆ°á»?ng lá»­a</string>
-  <string name="enter_ports">Nhập s� c�ng</string>
-  <string name="enable_hidden_services">Host web ẩn</string>
-  <string name="run_servers_accessible_via_the_tor_network">Cho phép máy chủ Ä?ược thiết lập trong thiết bá»? của bạn có thá»? truy cập Ä?ược qua mạng Tor.</string>
-  <string name="enter_localhost_ports_for_hidden_services">Nhập c�ng localhost cho web ẩn</string>
-  <string name="hidden_service_ports">C�ng web ẩn</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Ä?á»?a chá»? hợp lá»? cho web ẩn của bạn (Ä?ược tá»± Ä?á»?ng tạo ra)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Kích hoạt nhật ký gỡ lá»?i á»? Ä?ầu ra (phải dùng adb hoặc aLogCat Ä?á»? xem)</string>
-  <string name="project_home">Các trang chủ dự án:</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Giấy phép của Tor</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">Phần m�m bên thứ 3:</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">Má»?t ứng dụng muá»?n má»? cá»?ng ẩn %S Ä?ến mạng Tor. Ä?ây là Ä?iá»?u an toàn nếu nhÆ° bạn tin tÆ°á»?ng vào ứng dụng này.</string>
-  <string name="found_existing_tor_process">tìm ra tiến trình hi�n hành của Tor...</string>
+    <string name="found_existing_tor_process">tìm ra tiến trình hi�n hành của Tor...</string>
   <string name="something_bad_happened">Có gì Ä?ó không á»?n. Xin xem lại nhật ký</string>
-  <string name="hidden_service_on">web ẩn trong:</string>
-  <string name="unable_to_read_hidden_service_name">không thá»? Ä?á»?c Ä?ược tên dá»?ch vụ ẩn</string>
+    <string name="unable_to_read_hidden_service_name">không thá»? Ä?á»?c Ä?ược tên dá»?ch vụ ẩn</string>
   <string name="unable_to_start_tor">Không thá»? khá»?i Ä?á»?ng Tor Ä?ược: </string>
-  <string name="unable_to_reset_tor">Khá»?i Ä?á»?ng lại thiết bá»? của bạn, không thá»? thiết Ä?ặt lại Tor!</string>
-  <string name="pref_use_sys_iptables_title">Dùng Iptables mặc Ä?á»?nh</string>
-  <string name="pref_use_sys_iptables_summary">dùng tập nhá»? phân iptables của há»? thá»?ng thay vì dùng tập nhá»? phân Ä?ược  Ä?i kèm vá»?i Orbot</string>
-  <string name="error_installing_binares">Tập nhá»? phân của Tor không thá»? cài hoặc nâng cấp Ä?ược.</string>
-  <string name="pref_use_persistent_notifications">Luôn giữ thông báo trong thanh trạng thái khi Orbot Ä?ược kết ná»?i</string>
-  <string name="pref_use_persistent_notifications_title">Thông báo thư�ng trực</string>
-  <string name="pref_use_expanded_notifications">Hi�n th� thông báo m� r�ng v�i IP và qu�c gia của nút cu�i (Tor exit-node)</string>
-  <string name="pref_use_expanded_notifications_title">Thông báo m� r�ng</string>
-  <string name="notification_using_bridges">Bridge Ä?ã Ä?ược kích hoạt!</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">Ngôn ngữ</string>
-  <string name="set_locale_summary">Ch�n ngôn ngữ cho Orbot</string>
-  <string name="wizard_locale_title">Ch�n ngôn ngữ</string>
-  <string name="wizard_locale_msg">Giữ cài Ä?ặt mặc Ä?á»?nh hoặc chuyá»?n qua ngôn ngữ khác</string>
-  <string name="powered_by">Ä?ược há»? trợ bá»?i Tor</string>
-  <string name="btn_save_settings">Lưu thiết lập</string>
-  <string name="no_internet_connection_tor">Không có kết ná»?i Internet; Tor Ä?ang á»? chế Ä?á»? chá»?...</string>
-  <string name="bandwidth_">BÄ?ng thông:</string>
-  <string name="down">tải xu�ng</string>
-  <string name="up">tải lên</string>
-  <string name="pref_disable_network_title">Tá»± Ä?á»?ng \"ngủ\" khi không có mạng</string>
-  <string name="pref_disable_network_summary">Chuyá»?n Tor sang chế Ä?á»? ngủ nếu không có Internet</string>
-  <string name="newnym">Bạn Ä?ã chuyá»?n sang má»?t mạch Tor má»?i!</string>
-  <string name="menu_verify_browser">Trình duy�t</string>
-  <string name="menu_use_chatsecure">Dùng ChatSecure</string>
-  <string name="permission_manage_tor_label">Quản lý Tor</string>
-  <string name="permission_manage_tor_description">Cho phép ứng dụng này Ä?iá»?u khiá»?n dá»?ch vụ Tor</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Có vẻ như bạn chưa cài Orfox. Bạn có cần giúp không, hay ch� cần m� trình duy�t thư�ng thôi?</string>
-  <string name="install_apps_">Cài Ä?ặt ứng dụng?</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">Không có mạng. Ä?ang chuyá»?n Tor sang chế Ä?á»? ngủ...</string>
+    <string name="no_internet_connection_tor">Không có kết ná»?i Internet; Tor Ä?ang á»? chế Ä?á»? chá»?...</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="wizard_tips_martus">Mobile Martus - Ứng dụng cung cấp các tài li�u v� nhân quy�n của Benetech</string>
-  <string name="your_tor_public_ips_">Các IP Tor công c�ng của bạn là:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">Vui lòng vô hiá»?u hóa ứng dụng này trong Android-&gt;Settings-&gt;Apps nếu bạn Ä?ang gặp vấn Ä?á»? vá»?i Orbot:</string>
-  <string name="app_conflict">Xung Ä?á»?t ứng dụng</string>
-  <string name="pref_transproxy_refresh_title">Tá»± Ä?á»?ng làm má»?i proxy trong suá»?t</string>
-  <string name="pref_transproxy_refresh_summary">Ã?p dụng lại các quy tắc proxy trong suá»?t khi trạng thái mạng thay Ä?á»?i</string>
-  <string name="pref_transproxy_flush_title">�P BU�C X�A các quy tắc proxy trong su�t</string>
-  <string name="pref_transproxy_flush_summary">Chạm vào Ä?ây Ä?á»? xóa sạch các quy tắc proxy trong suá»?t NGAY BÃ?Y GIá»?</string>
-  <string name="transparent_proxy_rules_flushed_">Quy tắc proxy trong suá»?t Ä?ã Ä?ược xóa!</string>
-  <string name="you_do_not_have_root_access_enabled">Bạn không có quy�n truy cập ROOT</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">Bạn có thá»? cần kết ná»?i lại Orbot Ä?á»? các thay Ä?á»?i Ä?ược áp dụng</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">Bridge Ä?ược cập nhật</string>
-  <string name="restart_orbot_to_use_this_bridge_">Vui lòng khá»?i Ä?á»?ng lại Orbot Ä?á»? áp dụng thay Ä?á»?i</string>
-  <string name="menu_qr">Mã QR</string>
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">Nếu nhÆ° mạng di Ä?á»?ng của bạn chặn Tor, bạn có thá»? dùng bridge (cầu ná»?i) Ä?á»? truy cập mạng Tor. CHá»?N má»?t trong những bridge á»? trên Ä?á»? kích hoạt bridge.</string>
-  <string name="bridge_mode">Chế Ä?á»? bridge</string>
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  <string name="activate">Kích hoạt</string>
-  <string name="apps_mode">Chế Ä?á»? ứng dụng VPN</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">Bạn có thá»? làm cho tất cả ứng dụng của bạn kết ná»?i qua mạng Tor bằng cách sá»­ dụng tính nÄ?ng VPN (Mạng riêng ảo) của Android.\n\n*CHÃ? Ã?* Ä?ây là má»?t tính nÄ?ng má»?i, Ä?ang thá»­ nghiá»?m và nó có thá»? không tá»± Ä?á»?ng chạy, hoặc có thá»? dừng lại Ä?á»?t ngá»?t. Nó KHÃ?NG nên Ä?ược dùng cho ẩn danh, và chá»? nên dùng Ä?á»? vượt qua các tÆ°á»?ng lá»­a và bá»? lá»?c.</string>
-  <string name="send_email">Gá»­i email</string>
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Bạn có thá»? lấy má»?t Ä?á»?a chá»? bridge qua email, web hoặc quét mã QR. Chá»?n \"Email\" hoặc \"Web\" bên dÆ°á»?i Ä?á»? yêu cầu má»?t Ä?á»?a chá»? bridge.\n\nMá»?t khi Ä?ã có Ä?á»?a chá»?, hãy sao chép nó vào thiết Ä?ặt \"Bridge\" trong cài Ä?ặt Orbot rá»?i khá»?i Ä?á»?ng lại phần má»?m.</string>
-  <string name="install_orweb">Cài Ä?ặt Orfox</string>
-  <string name="standard_browser">Trình duy�t thư�ng</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">LƯU Ã?: Chá»? có bridge Tor chuẩn má»?i hoạt Ä?á»?ng trên các thiết bá»? Intel x86/Atom</string>
-  <string name="vpn_default_world">Toàn cầu</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-zh-rCN/strings.xml b/orbotservice/src/main/res/values-zh-rCN/strings.xml
index 49459292..f831c4c7 100644
--- a/orbotservice/src/main/res/values-zh-rCN/strings.xml
+++ b/orbotservice/src/main/res/values-zh-rCN/strings.xml
@@ -2,297 +2,30 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot æ?¯ä¸?款å??è´¹ç??代ç??åº?ç?¨ï¼?è?½å¤?让å?¶ä»?åº?ç?¨æ?´å®?å?¨å?°ä½¿ç?¨äº?è??ç½?ã??é??è¿?å?¨ä½?äº?ä¸?ç??å??å?°ç??ä¸?ç³»å??计ç®?æ?ºä¹?é?´è¿?è¡?跳转ï¼?Orbot å?¯å?©ç?¨ Tor 对ç½?ç»?é??ä¿¡è¿?è¡?å? å¯?并é??è??ã??Tor æ?¯ä¸?款å??è´¹ç??软件ï¼?并ä¸?æ?¯ä¸?个å¼?æ?¾ç??ç½?ç»?ã??å®?å?¯ä»¥ä¿?æ?¤ç?¨æ?·å??å??æµ?é??å??æ??ç??å?±å®³ï¼?è¿?ç§?ç½?ç»?ç??æ?§å?¯å¯¹ä¸ªäººè?ªç?±ä¸?é??ç§?ã??å??ä¸?æ?ºå¯?æ´»å?¨å??å?³ç³»ä»¥å??å?½å®¶å®?å?¨é? æ??å¨?è??ã??</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">å?¯å?¨å??å??æ­¢ Tor</string>
-  <string name="tor_proxy_service_process">Tor 代ç??æ??å?¡</string>
-  <string name="status_starting_up">Orbot 正���...</string>
+    <string name="status_starting_up">Orbot 正���...</string>
   <string name="status_activated">已��� Tor ��</string>
   <string name="status_disabled">Orbot å·²å??ç?¨</string>
   <string name="status_shutting_down">Toræ??å?¡ æ­£å?¨å?³é?­</string>
   <string name="tor_process_starting">正��� Tor 客�端...</string>
   <string name="tor_process_complete">å®?æ??ã??</string>
-  <string name="tor_process_waiting">ç­?å¾?ã??</string>
-  <string name="not_anonymous_yet">è­¦å??ï¼?ä½ ç??ç½?ç»?é??讯并é??å?¿å??ï¼?请设置åº?ç?¨ç¨?åº?ï¼?使ç?¨ HTTP 代ç?? 127.0.0.1:8118 æ??è?? SOCKS4Aã??SOCKS5 代ç?? 127.0.0.1:9050</string>
-  <string name="menu_home">�页</string>
-  <string name="menu_browse">��</string>
-  <string name="menu_settings">设置</string>
-  <string name="menu_log">��</string>
-  <string name="menu_info">帮�</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">��</string>
-  <string name="menu_stop">å??æ­¢</string>
-  <string name="menu_about">��</string>
-  <string name="menu_promo_apps">è?·å??åº?ç?¨â?¦</string>
-  <string name="main_layout_download">�载</string>
-  <string name="main_layout_upload">�传</string>
-  <string name="button_help">帮�</string>
-  <string name="button_close">��</string>
-  <string name="button_about">��</string>
-  <string name="button_clear_log">����</string>
-  <string name="menu_verify">��</string>
-  <string name="menu_exit">é??å?º</string>
-  <string name="menu_scan">æ?«æ??ç½?æ¡¥QRç ?</string>
-  <string name="menu_share_bridge">å??享ç½?æ¡¥QRç ?</string>
-  <string name="press_to_start">- é?¿æ??å?¯å?¨ -</string>
-  <string name="pref_trans_proxy_group">é??æ??代ç??ï¼?é??è¦? Root æ??é??ï¼?</string>
-  <string name="pref_trans_proxy_title">é??æ??代ç??</string>
-  <string name="pref_trans_proxy_summary">������使� Tor</string>
-  <string name="pref_transparent_all_title">æ??æ??åº?ç?¨ç¨?åº?使ç?¨ Tor</string>
-  <string name="pref_transparent_all_summary">æ??æ??åº?ç?¨ç¨?åº?é?½é??è¿? Tor è¿?æ?¥ç½?ç»?</string>
-  <string name="pref_transparent_port_fallback_title">å¤?ç?¨ä»£ç??端å?£</string>
-  <string name="pref_transparent_port_fallback_summary">è­¦å??ï¼?é?¿å??使ç?¨å¸¸ç?¨ç«¯å?£ï¼?80ã??443 ç­?ï¼?ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
-  <string name="pref_transparent_port_title">端å?£å??表</string>
-  <string name="pref_transparent_port_summary">代ç??端å?£å??表ã??ä»?å?¨â??åº?ç?¨ç¨?åº?â??æ??â??åº?ç?¨ç¨?åº?â??模å¼?æ? æ³?å·¥ä½?æ?¶ä½¿ç?¨ã??</string>
-  <string name="pref_transparent_port_dialog">è¾?å?¥ä»£ç??端å?£</string>
-  <string name="pref_has_root">请æ±? Root 访é?®æ??é??</string>
-  <string name="pref_has_root_summary">为é??æ??代ç??请æ±?è?·å?? Root 访é?®æ??é??</string>
-  <string name="status_install_success">Tor ç¨?åº?å®?è£?æ??å??ï¼?</string>
-  <string name="status_install_fail">Tor ç¨?åº?æ? æ³?å®?è£?ã??请æ?¥ç??æ?¥å¿?并å°?å?¶å??é??å?° tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">åº?ç?¨ç¨?åº?é??误</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">�� Orbot</string>
-  <string name="btn_next">��步</string>
-  <string name="btn_back">��步</string>
-  <string name="btn_finish">å®?æ??</string>
-  <string name="btn_okay">确�</string>
-  <string name="btn_cancel">å??æ¶?</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">�� Orbot 信�</string>
-  <string name="wizard_details_msg">Orbot æ?¯ä¸?个å??å?« Torã??LibEvent å?? Polipo ç??å¼?æº?åº?ç?¨ç¨?åº?ã??å®?æ??ä¾?äº?ä¸?个æ?¬å?° HTTP 代ç?? (8118) å??ä¸?个 SOCKS 代ç?? (9050) å??å¾? Tor ç½?ç»?ã??Orbot ä¹?æ??è?½å??å?¨ root è¿?ç??设å¤?ä¸?å°?æ??æ??äº?è??ç½?æµ?é??é??è¿? Tor å??é??ã??</string>
-  <string name="wizard_permissions_root">å·²è?·å??æ??é??</string>
-  <string name="wizard_permissions_stock">Orbot æ??é??</string>
-  <string name="wizard_premissions_msg_root">好æ??äº?ï¼?æ??们æ£?æµ?å?° Orbot å·²è?·å?? Root æ??é?? ã??æ??们ä¼?è°¨æ??å?°ä½¿ç?¨è¿?ä¸?æ??é??ã??</string>
-  <string name="wizard_permissions_msg_stock">è?½é??å¿?é¡»ï¼?ä½?æ?¯å?·æ?? Root 访é?®æ??é??ç??设å¤?å?¯ä»¥è®© Orbot å??å¾?æ?´å¼ºå¤§ã??请使ç?¨ä¸?é?¢ç??æ??é?®æ??äº? Orbot è¿?ä¸?强大ç??è?½å??ï¼?</string>
-  <string name="wizard_permissions_no_root">å¦?æ??没æ?? Root 访é?®æ??é??æ??ä¸?æ??ç?½æ­¤å¤?æ??说ç??å??容ï¼?å?ªé??ç¡®ä¿? Orbot æ?¯æ??æ??ç?¨ç??åº?ç?¨å?³å?¯ã??</string>
-  <string name="wizard_permissions_consent">æ??æ??ç?½å¹¶æ?¿æ??å?¨æ?ªè?·å?? Root æ??é??ç??æ??å?µä¸?继续æ??ä½?</string>
-  <string name="wizard_permission_enable_root">为 Orbot è?·å?? Root æ??é??</string>
-  <string name="wizard_configure">é??ç½® Tor ç½?ç»?</string>
-  <string name="wizard_configure_msg">Orbot æ??ä¾?äº?é??项ï¼?å?¯æ??å®?æ??æ??åº?ç?¨ç¨?åº?使ç?¨ Tor ç½?ç»?æ??æ??å®?æ??äº?åº?ç?¨é??è¿? Tor ç½?ç»?è¿?è¡?é??讯ã??</string>
-  <string name="wizard_configure_all">æ??æ??åº?ç?¨ç¨?åº?é?½ä½¿ç?¨ Tor</string>
-  <string name="wizard_configure_select_apps">é??æ?©ä½¿ç?¨ Tor ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_tricks">Orbot æ?¯æ??ç??åº?ç?¨</string>
-  <string name="wizard_tips_msg">以ä¸?åº?ç?¨å?¯ä¸? Orbot ä¸?起使ç?¨ã??ç?¹å?»ä¸?é?¢ç??æ??é?®å®?è£?ï¼?ä¹?å?¯ä»¥é??è¿? Google Play å??åº?ã??GuardianProject.info ç½?ç«?æ?? F-Droid.org æ?¥æ?¾ã??</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Android ä¸?ç??å®?å?¨å?³æ?¶é??讯客æ?·ç«¯</string>
-  <string name="wizard_tips_proxy">代ç??设置 - 学习å¦?ä½?é??ç½®åº?ç?¨ç¨?åº?使ç?¨ Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo æ??ç´¢å¼?æ??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_twitter">å°? Twitter 代ç??ç??主æ?ºè®¾ç½® localhost 并å°?端å?£è®¾ç½®ä¸º 8118</string>
-  <string name="wizard_tips_story_maker">æ??äº?å?¶é? è??--乱说äº?ä»?ä¹?ï¼?并ç?¨Torä¿?è¯?æ?¨ç??å®?å?¨ï¼?</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">代ç??设置</string>
-  <string name="wizard_proxy_help_msg">å¦?æ?? Android åº?ç?¨ç¨?åº?æ?¯æ?? HTTP æ?? SOCKS 代ç??ï¼?é?£ä¹?æ?¨å?¯å¯¹å®?è¿?è¡?é??ç½®æ?¥è¿?æ?¥å?° Orbot 并使ç?¨ Tor ç½?ç»?ã?? 主æ?ºè®¾ç½®ä¸º 127.0.0.1 æ?? localhostã??对äº? HTTPï¼?端å?£è®¾ç½®ä¸º 8118ï¼?对äº? SOCKSï¼?端å?£è®¾ç½®ä¸º 9050ã??å¦?æ??å?¯ä»¥ï¼?请尽é??使ç?¨ SOCKS4A æ?? SOCKS5 代ç??ã?? æ?´å¤?æ??å?³ Android 代ç??ä¿¡æ?¯ï¼?请å??é?? http://tinyurl.com/proxyandroid 中ç??常è§?é?®é¢?</string>
-  <string name="wizard_final">Orbot 已就绪�</string>
-  <string name="wizard_final_msg">å?¨ç??æ?°ä»¥ä¸?计ç??人正å?¨ä½¿ç?¨Torï¼?ä»?们中æ??åª?ä½?è®°è??ï¼?å??客家ï¼?人æ??主ä¹?è??ï¼?æ?¹é?©å®£æ?¬è??ï¼?å??å®?ï¼?å?¬å?¸è??å·¥ï¼?以å??å??æ?¨ä¸?æ ·ç??æ?®é??å¸?æ°?ï¼?ç?°å?¨ï¼?æ?¨ä¹?å??å¤?好äº?ï¼?</string>
-  <string name="wizard_exit_at_first_screen_toast">请å?¨æ?¨å¼?å§?使ç?¨å®?å??é??ç½® Orbotï¼?</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">æ?¨å·²ç»?æ??å??è¿?æ?¥å?°Torç½?ç»?ï¼?ä½?ä¸?代表æ?¨ç??设å¤?æ?¯å®?å?¨ç??ã??æ?¨å?¯ä»¥ä½¿ç?¨â??æµ?è§?å?¨â??æ??é?®æµ?è¯?æ?¨ç??è¿?æ?¥ã??
-
-访é?®https://guardianproject.info/apps/orbot æ??å??é??é?®ä»¶è?³help@xxxxxxxxxxxxxxxxxxxx æ?¥äº?解æ?´å¤?ã??</string>
-  <string name="tor_check">æµ?è§?å?¨å°?å?¯å?¨å¹¶è®¿é?®ï¼?https://check.torproject.orgï¼?以便æ£?æ?¥; Orbot é??ç½®æ?¯å?¦æ­£ç¡®ä»¥å??æ?¯å?¦å?¯è¿?æ?¥ Tor ç½?ç»?ã??</string>
-  <string name="pref_hs_group">é??è??æ??å?¡ä¸»æ?º</string>
-  <string name="pref_general_group">常�</string>
-  <string name="pref_start_boot_title">����� Orbot</string>
-  <string name="pref_start_boot_summary">Android 设�������� Orbot 并�� Tor ��</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot使Androidæ?¯æ??Torç½?ç»?!
-Tor帮å?©ä½ é?¿å¼?é?£äº?å¨?è??å?°ä½ ç??é??ç§?ï¼?é??è¦?ä¿¡æ?¯å??社交å?³ç³»ç??å??容è¿?滤ï¼?æµ?é??å??æ??以å??ç½?ç»?审æ?¥ã??
-è¿?个å??导å°?帮å?©ä½ é??ç½®Orbotå?¨ä½ è®¾å¤?å??以便访é?®Torã??</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">è­¦å??</string>
-  <string name="wizard_warning_msg">ç®?å??ç??å®?è£?å®?Orbot并ä¸?è?½è?ªå?¨ç??å?¿å??ä½ ç??移å?¨æµ?é??ã??
-ä½ å¿?é¡»é??å½?ç??é??ç½®Orbotï¼?以å??ä½ ç??设å¤?å??åº?ç?¨ä»¥æ??å??å?¿å??使ç?¨Torã??</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">æ??é??</string>
-  <string name="wizard_permissions_root_msg1">å?¯é??æ?©æ??äº? Orbot â??Superuserâ??访é?®æ??é??ï¼?以便å?¯ç?¨é«?级å??è?½ï¼?ä¾?å¦?é??æ??代ç??ã??</string>
-  <string name="wizard_permissions_root_msg2">å¦?æ??ä¸?æ?¿æ??äº? Orbot 该æ??é??ï¼?请确ä¿?åº?ç?¨ç¨?åº?å?¯ä½¿ç?¨ Orbotã??</string>
-  <string name="wizard_permissions_no_root_msg">æ?¨ç??设å¤?ä¼¼ä¹?å°?æ?ª rootï¼?æ??è??æ?ªæ??ä¾? root æ??â??è¶?级ç?¨æ?·â??ç??访é?®æ??é??ã??\n\n请æ?¹ä¸ºå°?è¯?主å±?å¹?ç??â??åº?ç?¨â??模å¼?ã??</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">使ç?¨ Orbot ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_gibberbot">ChatSecureï¼?å?·æ?? OTF å? å¯?å?±ç??å®?å?¨é??讯åº?ç?¨</string>
-  <string name="wizard_tips_orweb">Orfoxï¼?é??ç§?å¢?强æµ?è§?å?¨é??ç?¨ Tor å·¥ä½?</string>
-  <string name="wizard_tips_play">å?¨ Google Play å??åº?æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_fdroid">å?¨ F-Droid æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
-  <string name="wizard_tips_fdroid_org">å?¨ https://f-droid.org æ?¥æ?¾æ??æ?? Guardian Project ç??åº?ç?¨ç¨?åº?</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">é??æ??代ç??</string>
-  <string name="wizard_transproxy_msg">å?¯ä½¿åº?ç?¨ç¨?åº?æ? é??é??ç½®å?³å?¯è?ªå?¨é??è¿? Tor è¿?æ?¥ç½?ç»?ã??</string>
-  <string name="wizard_transproxy_hint">ï¼?å¦?æ??ä¸?æ??ç?½è¿?é??æ??说ç??é?®é¢?ï¼?请é??æ?©è¯¥é??项ï¼?</string>
-  <string name="wizard_transproxy_none">æ? </string>
-  <string name="pref_transparent_tethering_title">Tor ���享</string>
-  <string name="pref_transparent_tethering_summary">对 Wi-Fi å?? USB ç½?ç»?å?±äº«è®¾å¤?å?¯ç?¨é??æ??代ç??ï¼?é??é??æ?°å?¯å?¨ï¼?</string>
-  <string name="button_grant_superuser">请æ±? Superuser 访é?®æ??é??</string>
-  <string name="pref_select_apps">é??æ?©åº?ç?¨ç¨?åº?</string>
-  <string name="pref_select_apps_summary">é??æ?©é??è¿? Tor è¿?æ?¥ç½?ç»?ç??åº?ç?¨ç¨?åº?</string>
-  <string name="pref_node_configuration">è??ç?¹é??ç½®</string>
-  <string name="pref_node_configuration_summary">è¿?äº?é«?级设置å?¯é??ä½?ä½ ç??å?¿å??度</string>
-  <string name="pref_entrance_node">å?¥å?£è??ç?¹</string>
-  <string name="pref_entrance_node_summary">ç?¨äº?é¦?次跳转ç??å¯?é?¥æ??纹ã??æ?µç§°ã??å?½å®¶ä¸?å?°å??</string>
-  <string name="pref_entrance_node_dialog">è¾?å?¥å?¥å?£è??ç?¹</string>
-  <string name="pref_allow_background_starts_title">å??许å??å?°å?¯å?¨</string>
-  <string name="pref_allow_background_starts_summary">å??许任ä½?åº?ç?¨å??ç?¥ Orbot å?¯å?¨ Tor å??ç?¸å?³æ??å?¡</string>
-  <string name="button_proxy_all">å?¨é?¨ä»£ç??</string>
-  <string name="button_proxy_none">å?¨ä¸?代ç??</string>
-  <string name="button_invert_selection">å??é??</string>
-  <string name="pref_proxy_title">å?ºç«?ç½?ç»?代ç??ï¼?å?¯é??ï¼?</string>
-  <string name="pref_proxy_type_title">å?ºç«?代ç??ç±»å??</string>
-  <string name="pref_proxy_type_summary">代ç??æ??å?¡å?¨ä½¿ç?¨ç??å??è®®ï¼?HTTPã??HTTPSã??Socks4ã??Socks5</string>
-  <string name="pref_proxy_type_dialog">è¾?å?¥ä»£ç??ç±»å??</string>
-  <string name="pref_proxy_host_title">å?ºç«?代ç??主æ?º</string>
-  <string name="pref_proxy_host_summary">代ç??æ??å?¡å?¨ä¸»æ?ºå??</string>
-  <string name="pref_proxy_host_dialog">è¾?å?¥ä»£ç??主æ?º</string>
-  <string name="pref_proxy_port_title">å?ºç«?代ç??端å?£</string>
-  <string name="pref_proxy_port_summary">代ç??æ??å?¡å?¨ç«¯å?£</string>
-  <string name="pref_proxy_port_dialog">è¾?å?¥ä»£ç??端å?£</string>
-  <string name="pref_proxy_username_title">å?ºç«?代ç??ç?¨æ?·å??</string>
-  <string name="pref_proxy_username_summary">代ç??ç?¨æ?·å??ï¼?å?¯é??ï¼?</string>
-  <string name="pref_proxy_username_dialog">请è¾?å?¥ä»£ç??ç?¨æ?·å??</string>
-  <string name="pref_proxy_password_title">å?ºç«?代ç??å¯?ç ?</string>
-  <string name="pref_proxy_password_summary">代ç??å¯?ç ?ï¼?å?¯é??ï¼?</string>
-  <string name="pref_proxy_password_dialog">请è¾?å?¥ä»£ç??å¯?ç ?</string>
-  <string name="status">ç?¶æ??</string>
-  <string name="setting_up_full_transparent_proxying_">æ­£å?¨å¯¹æ??æ??åº?ç?¨ç¨?åº?è¿?è¡?é??æ??代ç??设置...</string>
-  <string name="setting_up_app_based_transparent_proxying_">æ­£å?¨å¯¹æ??é??åº?ç?¨ç¨?åº?è¿?è¡?é??æ??代ç??设置...</string>
-  <string name="transparent_proxying_enabled">é??æ??代ç??å·²å?¯ç?¨</string>
-  <string name="transproxy_enabled_for_tethering_">已为���享�活 TransProxy �</string>
-  <string name="warning_error_starting_transparent_proxying_">è­¦å??ï¼?å?¯å?¨é??æ??代ç??æ?¶å??ç??é??误ï¼?</string>
-  <string name="transproxy_rules_cleared">å·²æ¸?é?¤ TransProxy è§?å??</string>
-  <string name="couldn_t_start_tor_process_">���� Tor ���</string>
-  <string name="privoxy_is_running_on_port_">Polipo 正���端�:</string>
-  <string name="setting_up_port_based_transparent_proxying_">æ­£å?¨å¯¹å?ºäº?端å?£ç??é??æ??代ç??è¿?è¡?设置...</string>
-  <string name="bridge_error">ç½?æ¡¥é??误</string>
-  <string name="bridge_requires_ip">为äº?é??使ç?¨ç½?æ¡¥ï¼?å¿?é¡»è?³å°?è¾?å?¥ä¸?个ç½?æ¡¥ IP å?°å??ã??</string>
-  <string name="send_email_for_bridges">å¦?é??è?·å??ç½?æ¡¥å?°å??ï¼?请使ç?¨ gmail å??é??ç?µå­?é?®ä»¶è?³ bridges@xxxxxxxxxxxxxx 并å?¨æ­£æ??å??å¡«ä¸?â?? get bridgesâ??ã??</string>
-  <string name="error">é??误</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">å?¯è®¿é?®å?°å??设置导è?´å¼?常ï¼?</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
+    <string name="couldn_t_start_tor_process_">���� Tor ���</string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">å?¯è®¿é?®å?°å??设置导è?´å¼?常ï¼?</string>
   <string name="your_relay_settings_caused_an_exception_">中继设置导��常�</string>
-  <string name="exit_nodes">å?ºå?£è??ç?¹</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">æ??å??跳转ç??å¯?é?¥æ??纹ã??æ?µç§°ã??å?½å®¶ä¸?å?°å??</string>
-  <string name="enter_exit_nodes">è¾?å?¥å?ºå?£è??ç?¹</string>
-  <string name="exclude_nodes">æ??é?¤è??ç?¹</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">æ??é?¤ç??å¯?é?¥æ??纹ã??æ?µç§°ã??å?½å®¶ä¸?å?°å??</string>
-  <string name="enter_exclude_nodes">è¾?å?¥æ??é?¤è??ç?¹</string>
-  <string name="strict_nodes">é??å?¶è??ç?¹</string>
-  <string name="use_only_these_specified_nodes">ä»?使ç?¨è¿?äº?æ??å®?è??ç?¹</string>
-  <string name="bridges">ç½?æ¡¥</string>
-  <string name="use_bridges">使��桥</string>
-  <string name="bridges_obfuscated">æ··æ·?ç½?æ¡¥</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">使ç?¨å?¶ä»?å?¥å?£è??ç?¹è¿?æ?¥å?° Tor ç½?ç»?</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">å·²é??ç½®ç??ç½?桥为混æ·?ç½?æ¡¥æ?¶å?¯ç?¨</string>
-  <string name="ip_address_and_port_of_bridges">ç½?æ¡¥ç?? IP å?°å??å??端å?£</string>
-  <string name="enter_bridge_addresses">è¾?å?¥ç½?æ¡¥å?°å??</string>
-  <string name="relays">中继</string>
-  <string name="relaying">中继转å??</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">ä»?设置被设置为é??å?ºå?£ä¸­ç»§</string>
-  <string name="relay_port">中继端�</string>
-  <string name="listening_port_for_your_tor_relay">Tor 中继ç??侦å?¬ç«¯å?£</string>
-  <string name="enter_or_port">�� OR 端�</string>
-  <string name="relay_nickname">中继�称</string>
-  <string name="the_nickname_for_your_tor_relay">Tor 中继�称</string>
-  <string name="enter_a_custom_relay_nickname">�����中继�称</string>
-  <string name="reachable_addresses">å?¯è®¿é?®å?°å??</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">å?¨å?·æ??é??å?¶ç­?ç?¥é?²ç?«å¢?å??ï¼?ä½?为客æ?·ç«¯è¿?è¡?</string>
-  <string name="reachable_ports">�访�端�</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">é?²ç?«å¢?é??å®?ç??å?¯è®¿é?®ç«¯å?£</string>
-  <string name="enter_ports">��端�</string>
-  <string name="enable_hidden_services">é??è??æ??å?¡ä¸»æ?º</string>
-  <string name="run_servers_accessible_via_the_tor_network">å??许设å¤?ä¸?ç??æ??å?¡å?¨å?¯é??è¿? Tor ç½?ç»?访é?®</string>
-  <string name="enter_localhost_ports_for_hidden_services">è¾?å?¥é??è??æ??å?¡ç??æ?¬å?°ä¸»æ?ºç«¯å?£</string>
-  <string name="hidden_service_ports">é??è??æ??å?¡ç«¯å?£</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">é??è??æ??å?¡ç??å?°å??ï¼?è?ªå?¨ç??æ??ï¼?</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">å?¯ç?¨è°?è¯?æ?¥å¿?è¾?å?ºï¼?å¿?须使ç?¨ adb æ?? aLongCat æ?¥ç??ï¼?</string>
-  <string name="project_home">项�主页(s)�</string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">Tor 许��</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">第��软件�</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">åº?ç?¨ç¨?åº?è¯?å?¾æ??å¼?é??è??æ??å?¡ä¸»æ?ºç«¯å?£ %S è¿?æ?¥ Tor ç½?ç»?ã??对äº?å?¯ä¿¡åº?ç?¨è¿?æ?¯å®?å?¨ç??ã??</string>
-  <string name="found_existing_tor_process">å??ç?°å½?å??å·²å­?å?¨ Tor è¿?ç¨?...</string>
+    <string name="found_existing_tor_process">å??ç?°å½?å??å·²å­?å?¨ Tor è¿?ç¨?...</string>
   <string name="something_bad_happened">å??ç??é??误ï¼?请æ£?æ?¥æ?¥å¿?</string>
-  <string name="hidden_service_on">é??è??æ??å?¡ä½?äº?ï¼?</string>
-  <string name="unable_to_read_hidden_service_name">æ? æ³?读å??é??è??æ??å?¡å??称</string>
+    <string name="unable_to_read_hidden_service_name">æ? æ³?读å??é??è??æ??å?¡å??称</string>
   <string name="unable_to_start_tor">���� Tor�</string>
-  <string name="unable_to_reset_tor">é??æ?°å?¯å?¨æ?¨ç??设å¤?ï¼?æ? æ³?é??ç½® Torï¼?</string>
-  <string name="pref_use_sys_iptables_title">使��认 iptables </string>
-  <string name="pref_use_sys_iptables_summary">使ç?¨å??ç½®ç?? iptables ç¨?åº?æ?¿ä»£ Orbot ç»?å®?ç?? iptables </string>
-  <string name="error_installing_binares">æ? æ³?å®?è£?æ??æ?´æ?° Tor ç¨?åº?ã??</string>
-  <string name="pref_use_persistent_notifications">Orbot è¿?æ?¥å??å§?ç»?å?¨é??ç?¥æ ?æ?¾ç¤ºå?¾æ ?</string>
-  <string name="pref_use_persistent_notifications_title">å§?ç»?æ?¾ç¤ºé??ç?¥</string>
-  <string name="pref_use_expanded_notifications">æ?¾ç¤ºæ?©å±?ç??é??ç?¥ï¼?æ??å?³ Tor å?ºå?£ç??å?½å®¶å?? IP</string>
-  <string name="pref_use_expanded_notifications_title">æ?©å±?ç??é??ç?¥</string>
-  <string name="notification_using_bridges">已���桥�</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">语�</string>
-  <string name="set_locale_summary">é??æ?© Orbot ç??å?ºå??设置ä¸?语è¨?</string>
-  <string name="wizard_locale_title">é??æ?©è¯­è¨?</string>
-  <string name="wizard_locale_msg">ä¿?æ??é»?认æ??å??æ?¢ä¸ºå½?å??æ??ç?¨è¯­è¨?</string>
-  <string name="powered_by">ç?± Tor æ??ä¾?</string>
-  <string name="btn_save_settings">��设置</string>
-  <string name="no_internet_connection_tor">没æ??äº?è??ç½?è¿?æ?¥ï¼?Tor å¤?äº?å¾?æ?ºç?¶æ??â?¦</string>
-  <string name="bandwidth_">宽带é??度ï¼?</string>
-  <string name="down">��</string>
-  <string name="up">��</string>
-  <string name="pref_disable_network_title">�������</string>
-  <string name="pref_disable_network_summary">没æ??ç½?ç»?è¿?æ?¥æ?¶ï¼?æ??æ?¶å??ç?¨ Tor</string>
-  <string name="newnym">å·²å??æ?¢ä¸ºæ?°ç?? Tor æ ?è¯?ï¼?</string>
-  <string name="menu_verify_browser">���</string>
-  <string name="menu_use_chatsecure">使� ChatSecure</string>
-  <string name="permission_manage_tor_label">管ç?? Tor</string>
-  <string name="permission_manage_tor_description">å?¯ç?¨è¯¥åº?ç?¨å?¯å¯¹ Tor æ??å?¡è¿?è¡?æ?§å?¶</string>
-  <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">ä¼¼ä¹?æ?¨è¿?没æ??å®?è£? Orfoxã??æ?¯å?¦é??è¦?帮å?©ï¼?æ??è??æ??们åº?该æ??å¼?æµ?è§?å?¨ï¼?</string>
-  <string name="install_apps_">�����</string>
-  <string name="no_network_connectivity_putting_tor_to_sleep_">没æ??ç½?ç»?è¿?æ?¥ï¼?让 Tor è¿?å?¥ç?¡ç? â?¦</string>
+    <string name="no_internet_connection_tor">没æ??äº?è??ç½?è¿?æ?¥ï¼?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="wizard_tips_martus">Mobile Martus - ç¾?å?½äººæ??æ??件 App</string>
-  <string name="your_tor_public_ips_">æ?¨ç?? Tor å?¬ç½? IP:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">å¦?æ??æ?¨ä½¿ç?¨ Orbot é??å?°é?®é¢?ï¼?请å?¨ Android-&gt;设置-&gt;åº?ç?¨ 中ç¦?ç?¨æ?¬åº?ç?¨ï¼?</string>
-  <string name="app_conflict">����</string>
-  <string name="pref_transproxy_refresh_title">é??æ??代ç??è?ªå?¨å?·æ?°</string>
-  <string name="pref_transproxy_refresh_summary">å?¨ç½?ç»?ç?¶æ??æ?¹å??æ?¶é??æ?°åº?ç?¨é??æ??代ç??è§?å??</string>
-  <string name="pref_transproxy_flush_title">é??æ??代ç??强å?¶ç§»é?¤</string>
-  <string name="pref_transproxy_flush_summary">ç?¹æ??è¿?é??ç«?å?³å?·æ?°æ??æ??é??æ??代ç??ç??ç½?ç»?è§?å??</string>
-  <string name="transparent_proxy_rules_flushed_">é??æ??代ç??è§?å??å·²å?·æ?°ï¼?</string>
-  <string name="you_do_not_have_root_access_enabled">æ?¨è¿?没æ?? ROOT 访é?®æ??é??</string>
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">æ?¨å?¯è?½é??è¦?å??止并é??æ?°å?¯å?¨ Orbot æ??è?½ä½¿è®¾ç½®æ?´æ?¹ç??æ??ã??</string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="bridges_updated">�桥已��</string>
-  <string name="restart_orbot_to_use_this_bridge_">请é??å?¯ Orbot 以使å??æ?´ç??æ??</string>
-  <string name="menu_qr">QRç ?</string>
-  <string name="bridge_mode">�桥模�</string>
-  <string name="get_bridges_email">���件</string>
-  <string name="get_bridges_web">�页</string>
-  <string name="activate">æ¿?æ´»</string>
-  <string name="apps_mode">�� VPN 模�</string>
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">é??è¿?å¼?å?¯VPNå??è?½ï¼?æ?¨å?¯ä»¥è®©æ?¨è®¾å¤?ä¸?å?¨é?¨ç??åº?ç?¨ç¨?åº?使ç?¨Torç½?ç»?ã??
-è­¦å??ï¼?ï¼?ï¼?
-è¿?æ?¯ä¸?项å®?éª?æ?§ç??å??è?½ã??å?¨æ??äº?æ??å?µä¸?ï¼?å®?å?¯è?½å??æ­¢æ??ä¸?è?½è?ªå?¨å?¯å?¨ã??å®?ä¸?åº?ç?¨äº?ä¿?æ??å?¿å??ï¼?ä»?ç?¨äº?ç©¿é??é?²ç?«å¢?å??è¿?æ?¥è¿?滤系ç»?ã??</string>
-  <string name="send_email">å??é??ç?µå­?é?®ä»¶</string>
-  <string name="install_orweb">�� Orfox</string>
-  <string name="standard_browser">æ ?å??ç??æµ?è§?å?¨</string>
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">注æ??ï¼?å?ªæ??æ ?å??ç?? Tor ç½?æ¡¥å?¯ä»¥å?¨ Intel X86/ATOM 设å¤?ä¸?å·¥ä½?</string>
-  <string name="vpn_default_world">ä¸?ç??</string>
 </resources>
diff --git a/orbotservice/src/main/res/values-zh-rTW/strings.xml b/orbotservice/src/main/res/values-zh-rTW/strings.xml
index b255c75c..4b65958f 100644
--- a/orbotservice/src/main/res/values-zh-rTW/strings.xml
+++ b/orbotservice/src/main/res/values-zh-rTW/strings.xml
@@ -3,114 +3,18 @@
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbotæ?¯ä¸?款å??è²»ç??網絡代ç??æ??ç?¨ç¨?å¼?ï¼?ç?¨ä¾?ä¿?è­·å?¶ä»?æ??ç?¨ç¨?å¼?ç??ä¸?網å®?å?¨ã??
 Orbot使ç?¨Torå?¨å?¨ç??ä¸?ç³»å??ç??é?»è?¦é??è·³èº?ï¼?以便é?±è??網路æµ?é??並å? å¯?ã??Toræ?¯å??å??è²»è»?é«?ä¹?æ?¯å??é??æ?¾ç¶²è·¯ï¼?è?½å¹«æ?¨æ?µç¦¦æµ?é??å??æ??ã??å®?æ?¯æ??ä¸?種網路ç?£æ?§ï¼?ç?½æ¶?å?°å??人ç??è?ªç?±è??é?±ç§?ã??å??業é?¨å??ç??æ©?å¯?é??ä¿?å??æ´»å??ã??ç??è?³å??家å®?å?¨ã??</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">é??å§?å??å??æ­¢ Tor</string>
-  <string name="tor_proxy_service_process">tor 代ç??æ??å??</string>
-  <string name="status_starting_up">Orbot æ­£å?¨å??å??中...</string>
+    <string name="status_starting_up">Orbot æ­£å?¨å??å??中...</string>
   <string name="status_activated">已��� Tor 網路</string>
   <string name="status_disabled">Orbot å·²å??ç?¨</string>
   <string name="status_shutting_down">Toræ??å?? æ­£å?¨é??é??</string>
   <string name="tor_process_starting">å??å??Tor ç?¨æ?¶ç«¯...</string>
   <string name="tor_process_complete">å®?æ??ã??</string>
-  <string name="tor_process_waiting">ç­?å¾?ã??</string>
-  <string name="not_anonymous_yet">è­¦å??ï¼?æ?¨ç??網路å°?æ?ªå?¿å??ï¼?è«?設å®?æ?¨ç??æ??ç?¨ç¨?å¼?使ç?¨HTTP 代ç??伺æ??å?¨ 127.0.0.1:8118 æ?? SOCKS4A æ?? SOCKS5 代ç??伺æ??å?¨ 127.0.0.1:9050</string>
-  <string name="menu_home">��</string>
-  <string name="menu_browse">ç??覽</string>
-  <string name="menu_settings">設�</string>
-  <string name="menu_log">è¨?é??æª?</string>
-  <string name="menu_info">說æ??</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">é??å§?</string>
-  <string name="menu_stop">å??æ­¢</string>
-  <string name="menu_about">é??æ?¼</string>
-  <string name="menu_promo_apps">å??å¾?æ??ç?¨ç¨?å¼?â?¦</string>
-  <string name="main_layout_download">��</string>
-  <string name="main_layout_upload">��</string>
-  <string name="button_help">說æ??</string>
-  <string name="button_close">é??é??</string>
-  <string name="button_about">é??æ?¼</string>
-  <string name="button_clear_log">æ¸?é?¤è¨?é??æª?</string>
-  <string name="menu_verify">檢�</string>
-  <string name="menu_exit">é?¢é??</string>
-  <string name="menu_scan">æ??æ??é?£æ?¥æ©?QR</string>
-  <string name="menu_share_bridge">å??享é?£æ?¥æ©?QR</string>
-  <string name="press_to_start">- è«?é?·æ??以é??å§? - </string>
-  <string name="pref_trans_proxy_group">é??é??å¼?代ç??伺æ??å?¨(é??è¦? Root)</string>
-  <string name="pref_trans_proxy_title">é??é??å¼?代ç??伺æ??å?¨</string>
-  <string name="pref_trans_proxy_summary">è?ªå??å??å?? Toræ?¼æ??ç?¨ç¨?å¼?</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">æ??æ??æ??ç?¨ç¨?å¼?ç??é??é??Tor 代ç??伺æ??å?¨</string>
-  <string name="pref_transparent_port_fallback_title">å??ç?¨é?£æ?¥å? ä»£ç??</string>
-  <string name="pref_transparent_port_fallback_summary">è­¦å??: é?¿å??常ç?¨ç??å? å?£(80ã??443ç­?ç­?)ã??å?¨ã??æ??æ??ã??æ??æ?¯ã??Appã??模å¼?é?½å¤±æ??ç??æ??å??*æ??使ç?¨*ã??</string>
-  <string name="pref_transparent_port_title">���</string>
-  <string name="pref_transparent_port_dialog">輸å?¥ä»£ç??å? </string>
-  <string name="pref_has_root">è«?æ±? Root å­?å??æ¬?</string>
-  <string name="pref_has_root_summary">ç?²é??é??å¼?代ç??è«?æ±? Root å­?å??æ¬?</string>
-  <string name="status_install_success">Tor äº?é?²å?¶æª?æ¡?å®?è£?æ??å??ï¼?</string>
-  <string name="title_error">æ??ç?¨ç¨?å¼?é?¯èª¤</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">é??æ?¼ Orbot</string>
-  <string name="btn_next">å??é?²</string>
-  <string name="btn_back">è¿?å??</string>
-  <string name="btn_finish">çµ?æ??</string>
-  <string name="btn_okay">確�</string>
-  <string name="btn_cancel">å??æ¶?</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Orbot ç??ä¸?äº?詳細è³?æ??</string>
-  <string name="wizard_details_msg">Orbotæ?¯å??é??æº?ç??æ??ç?¨ç¨?å¼?ï¼?å??å?«äº?Torï¼?LibEventå??Polipoã??å®?æ??ä¾?äº?æ?¬å?°HTTP代ç?? (8118)å??SOCKS代ç?? (9050)以é?²å?¥Tor網路ã??Orbotä¹?è?½å¤ å?¨å·²Rootç??è£?ç½®ä¸?ï¼?以Torå?³é??æ??æ??ç??網路æµ?é??ã??</string>
-  <string name="wizard_permissions_root">å·²å??å¾?æ¬?é??</string>
-  <string name="wizard_permissions_stock">Orbot æ¬?é??</string>
-  <string name="wizard_configure">çµ?æ?? Tor 網路</string>
-  <string name="wizard_configure_all">æ??æ??æ??ç?¨ç¨?å¼?é?½é??é?? Tor 代ç??</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo æ??å°?å¼?æ??æ??ç?¨ç¨?å¼?</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">代ç??伺æ??å?¨è¨­å®?</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="pref_general_group">��</string>
-  <string name="pref_start_boot_summary">ç?¶ä½ ç?? Android  è£?ç½®å??å??æ??è?ªå??é??å?? Orbot 並é?£æ?¥ Tor 網路</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
   <!--Warning screen-->
-  <string name="wizard_warning_title">è­¦å??</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">æ¬?é??</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_play">å?¨ Google Play å°?æ?¾æ??æ??ç?? Guardian Project æ??ç?¨ç¨?å¼?</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">é??é??å¼?代ç??</string>
-  <string name="wizard_transproxy_none">ç?¡</string>
-  <string name="pref_select_apps">é?¸æ??æ??ç?¨ç¨?å¼?</string>
-  <string name="button_invert_selection">å??å??é?¸æ??</string>
-  <string name="status">ç??æ??</string>
-  <string name="error">�誤</string>
-  <string name="enter_ports">輸��</string>
-  <string name="project_home">�����</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">第�����</string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="default_bridges"></string>
-  <string name="set_locale_title">��</string>
-  <string name="wizard_locale_title">é?¸æ??èª?è¨?</string>
-  <string name="btn_save_settings">��設�</string>
-  <string name="menu_verify_browser">ç??覽å?¨</string>
-  <string name="permission_manage_tor_label">管ç?? Tor</string>
-  <string name="install_apps_">å®?è£?æ??ç?¨ç¨?å¼?ï¼?</string>
-  <string name="pref_socks_title">Tor SOCKS</string>
-  <string name="pref_dnsport_title">Tor DNS å? </string>
-  <string name="menu_vpn">VPN</string>
-  <string name="kbps">kbps</string>
-  <string name="mbps">mbps</string>
-  <string name="kb">KB</string>
-  <string name="mb">MB</string>
-  <string name="menu_qr">QR 碼</string>
-  <string name="send_email">å¯?é??é?»å­?信件</string>
-  <string name="standard_browser">æ¨?æº?ç??ç??覽å?¨</string>
-  <string name="vpn_default_world">ä¸?ç??</string>
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
 </resources>
diff --git a/orbotservice/src/main/res/values/dimens.xml b/orbotservice/src/main/res/values/dimens.xml
index f96195c8..f4172061 100644
--- a/orbotservice/src/main/res/values/dimens.xml
+++ b/orbotservice/src/main/res/values/dimens.xml
@@ -18,344 +18,10 @@
 */
 -->
 <resources>
-    <!-- The width that is used when creating thumbnails of applications. -->
-    <dimen name="thumbnail_width">164dp</dimen>
-    <!-- The height that is used when creating thumbnails of applications. -->
-    <dimen name="thumbnail_height">145dp</dimen>
-    <!-- The standard size (both width and height) of an application icon that
-         will be displayed in the app launcher and elsewhere. -->
-    <dimen name="app_icon_size">48dip</dimen>
-    <!-- The maximum number of action buttons that should be permitted within
-         an action bar/action mode. This will be used to determine how many
-         showAsAction="ifRoom" items can fit. "always" items can override this. -->
-    <integer name="max_action_buttons">2</integer>
-    <dimen name="toast_y_offset">64dip</dimen>
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height">25dip</dimen>
-    <!-- Height of the bottom navigation / system bar. -->
-    <dimen name="navigation_bar_height">48dp</dimen>
-    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->
-    <dimen name="navigation_bar_height_landscape">48dp</dimen>
-    <!-- Width of the navigation bar when it is placed vertically on the screen -->
-    <dimen name="navigation_bar_width">42dp</dimen>
-    <!-- Height of notification icons in the status bar -->
-    <dimen name="status_bar_icon_size">24dip</dimen>
-    <!-- Size of the giant number (unread count) in the notifications -->
-    <dimen name="status_bar_content_number_size">48sp</dimen>
-    <!-- Height of the system bar (combined status & navigation); used by
-         SystemUI internally, not respected by the window manager. -->
-    <dimen name="system_bar_height">@dimen/navigation_bar_height</dimen>
-    <!-- Height of notification icons in the system bar -->
-    <dimen name="system_bar_icon_size">32dip</dimen>
-    <!-- Margin at the edge of the screen to ignore touch events for in the windowshade. -->
-    <dimen name="status_bar_edge_ignore">5dp</dimen>
-
-    <!-- Minimum size of the fastscroll overlay -->
-    <dimen name="fastscroll_overlay_size">104dp</dimen>
-    <!-- Text size of the fastscroll overlay -->
-    <dimen name="fastscroll_overlay_text_size">52sp</dimen>
-    <!-- Padding of the fastscroll overlay -->
-    <dimen name="fastscroll_overlay_padding">16dp</dimen>
-    <!-- Width of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_width">64dp</dimen>
-    <!-- Height of the fastscroll thumb -->
-    <dimen name="fastscroll_thumb_height">52dp</dimen>
-    <!-- Min width for a tablet device -->
-    <dimen name="min_xlarge_screen_width">800dp</dimen>
-
-    <!-- Default height of a key in the password keyboard for alpha (used by keyguard) -->
-    <dimen name="password_keyboard_key_height_alpha">56dip</dimen>
-    <!-- Default height of a key in the password keyboard for numeric (used by keyguard) -->
-    <dimen name="password_keyboard_key_height_numeric">56dip</dimen>
-    <!-- Default correction for the space key in the password keyboard  (used by keyguard) -->
-    <dimen name="password_keyboard_spacebar_vertical_correction">4dip</dimen>
-    <!-- Default horizontal gap between keys in the password keyboard (used by keyguard) -->
-    <dimen name="password_keyboard_horizontalGap">3dip</dimen>
-    <!-- Default vertical gap between keys in the password keyboard (used by keyguard) -->
-    <dimen name="password_keyboard_verticalGap">9dip</dimen>
-
-    <!-- Size of lockscreen outerring on unsecure unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_outerring_diameter">270dp</dimen>
-
-    <!-- Default target placement radius for GlowPadView. Should be 1/2 of outerring diameter. -->
-    <dimen name="glowpadview_target_placement_radius">135dip</dimen>
-
-    <!-- Default glow radius for GlowPadView -->
-    <dimen name="glowpadview_glow_radius">75dip</dimen>
-
-    <!-- Default distance beyond which GlowPadView snaps to the matching target -->
-    <dimen name="glowpadview_snap_margin">40dip</dimen>
-
-    <!-- Default distance from each snap target that GlowPadView considers a "hit" -->
-    <dimen name="glowpadview_inner_radius">15dip</dimen>
-
-    <!-- Preference activity side margins -->
-    <dimen name="preference_screen_side_margin">0dp</dimen>
-    <!-- Preference activity side margins negative-->
-    <dimen name="preference_screen_side_margin_negative">0dp</dimen>
-    <!-- Preference activity top margin -->
-    <dimen name="preference_screen_top_margin">0dp</dimen>
-    <!-- Preference activity bottom margin -->
-    <dimen name="preference_screen_bottom_margin">0dp</dimen>
-    <!-- Preference widget area width (to the left of the text) -->
-    <dimen name="preference_widget_width">48dp</dimen>
-    <!-- Preference fragment padding, bottom -->
-    <dimen name="preference_fragment_padding_bottom">0dp</dimen>
-    <!-- Preference fragment padding, sides -->
-    <dimen name="preference_fragment_padding_side">16dp</dimen>
-    <!-- Weight of the left pane in a multi-pane preference layout. -->
-    <integer name="preferences_left_pane_weight">4</integer>
-    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
-    <integer name="preferences_right_pane_weight">6</integer>
-    <!-- Padding to the left of the preference panel breadcrumb -->
-    <dimen name="preference_breadcrumb_paddingLeft">0dp</dimen>
-    <!-- Padding to the right of the preference panel breadcrumb -->
-    <dimen name="preference_breadcrumb_paddingRight">0dp</dimen>
-    <!-- Minimum space to allocate to the left of a preference item for an icon.
-        This helps in aligning titles when some items have icons and some don't. When space is
-        at a premium, we don't pre-allocate any space. -->
-    <dimen name="preference_icon_minWidth">0dp</dimen>
-    <!-- The platform's desired minimum size for a dialog's width when it
-         is along the major axis (that is the screen is landscape).  This may
-         be either a fraction or a dimension. -->
-    <item type="dimen" name="dialog_min_width_major">65%</item>
-
-    <!-- The platform's desired fixed width for a dialog along the major axis
-         (the screen is in landscape). This may be either a fraction or a dimension.-->
-    <item type="dimen" name="dialog_fixed_width_major">320dp</item>
-    <!-- The platform's desired fixed width for a dialog along the minor axis
-         (the screen is in portrait). This may be either a fraction or a dimension.-->
-    <item type="dimen" name="dialog_fixed_width_minor">320dp</item>
-    <!-- The platform's desired fixed height for a dialog along the major axis
-         (the screen is in portrait). This may be either a fraction or a dimension.-->
-    <item type="dimen" name="dialog_fixed_height_major">80%</item>
-    <!-- The platform's desired fixed height for a dialog along the minor axis
-         (the screen is in landscape). This may be either a fraction or a dimension.-->
-    <item type="dimen" name="dialog_fixed_height_minor">100%</item>
-
-    <!-- Preference activity, vertical padding for the header list -->
-    <dimen name="preference_screen_header_vertical_padding">0dp</dimen>
-
-    <dimen name="preference_screen_header_padding_side">16dip</dimen>
-    <integer name="preference_screen_header_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
-
-    <integer name="preference_fragment_scrollbarStyle">0x02000000</integer> <!-- outsideOverlay -->
-
-    <dimen name="preference_item_padding_side">8dip</dimen>
-    <dimen name="preference_item_padding_inner">8dip</dimen>
-    <dimen name="preference_child_padding_side">16dip</dimen>
-
-    <!-- The platform's desired minimum size for a dialog's width when it
-         is along the minor axis (that is the screen is portrait).  This may
-         be either a fraction or a dimension. -->
-    <item type="dimen" name="dialog_min_width_minor">95%</item>
-
     <!-- The width of the big icons in notifications. -->
     <dimen name="notification_large_icon_width">64dp</dimen>
     <!-- The width of the big icons in notifications. -->
     <dimen name="notification_large_icon_height">64dp</dimen>
-
-    <!-- Minimum width of the search view text entry area. -->
-    <dimen name="search_view_text_min_width">160dip</dimen>
-
-    <!-- Preferred width of the search view. -->
-    <dimen name="search_view_preferred_width">320dip</dimen>
-
-    <!-- Dialog title height -->
-    <dimen name="alert_dialog_title_height">64dip</dimen>
-    <!-- Dialog button bar height -->
-    <dimen name="alert_dialog_button_bar_height">48dip</dimen>
-
-    <!-- Default height of an action bar. -->
-    <dimen name="action_bar_default_height">48dip</dimen>
-    <!-- Vertical padding around action bar icons. -->
-    <dimen name="action_bar_icon_vertical_padding">8dip</dimen>
-    <!-- Text size for action bar titles -->
-    <dimen name="action_bar_title_text_size">18dp</dimen>
-    <!-- Text size for action bar subtitles -->
-    <dimen name="action_bar_subtitle_text_size">14dp</dimen>
-    <!-- Top margin for action bar subtitles -->
-    <dimen name="action_bar_subtitle_top_margin">-3dp</dimen>
-    <!-- Bottom margin for action bar subtitles -->
-    <dimen name="action_bar_subtitle_bottom_margin">5dip</dimen>
-
-    <!-- Size of clock font in LockScreen on Unsecure unlock screen. -->
-    <dimen name="keyguard_lockscreen_clock_font_size">80dip</dimen>
-
-    <!-- Size of status line font on Unsecure unlock LockScreen. -->
-    <dimen name="keyguard_lockscreen_status_line_font_size">14dip</dimen>
-
-    <!-- Size of right margin on Unsecure unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_status_line_font_right_margin">42dip</dimen>
-
-    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_status_line_clockfont_top_margin">22dip</dimen>
-
-    <!-- Size of top margin on Clock font to edge on unlock LockScreen -->
-    <dimen name="keyguard_lockscreen_status_line_clockfont_bottom_margin">12dip</dimen>
-
-    <!-- Padding on left margin of PIN text entry field to center it when del button is showing -->
-    <dimen name="keyguard_lockscreen_pin_margin_left">40dip</dimen>
-
-    <!-- Height of FaceUnlock view in keyguard -->
-    <dimen name="face_unlock_height">330dip</dimen>
-
-    <!-- Minimum popup width for selecting an activity in ActivityChooserDialog/ActivityChooserView. -->
-    <dimen name="activity_chooser_popup_min_width">200dip</dimen>
-
-    <!-- The default gap between components in a layout. -->
-    <dimen name="default_gap">8dip</dimen>
-
-    <!-- Text padding for dropdown items -->
-    <dimen name="dropdownitem_text_padding_left">8dip</dimen>
-
-    <!-- Text padding for dropdown items -->
-    <dimen name="dropdownitem_text_padding_right">8dip</dimen>
-
-    <!-- Width of the icon in a dropdown list -->
-    <dimen name="dropdownitem_icon_width">32dip</dimen>
-
-    <!-- Default width for a textview error popup -->
-    <dimen name="textview_error_popup_default_width">240dip</dimen>
-
-    <!-- Volume panel y offset -->
-    <dimen name="volume_panel_top">80dp</dimen>
-
-    <!-- Default padding to apply to AppWidgetHostViews containing widgets targeting API level 14 and up. -->
-    <dimen name="default_app_widget_padding_left">8dp</dimen>
-    <dimen name="default_app_widget_padding_top">8dp</dimen>
-    <dimen name="default_app_widget_padding_right">8dp</dimen>
-    <dimen name="default_app_widget_padding_bottom">8dp</dimen>
-
-    <!-- Minimum width for an action button in the menu area of an action bar -->
-    <dimen name="action_button_min_width">56dip</dimen>
-
-    <!-- Maximum height for a stacked tab bar as part of an action bar -->
-    <dimen name="action_bar_stacked_max_height">48dp</dimen>
-
-    <!-- Maximum width for a stacked action bar tab. This prevents
-         action bar tabs from becoming too wide on a wide screen when only
-         a few are present. -->
-    <dimen name="action_bar_stacked_tab_max_width">180dp</dimen>
-
-    <!-- Size of notification text (see TextAppearance.StatusBar.EventContent) -->
-    <dimen name="notification_text_size">14dp</dimen>
-    <!-- Size of notification text titles (see TextAppearance.StatusBar.EventContent.Title) -->
-    <dimen name="notification_title_text_size">18dp</dimen>
-    <!-- Size of smaller notification text (see TextAppearance.StatusBar.EventContent.Line2, Info, Time) -->
     <dimen name="notification_subtext_size">12dp</dimen>
 
-    <!-- Keyguard dimensions -->
-    <!-- TEMP -->
-    <dimen name="kg_security_panel_height">600dp</dimen>
-
-    <!-- Height of security view in keyguard. -->
-    <dimen name="kg_security_view_height">480dp</dimen>
-
-    <!-- Width of widget view in keyguard. -->
-    <dimen name="kg_widget_view_width">0dp</dimen>
-
-    <!-- Height of widget view in keyguard. -->
-    <dimen name="kg_widget_view_height">0dp</dimen>
-
-    <!-- Size of the clock font in keyguard's status view -->
-    <dimen name="kg_status_clock_font_size">75dp</dimen>
-
-    <!-- Size of the date font in keyguard's status view  -->
-    <dimen name="kg_status_date_font_size">15dp</dimen>
-
-    <!-- Size of the generic status lines keyguard's status view  -->
-    <dimen name="kg_status_line_font_size">13dp</dimen>
-
-    <!-- Size of margin on the right of keyguard's status view -->
-    <dimen name="kg_status_line_font_right_margin">16dp</dimen>
-
-    <!-- Top margin for the clock view -->
-    <dimen name="kg_clock_top_margin">-16dp</dimen>
-
-    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
-    <dimen name="kg_key_horizontal_gap">0dp</dimen>
-
-    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
-    <dimen name="kg_key_vertical_gap">0dp</dimen>
-
-    <!-- Horizontal gap between keys in PIN and SIM PIN numeric keyboards in keyguard -->
-    <dimen name="kg_pin_key_height">60dp</dimen>
-
-    <!-- Space reserved at the bottom of secure views (pin/pattern/password/SIM pin/SIM puk) -->
-    <dimen name="kg_secure_padding_height">46dp</dimen>
-
-    <!-- The height of the runway lights strip -->
-    <dimen name="kg_runway_lights_height">7dp</dimen>
-
-    <!-- The height of the runway lights strip -->
-    <dimen name="kg_runway_lights_vertical_padding">2dp</dimen>
-
-    <!-- Horizontal padding for the widget pager -->
-    <dimen name="kg_widget_pager_horizontal_padding">16dp</dimen>
-
-    <!-- Top padding for the widget pager -->
-    <dimen name="kg_widget_pager_top_padding">0dp</dimen>
-
-    <!-- Bottom padding for the widget pager -->
-    <dimen name="kg_widget_pager_bottom_padding">64dp</dimen>
-
-    <!-- Top margin for the runway lights. We add a negative margin in large
-        devices to account for the widget pager padding -->
-    <dimen name="kg_runway_lights_top_margin">0dp</dimen>
-
-    <!-- Touch slop for the global toggle accessibility gesture -->
-    <dimen name="accessibility_touch_slop">80dip</dimen>
-
-    <!-- Width of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
-    <dimen name="keyguard_security_width">320dp</dimen>
-
-    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->
-    <dimen name="keyguard_security_height">400dp</dimen>
-
-    <!-- Margin around the various security views -->
-    <dimen name="keyguard_security_view_margin">8dp</dimen>
-
-    <!-- Margin around the various security views -->
-    <dimen name="keyguard_muliuser_selector_margin">8dp</dimen>
-
-    <!-- Stroke width of the frame for the circular avatars. -->
-    <dimen name="keyguard_avatar_frame_stroke_width">2dp</dimen>
-
-    <!-- Shadow radius under the frame for the circular avatars. -->
-    <dimen name="keyguard_avatar_frame_shadow_radius">1dp</dimen>
-
-    <!-- Size of the avator on hte multiuser lockscreen. -->
-    <dimen name="keyguard_avatar_size">66dp</dimen>
-
-    <!-- Size of the text under the avator on the multiuser lockscreen. -->
-    <dimen name="keyguard_avatar_name_size">10sp</dimen>
-
-    <!-- Size of the region along the edge of the screen that will accept
-         swipes to scroll the widget area. -->
-    <dimen name="kg_edge_swipe_region_size">24dp</dimen>
-
-    <!-- If the height if keyguard drops below this threshold (most likely
-    due to the appearance of the IME), then drop the multiuser selector. -->
-    <dimen name="kg_squashed_layout_threshold">600dp</dimen>
-
-    <!-- The height of widgets which do not support vertical resizing. This is only
-    used on tablets; on phones, this size is determined by the space left by the
-    security mode. -->
-    <dimen name="kg_small_widget_height">160dp</dimen>
-
-    <!-- Rounded corner radius for video subtitles. -->
-    <dimen name="subtitle_corner_radius">2dp</dimen>
-
-    <!-- Shadow radius for video subtitles. -->
-    <dimen name="subtitle_shadow_radius">2dp</dimen>
-
-    <!-- Shadow offset for video subtitles. -->
-    <dimen name="subtitle_shadow_offset">2dp</dimen>
-
-    <!-- Outline width for video subtitles. -->
-    <dimen name="subtitle_outline_width">2dp</dimen>
-
-    <!-- width of ImmersiveModeConfirmation (-1 for match_parent) -->
-    <dimen name="immersive_mode_cling_width">-1px</dimen>
 </resources>
diff --git a/orbotservice/src/main/res/values/strings.xml b/orbotservice/src/main/res/values/strings.xml
index 11485598..b049a2da 100644
--- a/orbotservice/src/main/res/values/strings.xml
+++ b/orbotservice/src/main/res/values/strings.xml
@@ -2,332 +2,37 @@
 <resources>
   <string name="app_name">Orbot</string>
   <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string>
-  <string name="internal_web_url">http://orbot/</string>
-  <string name="default_web_url">http://check.torproject.org</string>
-  <string name="secure_default_web_url">https://check.torproject.org</string>
-  <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
-  <string name="control_permission_label">start and stop Tor</string>
-  <string name="tor_proxy_service_process">torproxyservice</string>
-  <string name="status_starting_up">Orbot is starting&#8230;</string>
+    <string name="status_starting_up">Orbot is starting&#8230;</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&#8230;</string>
   <string name="tor_process_complete">complete.</string>
-  <string name="tor_process_waiting">waiting.</string>
-  <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string>
-  <string name="menu_home">Home</string>
-  <string name="menu_browse">Browse</string>
-  <string name="menu_settings">Settings</string>
-  <string name="menu_log">Log</string>
-  <string name="menu_info">Help</string>
-  <string name="menu_apps">VPN</string>
-  <string name="menu_start">Start</string>
-  <string name="menu_stop">Stop</string>
-  <string name="menu_about">About</string>
-  <string name="menu_promo_apps">Get appsâ?¦</string>
-  <string name="main_layout_download">Download</string>
-  <string name="main_layout_upload">Upload</string>
-  <string name="button_help">Help</string>
-  <string name="button_close">Close</string>
-  <string name="button_about">About</string>
-  <string name="button_clear_log">Clear Log</string>
-  <string name="menu_verify">Check</string>
-  <string name="menu_exit">Exit</string>
-  <string name="menu_scan">Scan BridgeQR</string>
-  <string name="menu_share_bridge">Share BridgeQR</string>
-  <string name="press_to_start">- long press to start -</string>
-  <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string>
-  <string name="pref_trans_proxy_title">Transparent Proxying</string>
-  <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string>
-  <string name="pref_transparent_all_title">Tor Everything</string>
-  <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string>
-  <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string>
-  <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string>
-  <string name="pref_transparent_port_title">Port List</string>
-  <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string>
-  <string name="pref_transparent_port_dialog">Enter ports to proxy</string>
-  <string name="pref_has_root">Request Root Access</string>
-  <string name="pref_has_root_summary">Request root access for transparent proxying</string>
-  <string name="status_install_success">Tor binaries successfully installed!</string>
-  <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants@xxxxxxxxxxxxxx</string>
-  <string name="title_error">Application Error</string>
-  <string name="wizard_title">Orbot</string>
-  <string name="wizard_btn_tell_me_more">About Orbot</string>
-  <string name="btn_next">Next</string>
-  <string name="btn_back">Back</string>
-  <string name="btn_finish">Finish</string>
-  <string name="btn_okay">Okay</string>
-  <string name="btn_cancel">Cancel</string>
-  <!--Welcome Wizard strings (DJH)-->
-  <string name="wizard_details">Some Orbot Details</string>
-  <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>
-  <string name="wizard_permissions_root">Permission Granted</string>
-  <string name="wizard_permissions_stock">Orbot Permissions</string>
-  <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string>
-  <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string>
-  <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string>
-  <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string>
-  <string name="wizard_permission_enable_root">Grant Root for Orbot</string>
-  <string name="wizard_configure">Configure Torification</string>
-  <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string>
-  <string name="wizard_configure_all">Proxy All Apps Through Tor</string>
-  <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string>
-  <string name="wizard_tips_tricks">Orbot-enabled Apps</string>
-  <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string>
-  <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string>
-  <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string>
-  <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string>
-  <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string>
-  <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string>
-  <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
-  <string name="wizard_proxy_help_info">Proxy Settings</string>
-  <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
-  <string name="wizard_final">Orbot is ready!</string>
-  <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens&#8230; and now you are ready to, as well!</string>
-  <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string>
-  <!--END Welcome Wizard strings (DJH)-->
-  <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Browser\' button to test your connection. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help@xxxxxxxxxxxxxxxxxxxx to learn more.</string>
-  <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string>
-  <string name="pref_hs_group">Hidden Service Hosting</string>
-  <string name="pref_general_group">General</string>
-  <string name="pref_start_boot_title">Start Orbot on Boot</string>
-  <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string>
-  <!--New Wizard Strings-->
+    <!--Welcome Wizard strings (DJH)-->
+    <!--END Welcome Wizard strings (DJH)-->
+    <!--New Wizard Strings-->
   <!--Title Screen-->
-  <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string>
-  <!--Warning screen-->
-  <string name="wizard_warning_title">Warning</string>
-  <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string>
-  <!--Permissions screen-->
-  <string name="wizard_permissions_title">Permissions</string>
-  <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string>
-  <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string>
-  <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string>
-  <!--TipsAndTricks screen-->
-  <string name="wizard_tips_title">Orbot-Enabled Apps</string>
-  <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string>
-  <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string>
-  <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string>
-  <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string>
-  <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string>
-  <!--Transparent Proxy screen-->
-  <string name="wizard_transproxy_title">Tunneled Apps</string>
-  <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string>
-  <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string>
-  <string name="wizard_transproxy_none">None</string>
-  <string name="pref_transparent_tethering_title">Tor Tethering</string>
-  <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wi-Fi and USB Tethered Devices (requires restart)</string>
-  <string name="button_grant_superuser">Request Superuser Access</string>
-  <string name="pref_select_apps">Select Apps</string>
-  <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string>
-  <string name="pref_node_configuration">Node Configuration</string>
-  <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string>
-  <string name="pref_entrance_node">Entrance Nodes</string>
-  <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string>
-  <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string>
-  <string name="pref_allow_background_starts_title">Allow Background Starts</string>
-  <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string>
-  
-  <string name="button_proxy_all">Proxy All</string>
-  <string name="button_proxy_none">Proxy None</string>
-  <string name="button_invert_selection">Invert Selection</string>
+    <!--Warning screen-->
+    <!--Permissions screen-->
+    <!--TipsAndTricks screen-->
+    <!--Transparent Proxy screen-->
 
-  <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string>
-  
-  <string name="pref_proxy_type_title">Outbound Proxy Type</string>
-  <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string>
-  <string name="pref_proxy_type_dialog">Enter Proxy Type</string>
-  
-  <string name="pref_proxy_host_title">Outbound Proxy Host</string>
-  <string name="pref_proxy_host_summary">Proxy Server hostname</string>
-  <string name="pref_proxy_host_dialog">Enter Proxy Host</string>
-  
-  <string name="pref_proxy_port_title">Outbound Proxy Port</string>
-  <string name="pref_proxy_port_summary">Proxy Server port</string>
-  <string name="pref_proxy_port_dialog">Enter Proxy port</string>
 
-  <string name="pref_proxy_username_title">Outbound Proxy Username</string>
-  <string name="pref_proxy_username_summary">Proxy Username (Optional)</string>
-  <string name="pref_proxy_username_dialog">Enter Proxy Username</string>
-  
-  <string name="pref_proxy_password_title">Outbound Proxy Password</string>
-  <string name="pref_proxy_password_summary">Proxy Password (Optional)</string>
-  <string name="pref_proxy_password_dialog">Enter Proxy Password</string>
-  
-  
-  
-  <string name="status">Status</string>
-  <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying&#8230;</string>
-  <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying&#8230;</string>
-  <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string>
-  <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string>
-  <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string>
-  <string name="transproxy_rules_cleared">TransProxy rules cleared</string>
-  <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
-  <string name="privoxy_is_running_on_port_">Polipo is running on port: </string>
-  <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying&#8230;</string>
-  <string name="bridge_error">Bridge Error</string>
-  <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string>
-  <string name="send_email_for_bridges">Send an email to bridges@xxxxxxxxxxxxxx with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string>
-  <string name="error">Error</string>
-  <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
+    <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string>
+    <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string>
   <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string>
-  <string name="exit_nodes">Exit Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string>
-  <string name="enter_exit_nodes">Enter Exit Nodes</string>
-  <string name="exclude_nodes">Exclude Nodes</string>
-  <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string>
-  <string name="enter_exclude_nodes">Enter Exclude Nodes</string>
-  <string name="strict_nodes">Strict Nodes</string>
-  <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string>
-  <string name="bridges">Bridges</string>
-  <string name="use_bridges">Use Bridges</string>
-  <string name="bridges_obfuscated">Obfuscated Bridges</string>
-  <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string>
-  <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string>
-  <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string>
-  <string name="enter_bridge_addresses">Enter Bridge Addresses</string>
-  <string name="relays">Relays</string>
-  <string name="relaying">Relaying</string>
-  <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string>
-  <string name="relay_port">Relay Port</string>
-  <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string>
-  <string name="enter_or_port">Enter OR port</string>
-  <string name="relay_nickname">Relay nickname</string>
-  <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string>
-  <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string>
-  <string name="reachable_addresses">Reachable Addresses</string>
-  <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string>
-  <string name="reachable_ports">Reachable ports</string>
-  <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string>
-  <string name="enter_ports">Enter ports</string>
-  <string name="enable_hidden_services">Hidden Service Hosting</string>
-  <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string>
-  <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string>
-  <string name="hidden_service_ports">Hidden Service Ports</string>
-  <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string>
-  <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string>
-  <string name="project_home">Project Home(s): </string>
-  <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
-  <string name="the_tor_license">The Tor License</string>
-  <string name="https_torproject_org">https://torproject.org</string>
-  <string name="third_party_software">3rd-Party-Software: </string>
-  <string name="tor_version">Tor: https://www.torproject.org</string>
-  <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
-  <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
-  <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
-  <string name="openssl_version">OpenSSL v1.0.1q: http://www.openssl.org</string>
-  <string name="hidden_service_request">An app wants to open hidden server port %S to the Tor network. This is safe if you trust the app.</string>
-  <string name="found_existing_tor_process">found existing Tor process&#8230;</string>
+    <string name="found_existing_tor_process">found existing Tor process&#8230;</string>
   <string name="something_bad_happened">Something bad happened. Check the log</string>
-  <string name="hidden_service_on">hidden service on:</string>
-  <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
+    <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string>
   <string name="unable_to_start_tor">Unable to start Tor:</string>
-  <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string>
-  <string name="pref_use_sys_iptables_title">Use Default Iptables</string>
-  <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string>
-  
-  <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string>
-  
-  <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string>
-  <string name="pref_use_persistent_notifications_title">Always-On Notifications</string>
-  
-  <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string>
-  <string name="pref_use_expanded_notifications_title">Expanded Notifications</string>
-  
-  <string name="notification_using_bridges">Bridges enabled!</string>
-  <string name="default_bridges"/>
-  <string name="set_locale_title">Language</string>
-  <string name="set_locale_summary">Choose the locale and language for Orbot</string>
-  <string name="wizard_locale_title">Choose Language</string>
-  <string name="wizard_locale_msg">Leave default or switch the current language</string>
-  <string name="powered_by">powered by Tor</string>
-  <string name="btn_save_settings">Save Settings</string>
-  <string name="no_internet_connection_tor">No internet connection; Tor is on standbyâ?¦</string>
-  <string name="bandwidth_">Bandwidth:</string>
-  <string name="down">down</string>
-  <string name="up">up</string>
-  <string name="pref_disable_network_title">No Network Auto-Sleep</string>
-  <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string>
-  <string name="newnym">You\'ve switched to a new Tor identity!</string>
-  
-    <string name="menu_verify_browser">Browser</string>
-    <string name="menu_use_chatsecure">Use ChatSecure</string>
 
-    <string name="permission_manage_tor_label">Manage Tor</string>
-    <string name="permission_manage_tor_description">Enable this app to control the Tor service</string>
-    <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">It doesn\'t seem like you have Orfox installed. Want help with that, or should we just open the browser?</string>
-    <string name="install_apps_">Install apps?</string>
+    <string name="no_internet_connection_tor">No internet connection; Tor is on standbyâ?¦</string>
+    <string name="newnym">You\'ve switched to a new Tor identity!</string>
+
     <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleepâ?¦</string>
     <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor upâ?¦</string>
     <string name="updating_settings_in_tor_service">updating settings in Tor service</string>
-  
-    <string name="pref_socks_title">Tor SOCKS</string>
-    <string name="pref_socks_summary">Port that Tor offers its SOCKS proxy on (default: 9050 or 0 to disable)</string>
-    <string name="pref_socks_dialog">SOCKS Port Config</string>
-    
-    <string name="pref_transport_title">Tor TransProxy Port</string>
-    <string name="pref_transport_summary">Port that Tor offers its Transparent Proxy on (default: 9040 or 0 to disable)</string>
-    <string name="pref_transport_dialog">TransProxy Port Config</string>
-    
-    
-    <string name="pref_dnsport_title">Tor DNS Port</string>
-    <string name="pref_dnsport_summary">Port that Tor offers its DNS on (default: 5400 or 0 to disable)</string>
-    <string name="pref_dnsport_dialog">DNS Port Config</string>
-    
-    
-    <string name="pref_torrc_title">Torrc Custom Config</string>
-    <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string>
-    <string name="pref_torrc_dialog">Custom Torrc</string>
-    
-    <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string>
-  <string name="your_tor_public_ips_">Your Tor Public IPs:</string>
-  <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string>
-  <string name="app_conflict">App Conflict</string>
-  
-  <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string>
-  
-  <string name="menu_vpn">VPN</string>
-  
-  <string name="kbps">kbps</string>
-  
-  <string name="mbps">mbps</string>
-  
-  <string name="kb">KB</string>
-  
-  <string name="mb">MB</string>
-  
-  <string name="bridges_updated">Bridges Updated</string>
-  
-  <string name="restart_orbot_to_use_this_bridge_">Please restart Orbot to enable the changes</string>
-  
-  <string name="menu_qr">QR Codes</string>
-  
-  <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string>
-  
-  <string name="bridge_mode">Bridge Mode</string>
-  
-  <string name="get_bridges_email">Email</string>
-  <string name="get_bridges_web">Web</string>
-  
-  <string name="activate">Activate</string>
-  
-  <string name="apps_mode">Apps VPN Mode</string>
-  
-  <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable all apps on your device to run through the Tor network using the VPN feature of Android.\n\n*WARNING* This is a new, experimental feature and in some cases may not start automatically, or may stop. It should NOT be used for anonymity, and ONLY used for getting through firewalls and filters.</string>
-  
-  <string name="send_email">Send Email</string>
-  
-  <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy &amp; paste it into the \"Bridges\" preference in Orbot\'s setting and restart.</string>
-  
-  <string name="install_orweb">Install Orfox</string>
-  
-  <string name="standard_browser">Standard Browser</string>
-  
-  <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string>
 
-	<string name="vpn_default_world">World</string>
 
-  <string name="menu_new_identity">New Identity</string>
+    <string name="menu_new_identity">New Identity</string>
 </resources>
diff --git a/orbotservice/src/main/res/values/styles.xml b/orbotservice/src/main/res/values/styles.xml
deleted file mode 100644
index b3fe8af4..00000000
--- a/orbotservice/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
-    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
-</resources>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits