[tor-commits] [orbot/master] Merge branch 'issue_199' of https://github.com/sisbell/orbot into sisbell-issue_199

n8fr8 at torproject.org n8fr8 at torproject.org
Fri Jul 5 12:40:01 UTC 2019


commit ff7d3dd5d523c94fb94894dcd664ff3501c598cc
Merge: 7c2cfc3e 08c35bd3
Author: n8fr8 <nathan at guardianproject.info>
Date:   Wed May 29 17:02:40 2019 -0400

    Merge branch 'issue_199' of https://github.com/sisbell/orbot into sisbell-issue_199

 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_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/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 -
 304 files changed, 2375 insertions(+), 23672 deletions(-)






More information about the tor-commits mailing list