tor-commits July 2019

tor-commits@lists.torproject.org

19 participants
1200 discussions

[orbot/master] Removes references to Orfox since it is being completely replaced
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 351ef96f0794bcfa38ceb7bf955c3e3dff966218 Author: bim <dsnake(a)protonmail.com> Date: Wed Jun 26 17:40:24 2019 -0400 Removes references to Orfox since it is being completely replaced with the Tor Browser for Android. Conversations surrounding this can be found here https://blog.torproject.org/comment/281767#comment-281767 and here https://trac.torproject.org/projects/tor/ticket/29955 Previously the Orfox link was broken if the user didn't have Google Play installed since it was no longer distributed on F-Droid. --- .../org/torproject/android/OrbotMainActivity.java | 118 ++------------------- .../android/ui/onboarding/OnboardingActivity.java | 63 ----------- app/src/main/res/drawable/orfox64.png | Bin 4142 -> 0 bytes app/src/main/res/values-ar/strings.xml | 5 +- app/src/main/res/values-ay/strings.xml | 5 +- app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 7 +- app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 3 - app/src/main/res/values-cs-rCZ/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 3 - app/src/main/res/values-el/strings.xml | 5 +- app/src/main/res/values-es-rAR/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 5 +- app/src/main/res/values-eu/strings.xml | 3 - app/src/main/res/values-fa/strings.xml | 3 - app/src/main/res/values-fi/strings.xml | 3 +- app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 5 +- app/src/main/res/values-gl/strings.xml | 5 +- app/src/main/res/values-he/strings.xml | 5 +- app/src/main/res/values-hi/strings.xml | 5 +- app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 5 +- app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-in-rID/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 3 - app/src/main/res/values-it/strings.xml | 3 - app/src/main/res/values-iw/strings.xml | 3 +- app/src/main/res/values-ja/strings.xml | 3 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 5 +- app/src/main/res/values-nb/strings.xml | 4 +- app/src/main/res/values-nl/strings.xml | 3 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 5 +- app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 5 +- app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 3 - app/src/main/res/values-sv/strings.xml | 3 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 3 - app/src/main/res/values-tl/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 7 +- app/src/main/res/values-uk/strings.xml | 3 - app/src/main/res/values-uz/strings.xml | 3 +- app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 3 - app/src/main/res/values/strings.xml | 4 - .../android/service/TorServiceConstants.java | 3 +- 54 files changed, 29 insertions(+), 309 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 59a6d89b..64ee61db 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -38,7 +38,6 @@ import org.torproject.android.vpn.VPNEnableActivity; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; import android.app.AlertDialog; -import android.app.Dialog; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.ContentValues; @@ -48,7 +47,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.database.Cursor; @@ -828,56 +826,16 @@ public class OrbotMainActivity extends AppCompatActivity /* * Launch the system activity for Uri viewing with the provided url */ - private void openBrowser(final String browserLaunchUrl,boolean forceExternal, String pkgId) - { - boolean isBrowserInstalled = appInstalledOrNot(TorServiceConstants.BROWSER_APP_USERNAME); - - if (pkgId != null) - { + private void openBrowser(final String browserLaunchUrl,boolean forceExternal, String pkgId) { + if (pkgId != null) { startIntent(pkgId,Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); } - else if (isBrowserInstalled) - { - startIntent(TorServiceConstants.BROWSER_APP_USERNAME,Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); - } - else if (mBtnVPN.isChecked()||forceExternal) - { + else if (mBtnVPN.isChecked()||forceExternal) { //use the system browser since VPN is on startIntent(null,Intent.ACTION_VIEW, Uri.parse(browserLaunchUrl)); } - } - private void promptInstallOrfox () - { - AlertDialog aDialog = new AlertDialog.Builder(OrbotMainActivity.this) - .setTitle(R.string.install_apps_) - .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) - .setPositiveButton(R.string.install_orweb, new Dialog.OnClickListener () - { - - @Override - public void onClick(DialogInterface dialog, int which) { - - startActivity(OnboardingActivity.getInstallIntent(TorServiceConstants.BROWSER_APP_USERNAME,OrbotMainActivity.this)); - - - } - - }) - .setNegativeButton(R.string.btn_cancel, new Dialog.OnClickListener () - { - - @Override - public void onClick(DialogInterface dialog, int which) { - dialog.cancel(); - } - - }) - .show(); - } - - private void startIntent (String pkg, String action, Uri data) { Intent i; @@ -905,20 +863,6 @@ public class OrbotMainActivity extends AppCompatActivity } } - private boolean appInstalledOrNot(String uri) - { - PackageManager pm = getPackageManager(); - try - { - PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); - return pi.applicationInfo.enabled; - } - catch (PackageManager.NameNotFoundException e) - { - return false; - } - } - @Override protected void onActivityResult(int request, int response, Intent data) { super.onActivityResult(request, response, data); @@ -1049,7 +993,7 @@ public class OrbotMainActivity extends AppCompatActivity sendIntentToService(TorServiceConstants.CMD_VPN_CLEAR); } - @Override + @Override protected void onResume() { super.onResume(); @@ -1334,28 +1278,6 @@ public class OrbotMainActivity extends AppCompatActivity + getString(R.string.mb); } - /** - private static final float ROTATE_FROM = 0.0f; - private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f; - - public void spinOrbot (float direction) - { - sendIntentToService (TorServiceConstants.CMD_NEWNYM); - - - Toast.makeText(this, R.string.newnym, Toast.LENGTH_SHORT).show(); - - // Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO*direction, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f); - Rotate3dAnimation rotation = new Rotate3dAnimation(ROTATE_FROM, ROTATE_TO*direction, imgStatus.getWidth()/2f,imgStatus.getWidth()/2f,20f,false); - rotation.setFillAfter(true); - rotation.setInterpolator(new AccelerateInterpolator()); - rotation.setDuration((long) 2*1000); - rotation.setRepeatCount(0); - imgStatus.startAnimation(rotation); - - - }**/ - private static final float ROTATE_FROM = 0.0f; private static final float ROTATE_TO = 360.0f*4f;// 3.141592654f * 32.0f; @@ -1372,39 +1294,13 @@ public class OrbotMainActivity extends AppCompatActivity lblStatus.setText(getString(R.string.newnym)); } - private void addAppShortcuts () - { - LinearLayout llBoxShortcuts = (LinearLayout)findViewById(R.id.boxAppShortcuts); + private void addAppShortcuts() { + LinearLayout llBoxShortcuts = findViewById(R.id.boxAppShortcuts); PackageManager pMgr = getPackageManager(); llBoxShortcuts.removeAllViews(); - //first add Orfox shortcut - try { - - ImageView iv = new ImageView(this); - LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); - params.setMargins(3, 3, 3, 3); - iv.setLayoutParams(params); - iv.setImageResource(R.drawable.orfox64); - llBoxShortcuts.addView(iv); - iv.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (!appInstalledOrNot(TorServiceConstants.BROWSER_APP_USERNAME)) - promptInstallOrfox(); - else - openBrowser(URL_TOR_CHECK,false, TorServiceConstants.BROWSER_APP_USERNAME); - - } - }); - } - catch (Exception e) - { - //package not installed? - } - if (PermissionManager.isLollipopOrHigher()) { if (Prefs.useVpn()) { @@ -1444,8 +1340,6 @@ public class OrbotMainActivity extends AppCompatActivity //package not installed? } } - - } } else diff --git a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java index a8bad692..bceb0ada 100644 --- a/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java +++ b/app/src/main/java/org/torproject/android/ui/onboarding/OnboardingActivity.java @@ -2,14 +2,9 @@ package org.torproject.android.ui.onboarding; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; -import android.net.Uri; import android.os.Bundle; import android.support.annotation.Nullable; import android.support.v4.app.Fragment; -import android.text.TextUtils; -import android.util.Log; import android.view.View; import com.github.paolorotolo.appintro.AppIntro; @@ -20,8 +15,6 @@ import org.torproject.android.ui.AppManagerActivity; import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; import org.torproject.android.vpn.VPNEnableActivity; -import java.util.List; - public class OnboardingActivity extends AppIntro { @Override @@ -78,12 +71,6 @@ public class OnboardingActivity extends AppIntro { } @Override - public void onSkipPressed(Fragment currentFragment) { - super.onSkipPressed(currentFragment); - // Do something when users tap on Skip button. - } - - @Override public void onDonePressed(Fragment currentFragment) { super.onDonePressed(currentFragment); // Do something when users tap on Done button. @@ -91,57 +78,7 @@ public class OnboardingActivity extends AppIntro { } @Override - public void onSlideChanged(@Nullable Fragment oldFragment, @Nullable Fragment newFragment) { - super.onSlideChanged(oldFragment, newFragment); - // Do something when the slide changes. - } - - - @Override protected void attachBaseContext(Context base) { super.attachBaseContext(LocaleHelper.onAttach(base)); } - - public static boolean isAppInstalled(PackageManager pm, String packageName) { - try { - pm.getPackageInfo(packageName, PackageManager.GET_ACTIVITIES); - return true; - } catch (PackageManager.NameNotFoundException e) { - return false; - } - } - - public static Intent getInstallIntent(String packageName, Context context) { - final Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse(MARKET_URI + packageName)); - - PackageManager pm = context.getPackageManager(); - List<ResolveInfo> resInfos = pm.queryIntentActivities(intent, 0); - - String foundPackageName = null; - for (ResolveInfo r : resInfos) { - Log.i("Install", "market: " + r.activityInfo.packageName); - if (TextUtils.equals(r.activityInfo.packageName, FDROID_PACKAGE_NAME) - || TextUtils.equals(r.activityInfo.packageName, PLAY_PACKAGE_NAME)) { - foundPackageName = r.activityInfo.packageName; - break; - } - } - - if (foundPackageName == null) { - intent.setData(Uri.parse(FDROID_APP_URI + packageName)); - } else { - intent.setPackage(foundPackageName); - } - return intent; - } - - final static String MARKET_URI = "market://details?id="; - final static String FDROID_APP_URI = "https://f-droid.org/repository/browse/?fdid="; - final static String PLAY_APP_URI = "https://play.google.com/store/apps/details?id="; - final static String FDROID_URI = "https://f-droid.org/repository/browse/?fdfilter=info.guardianproject"; - final static String PLAY_URI = "https://play.google.com/store/apps/developer?id=The+Guardian+Project"; - - private final static String FDROID_PACKAGE_NAME = "org.fdroid.fdroid"; - private final static String PLAY_PACKAGE_NAME = "com.android.vending"; } \ No newline at end of file diff --git a/app/src/main/res/drawable/orfox64.png b/app/src/main/res/drawable/orfox64.png deleted file mode 100644 index cd23e66d..00000000 Binary files a/app/src/main/res/drawable/orfox64.png and /dev/null differ diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 813ee949..3421c374 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -108,8 +108,6 @@ <string name="pref_disable_network_title">لاتوجد شبكة نوم-آلي</string> <string name="pref_disable_network_summary">ضع تور في وضعية النوم عند عدم وجود الأنترنت</string> <string name="newnym">لقد تحولت الى هوية تور جديدة</string> - <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">يشتغل أوربوت أحسن مع متصفح أورفوكس. هل تود تثبيته الآن ؟</string> - <string name="install_apps_">هل تود تنصيب متصفح ؟</string> <string name="no_network_connectivity_putting_tor_to_sleep_">لا يوجد اتصال بألشبكة. سينتقل تور الى وضعية النوم</string> <string name="network_connectivity_is_good_waking_tor_up_">حال الإتصال بالشبكة جيد. يتم إيقاذ تور...</string> <string name="updating_settings_in_tor_service">تحديث الاعدادات في خدمات تور</string> @@ -142,8 +140,7 @@ إختر \"بريد إلكتروني\" أو \"ويب\" بالأسفل لطلب عنوان جسر. ما أن تحصل على جسر، أنسخه وألصقه في خانة \"الجسور\" في إعدادات أوربوت وأعد التشغيل.</string> - <string name="install_orweb">تثبيت أورفوكس</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> diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml index d6b2d2b4..24f79445 100644 --- a/app/src/main/res/values-ay/strings.xml +++ b/app/src/main/res/values-ay/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="network_connectivity_is_good_waking_tor_up_">Llikax khus uñstaniski. Torax aqtaskiwa...</string> <string name="updating_settings_in_tor_service">Toran wakichäwinakax mayjt\'ayaskiwa</string> @@ -143,8 +141,7 @@ <string name="apps_mode">VPN</string> <string name="send_email">Qillqat apayaña</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Jalakipañan QR waruqasa, jan ukax llikatuqi, imailtuqis jalakipañ utjirinakx jikxatarakismawa. Jalakipañ thakh jikxatañatakix \'Imail\' jan ukax \'llika\' ajllt\'am.\n\n Orbotan majt\'ayañawjapan \"Jalakipañ Thakhi\" limt\'añar apkatam, ukat mayamp qalltam.</string> - <string name="install_orweb">Orfox apaqaña</string> - <string name="vpn_default_world">Uraqpacha (justupaki)</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> diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 9c5bb792..3880b2ba 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -136,7 +136,6 @@ LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="activate">Aktivləşdir</string> <string name="send_email">Emeyl göndərin</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Körpü ünvanını siz emeyl və veb vasitəsiylə, ya da körpünün QR kodunu skan etməklə əldə edə bilərsiniz. Körpü ünvanı haqda sorğunun altında \'Email\'i, yaxud \'Web\'i seçin.\n\nÜnvanı əldə edəndən sonra &amp-i nüsxələyin və onu Orbot quraşdırmasındakı \"Bridges\" parametrinə qoyun və cihazı yenidən yükləyin.</string> - <string name="install_orweb">Orfoxu quraşdırın</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> diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 0226399a..276c4216 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -111,9 +111,7 @@ <string name="pref_disable_network_title">Аўтазасынанне без сеткі</string> <string name="pref_disable_network_summary">Пераводзіць Tor у спячы рэжым пры немені інтэрнэту</string> <string name="newnym">Вы перамкнуліся на новы ідэнтыфікатар 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> + <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> @@ -143,8 +141,7 @@ <string name="apps_mode">VPN-рэжым</string> <string name="send_email">Адправіць ліст</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Вы можаце атрымаць адрас моста па электроннай пошце, з сайта ці шляхам сканавання QR-кода. Абярыце \"Эл. пошта\" ці \"Сайт\" ніжэй, каб запытаць адрас моста.\n\nАтрыманы адрас скапіюйце і ўстаўце яго ў падзеле налад Orbot \"Масты\", пасля чаго перазапусціце дадатак.</string> - <string name="install_orweb">Усталяваць Orfox</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> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index d96afb17..c7de4e8f 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -106,7 +106,6 @@ <string name="pref_disable_network_title">Лиспва Автоматичен Режим на Изчакване</string> <string name="pref_disable_network_summary">Сложи Tor в режим на изчакване, когато няма интернет</string> <string name="newnym">Сменихте своята Тор идентичност!</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> @@ -135,7 +134,6 @@ <string name="activate">Активирай</string> <string name="send_email">Изпрати имейл</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Можеш да получиш адреса на мост по имейл, интернет или като сканираш QR kod. Избери \'Имейл\' или \'Интернет\' по-долу, за да поискаш адрес на мост.\n\nВеднъж щом получиш адреса го копирай в \"Мостове\", в настройките на Orbot и рестартирай приложението.</string> - <string name="install_orweb">Инсталирай Orfox</string> <string name="hidden_services">Скрити услуги</string> <string name="title_activity_hidden_services">Скрити услуги</string> <string name="menu_hidden_services">Скрити услуги</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 65cd0597..d296131d 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">S\'està actualitzant la configuració als serveis del Tor</string> @@ -143,7 +141,6 @@ <string name="apps_mode">Mode VPN</string> <string name="send_email">Envia correu-e</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Podeu obtenir un enllaç pont mitjançant el correu electrònic, el web o escanejant un codi QR. Trieu Correu-e o Web a sota per demanar una adreça.\n\nQuan tingueu un enllaç d\'aquest tipus, copieu-ho i enganxeu-ho a l\'apartat «Ponts» de la configuració de l\'Orbot i reinicieu.</string> - <string name="install_orweb">Instal·la l\'Orfox</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> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 87aae913..c333b4c7 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -133,7 +133,6 @@ <string name="activate">Aktivovat</string> <string name="send_email">Pošli email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Abresu bridge můžete získat emailem, na webu, nebo naskenováním bridge QR kódu. Zvolte níže \'Email\', nebo \'Web\' pro vyžádání adresy bridge.\n\nJakmile máte adresu, zkopírujte & vložte ji do položky \"Bridge\" v nastavení Orbot a restartujte aplikaci.</string> - <string name="install_orweb">Instalovat Orfox</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> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 8f313dfc..bf416e95 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">Aktualisiere Einstellungen für den Tor-Dienst</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN Modus</string> <string name="send_email">E-Mail senden</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Sie können eine Brücken-Adresse per E-Mail, im Web oder per Scan eines BrückenQR-Codes erhalten. Wählen Sie unten \'E-Mail\' oder \'Web\', um eine Brückenadresse anzufordern.\n\nSobald Sie eine Adresse haben, fügen Sie diese bei den Einstellungen für Brücken ein und starten Sie Orbot neu.</string> - <string name="install_orweb">Installiere Orfox</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> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5f294870..140ae79a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -111,9 +111,7 @@ <string name="pref_disable_network_title">Χωρίς Αυτόματη Αναστολή Δικτύου</string> <string name="pref_disable_network_summary">Θέσε το Tor σε λειτουργία sleep όταν δεν υπάρχει διαθέσιμη σύνδεση Ιnternet</string> <string name="newnym">Έχετε αλλάξει επιτυχώς την ταυτότητα σας στο 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> + <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> @@ -143,7 +141,6 @@ <string name="apps_mode">Λειτουργία VPN</string> <string name="send_email">Στείλτε Email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Μπορείτε να πάρετε μια διεύθυνση γέφυρας μέσω ηλεκτρονικού ταχυδρομείου, στον ιστό ή με τη σάρωση κώδικα QR γέφυρας. Επιλέξτε \'Email\' ή \'Web\' παρακάτω για να ζητήσετε μια διεύθυνση γέφυρας.\n\nΌταν έχετε μια διεύθυνση, αντιγράψτε το & επικολλήστε το στην προτίμηση \"Bridges\" στη ρύθμιση του Orbot και επανεκκινήστε.</string> - <string name="install_orweb">Εγκατάσταση Orfox</string> <string name="vpn_default_world">Παγκόσμια (Auto)</string> <string name="hidden_services">Αποκρυφες υπηρεσιες</string> <string name="title_activity_hidden_services">Αποκρυφες υπηρεσιες</string> diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index a7bb0002..f8af8019 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -112,8 +112,7 @@ <string name="get_bridges_email">Email</string> <string name="get_bridges_web">Web</string> <string name="activate">Activar</string> - <string name="install_orweb">Instalar Orfox</string> - <string name="save">Guardar</string> + <string name="save">Guardar</string> <string name="name">Nombre</string> <string name="disable">Deshabilitar</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1dc70d25..dd25a163 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -112,9 +112,7 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <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="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="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> @@ -144,7 +142,6 @@ direcciones (o rangos). No prevalecen sobre las configuraciones de exclusión de <string name="apps_mode">Modo VPN</string> <string name="send_email">Enviar correo</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Puede obtener una dirección de bridge (repetidor puente) a través de correo electrónico, la web, o escaneando un código QR de bridge. Seleccione \'Correo\' o \'Web\' debajo para solicitar una dirección de bridge.\n\nUna vez tenga una dirección, copie y péguela en la opción \"Bridges\" de la configuración de Orbot, y reinicie.</string> - <string name="install_orweb">Instalar Orfox</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> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index cd8b65f5..c0138fe6 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">Tor zerbitzuaren ezarpenak eguneratzen</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN modua</string> <string name="send_email">Bidali E-maila</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Zubi helbide bat lortu dezakezu e-mail eta web bidez edo QR kode bat eskaneatuz. Hautatu \'E-mail\' edo \'Web\' behean zubi helbide bat eskatzeko.\n\nBehin helbide bat duzula, kopiatu eta itsatsi ezazu Orbot ezarpenetako \"Zubiak\" atalean eta berrabiarazi.</string> - <string name="install_orweb">Instalatu Orfox</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> diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 322f3c9f..b92f338f 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -111,8 +111,6 @@ <string name="pref_disable_network_title">خاموش کردن در صورت عدم وجود شبکه</string> <string name="pref_disable_network_summary">در صورتی که شبکه وجود نداشته باشد خاموش شود</string> <string name="newnym">شما به شناسه جدید تور منتقل شدید</string> - <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">اوربات بهترین کارایی را با مرورگر اورفاکس دارد. اورفاکس نصب شود؟</string> - <string name="install_apps_">نصب مرورگر؟</string> <string name="no_network_connectivity_putting_tor_to_sleep_">ارتباط شبکه ای وجود ندارد. تور به حالت خواب می رود</string> <string name="network_connectivity_is_good_waking_tor_up_">ارتباط شبکه ای خوب است. تور را بیدار نمایید...</string> <string name="updating_settings_in_tor_service">به روز رسانی تنظیمات در سرویس Tor</string> @@ -143,7 +141,6 @@ <string name="apps_mode">حالت VPN</string> <string name="send_email">ایمیل بفرست</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">می توانید آدرس bridge را از طریق ایمیل٬ وب یا با اسکن کردن bridge QR code بدست آورید. ایمیل یا وب پایین را برای درخواست آدرس bridge انتخاب کنید.\n\n وقتی آدرس را دارید آن را کپی کنید و برگردانید در اولویت های Bridges در تنظیمات اربت و آن را دوباره راه اندازی کنید.</string> - <string name="install_orweb">نصب Orfox</string> <string name="vpn_default_world">جهانی (خودکار)</string> <string name="hidden_services">سرویس‌های مخفی</string> <string name="title_activity_hidden_services">سرویس‌های مخفی</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 383ced72..53c47265 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -134,8 +134,7 @@ <string name="activate">Ota käyttöön</string> <string name="send_email">Lähetä sähköpostia</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Voit saada sillan osoitteen sähköpostin kautta, verkkosivulta tai skannaamalla sillan QR-koodin. Valitse \'Sähköposti\' tai \'Verkkosivu\' alta pyytääksesi sillan osoitetta.\n\nKun sinulla on osoite, kopioi & liitä se \"Sillat\" -kohtaan Orbotin asetuksissa ja käynnistä uudelleen.</string> - <string name="install_orweb">Asenna Orfox</string> - <string name="hidden_services">Piilopalvelut</string> + <string name="hidden_services">Piilopalvelut</string> <string name="title_activity_hidden_services">Piilopalvelut</string> <string name="menu_hidden_services">Piilopalvelut</string> <string name="save">Tallenna</string> diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index ed9be382..ec082972 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -134,7 +134,6 @@ <string name="activate">Activer</string> <string name="send_email">Envoyer un courriel</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Vous pouvez obtenir une adresse de pont par courriel, par le Web ou en balayant le code QR d’un pont. Choisissez *Courriel* ou *Web* ci-dessous pour demander une adresse de pont.\n\nUne fois que vous avez une adresse, copiez & collez-la dans le champ « Ponts » des paramètres d’Orbot et redémarrez.</string> - <string name="install_orweb">Installer Orfox</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> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0bb9151e..2c163e96 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -111,9 +111,7 @@ <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="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="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> @@ -143,7 +141,6 @@ <string name="apps_mode">Mode RPV</string> <string name="send_email">Envoyer un courriel</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Vous pouvez obtenir une adresse de pont par courriel, par le Web ou en balayant le code QR d’un pont. Choisissez *Courriel* ou *Web* ci-dessous pour demander une adresse de pont.\n\nUne fois que vous avez une adresse, copiez & collez-la dans le champ « Ponts » des paramètres d’Orbot et redémarrez.</string> - <string name="install_orweb">Installer Orfox</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> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index a2781bfe..28b1e619 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -111,9 +111,7 @@ <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="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="no_network_connectivity_putting_tor_to_sleep_">Sen conexión a rede. Tor agardando...</string> <string name="network_connectivity_is_good_waking_tor_up_">A conexión a rede é boa. Espertando a Tor...</string> <string name="updating_settings_in_tor_service">actualizando axustes no servizo Tor</string> <string name="pref_socks_title">SOCKS de Tor</string> @@ -143,7 +141,6 @@ <string name="apps_mode">Modo VPN</string> <string name="send_email">Enviar correo</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Pode obter un enderezo de ponte a través de correo electrónico, na web ou escaneando o código QR de unha ponte. Escolla abaixo \'Correo-e\' ou \'Web\' para solicitar un enderezo de ponte.\n\nUnha vez teña un enderezo, cópieo e pégueo no axuste \"Pontes\" na configuración de Orbot e reinicie.</string> - <string name="install_orweb">Instalar Orfox</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> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 790a1186..8959f31c 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -111,9 +111,7 @@ <string name="pref_disable_network_title">אין שינה אוטומטית של רשת</string> <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string> <string name="newnym">החלפת אל זהות 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> + <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> @@ -143,7 +141,6 @@ <string name="apps_mode">מצב VPN</string> <string name="send_email">שלח דוא\"ל</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">אתה יכול להשיג כתובת גשר באמצעות דוא\"ל, הרשת או ע\"י סריקת קוד QR של גשר. בחר \'דוא\"ל\' או \'רשת\' למטה כדי לבקש כתובת גשר.\n\nברגע שיש לך כתובת, העתק והדבק אותה לתוך ההעדפה \"גשרים\" בהגדרות Orbot והפעל מחדש.</string> - <string name="install_orweb">התקן Orfox</string> <string name="vpn_default_world">עולמי (אוטומטי)</string> <string name="hidden_services">שירותים נסתרים</string> <string name="title_activity_hidden_services">שירותים נסתרים</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 857a0009..e85f9f9c 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -112,9 +112,7 @@ <string name="pref_disable_network_title">कोई नेटवर्क ऑटो-स्लीप नहीं</string> <string name="pref_disable_network_summary">जब कोई इंटरनेट उपलब्ध नहीं है तो तोर को सोएं</string> <string name="newnym">आपने एक नई टोरी पहचान को बदल दिया है!</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="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> @@ -144,7 +142,6 @@ <string name="apps_mode">वीपीएन मोड</string> <string name="send_email">ईमेल भेजें</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">आप ईमेल, वेब के माध्यम से या एक पुल क्यूआर कोड को स्कैन करके एक पुल का पता मिल सकती है। एक पुल का पता अनुरोध करने के लिए \'ईमेल\' या \'वेब\' नीचे का चयन करें। एक बार जब आप एक पता है, कॉपी और यह Orbot की सेटिंग और पुनः आरंभ में \"पुल\" वरीयता में पेस्ट करें।</string> - <string name="install_orweb">ओरफोक्स को इनस्टॉल करे </string> <string name="vpn_default_world">ग्लोबल (ऑटो)</string> <string name="hidden_services">हिडन सेवाएं</string> <string name="title_activity_hidden_services">हिडन सेवाएं</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index e9869516..deb23402 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -134,8 +134,7 @@ <string name="activate">Aktiviraj</string> <string name="send_email">Pošalji email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Možete dobiti adrese mostova kroz email, web ili skeniranjem QR koda. Odaberite \'Email\' ili \'Web\' niže da zatražite adresu mosta.\n\nJednom kad imate adresu, kopirajte i zalijepite ju u \"Mostovi\" postavku Orbot-a i ponovno ga pokrenite.</string> - <string name="install_orweb">Instaliraj Orfox</string> - <string name="save">Spremi</string> + <string name="save">Spremi</string> <string name="name">Ime</string> <string name="please_restart_Orbot_to_enable_the_changes">Ponovno pokrenite Orbot da bi omogućili promjene</string> </resources> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 9529e05b..b7d126be 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -111,9 +111,7 @@ <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="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="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> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN Mód</string> <string name="send_email">Email küldése</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Kaphatsz egy híd-címet emailen, weben keresztül vagy a híd QR kódjának beszkennelésével. Válaszd az \'Email\'-t vagy a \'Web\'-et alább a híd-cím kéréséhez.\n\nAmikor már van egy címed, másold & illeszd be \"Hidak\" preferenciákba az Orbot beállításaiban és indítsd újra.</string> - <string name="install_orweb">Orweb telepítése</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> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 7c801f8c..7dda908a 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -134,7 +134,6 @@ <string name="activate">Aktivasi</string> <string name="send_email">Kirim Email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string> - <string name="install_orweb">Pasang Orfox</string> <string name="save">Simpan</string> <string name="name">Nama</string> <string name="done">Selesai!</string> diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 0781709b..02e0ecd9 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -134,6 +134,5 @@ <string name="activate">Aktivasi</string> <string name="send_email">Kirim Email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Anda bisa mendapatkan alamat bridge melalui email, halaman web atau dengan memindai kode QR bridge tersebut. Pilih \'Email\' atau \'Laman\' di bawah untuk meminta alamat bridge. Setelah anda mendapatkannya, salin lalu tempel di pilihan \"Bridges\" pada setting Orbot lalu start ulang.</string> - <string name="install_orweb">pasang Orfox</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-is/strings.xml b/app/src/main/res/values-is/strings.xml index 653549bb..abc9b055 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">uppfæri stillingar í Tor þjónustu</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN-hamur</string> <string name="send_email">Senda tölvupóst</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Þú getur fengið vistfang brúar sent í gegnum tölvupóst, vefinn eða með að skanna QR-kóða fyrir brú. Veldu \'Tölvupóstur\' eða \'Vefur\' fyrir neðan til að óska eftir vistfangi brúar.\n\nÞegar þú kominn með vistfang, afritaðu & límdu það inn í stillingar fyrir \'Brýr\' í kjörstillingum Orbot og endurræstu síðan.</string> - <string name="install_orweb">Uppsetning Orfox</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> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 62e8da41..ac115146 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">aggiornamento impostazioni nel servizio Tor</string> @@ -143,7 +141,6 @@ <string name="apps_mode">Modalità VPN</string> <string name="send_email">Invia email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Tu poi ricevere un indirizzo bridge via email, web o scansionando un codice QR. Seleziona \'Email\' o \'Web\' per richiedere un indirizzo bridge.\n\nUna volta che hai un indirizzo, copialo & incollalo nell\'opzione \"Bridges\" delle impostazioni di Orbot e riavvialo.</string> - <string name="install_orweb">Installa Orfox</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> diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index d0c716c4..5f5946ab 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -92,8 +92,7 @@ <string name="no_internet_connection_tor">אין חיבור לאינטרנט; תור ממתין...</string> <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string> <string name="newnym">החלפת אל זהות Tor חדשה!</string> - <string name="install_apps_">להתקין אפליקציה?</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> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 50797fbb..1c77cf96 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -111,8 +111,6 @@ <string name="pref_disable_network_title">ネットワークなし時オートスリープ</string> <string name="pref_disable_network_summary">ネット接続がない時 Tor をスリープさせる</string> <string name="newnym">新たな 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> <string name="network_connectivity_is_good_waking_tor_up_">ネットワーク接続は良好です。Torを有効にします…</string> <string name="updating_settings_in_tor_service">Torサービスの設定を更新中</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN モード</string> <string name="send_email">メール送信</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">あなたは、メール、ウェブを介して、またはブリッジQRコードをスキャンしてブリッジアドレスを取得することができます。ブリッジアドレスを要求するため、下の「メール」または「ウェブ」を選択してください。\n\nアドレスを入手したら、それをOrbot設定の「ブリッジ」設定にコピー& 貼り付けして、Orbotを再起動します。</string> - <string name="install_orweb">Orfoxをインストール</string> <string name="vpn_default_world">世界中 (自動)</string> <string name="hidden_services">Hidden Services</string> <string name="title_activity_hidden_services">Hidden Services</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 0de0e3a2..2e4f3848 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -134,7 +134,6 @@ <string name="activate">활성화</string> <string name="send_email">이메일 보내기</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">브릿지 주소를 이메일이나 QR코드를 통해 얻을 수 있습니다. 아래의 \"이메일\"이나 \"웹\"을 터치해 브릿지 주소를 요청하세요.\n\n주소를 얻었다면, 설정의 \"브릿지\" 항목에 복사 & 붙여넣기한 뒤 Orbot을 재시작하세요.</string> - <string name="install_orweb">Orfox 설치</string> <string name="save">저장</string> <string name="name">Name</string> <string name="please_restart_Orbot_to_enable_the_changes">변경을 완료하려면 Orbot을 재시작하세요</string> diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 327e1f6b..5196b05e 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -134,7 +134,6 @@ <string name="activate">Aktivizēt</string> <string name="send_email">Nosūtīt e-pastu</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Jūs varat saņemt tiltu adreses e-pastā, tīmeklī vai skenējot tiltu QR kodu. Zemāk atlasiet „E-pasts” vai „Tīmeklis”, lai pieprasītu tiltu adreses. Kad esat saņēmis adreses, tad tās iekopējiet un ielīmējiet Orbot iestatījumu preferencēs „Tilti” un pārstartējiet.</string> - <string name="install_orweb">Instalēt Orfox</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> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index afb79259..9f28c462 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -111,8 +111,6 @@ <string name="pref_disable_network_title">Нема Автоматско-спиење на мрежата</string> <string name="pref_disable_network_summary">Ставете го Тор на режим на спиење кога Интернетот не е достапен</string> <string name="newnym">Се префрливте на нов идентитет на 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> <string name="network_connectivity_is_good_waking_tor_up_">Мрежното поврзување е добро. Tor се буди...</string> <string name="updating_settings_in_tor_service">ажурирање на поставките во Tor сервисот </string> @@ -143,8 +141,7 @@ <string name="apps_mode">VPN мод</string> <string name="send_email">Испратете е-пошта</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Aдреса на мостови можете да добивате преку е-пошта, веб или со скенирање на QR кодот на мостот. Изберете подолу \'Е-пошта\' или \'Web\', за да побарате адреса за мостот. \n\nОткако ќе ја добиете адресата, копирајте ја & и залепете ја во делот \"Мостови\" во подесувањето на Orbot и повторно стартувајте.</string> - <string name="install_orweb">Инсталирај Orfox</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> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index a4f4aacc..3e6e390c 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -108,8 +108,7 @@ <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="install_apps_">Installer nettleser?</string> - <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Tor går i dvale…</string> + <string name="no_network_connectivity_putting_tor_to_sleep_">Ingen nettverkstilkobling. Tor går i dvale…</string> <string name="network_connectivity_is_good_waking_tor_up_">Nettverkstilkoblingen er bra. Vekker opp Tor…</string> <string name="updating_settings_in_tor_service">Oppdaterer innstillinger i Tor service</string> <string name="pref_socks_title">Tor-SOCKS</string> @@ -138,7 +137,6 @@ <string name="apps_mode">VPN-modus</string> <string name="send_email">Send e-post</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Du kan få en bro-adresse på e-post, gjennom nettet eller ved å skanne en bro-QR-kode. Velg \'E-post\' eller \'Nett\' nedenfor for å forespørre en broadresse.\n\nNår du har en adresse, kopier og lim den inn i \"Broer\" i Orbots innstillinger og start på ny.</string> - <string name="install_orweb">Installer Orfox</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> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b74ccddf..900b6bd7 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">instellingen in Tor-dienst worden bijgewerkt</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN-modus</string> <string name="send_email">E-mail versturen</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Je kan een bridge-adres verkrijgen door e-mail, het web of door een bridge-QR-code te scannen. Kies \'E-mail\' of \'Web\' hieronder om een bridge-adres aan te vragen.\n\nEenmaal je een adres hebt kopieer en plak je het in de \"Bridges\"-optie in de Orbot-instellingen, waarna je Orbot herstart.</string> - <string name="install_orweb">Orfox installeren</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> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2ff7f67b..ae138544 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -106,7 +106,6 @@ <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="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> @@ -136,7 +135,6 @@ <string name="apps_mode">Tryb VPN</string> <string name="send_email">Wyślij Email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Możesz uzyskać adres Bridge poprzez email, internet, lub poprzez zeskanowanie kodu QR. Wybierz \'Email\' lub \'Internet\' poniżej, aby poprosić o adres bridge\'a.\n\nJak już będziesz mieć ten adres to skopiuj i wklej go do \"Bridges\" we właściwościach Orbota a następnie go zrestartuj.</string> - <string name="install_orweb">Zainstaluj Orfox</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> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index a5217f0d..1528f42d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -111,9 +111,7 @@ <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="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="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> @@ -143,7 +141,6 @@ <string name="apps_mode">Modo VPN</string> <string name="send_email">Enviar Email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Você pode obter um endereço de ponte através de e-mail, web ou lendo um código QR ponte. Selecione \'E-mail\' ou \'Web\' abaixo para solicitar uma ponte endereço. \n\nUma vez que você tem um endereço, copie & colá-lo na \"Bridges\" preferência na configuração e reiniciar do Orbot.</string> - <string name="install_orweb">Instalar Orfox</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> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 00c5e6b1..94275288 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -59,7 +59,6 @@ <string name="get_bridges_web">Web</string> <string name="activate">Ativar</string> <string name="send_email">Enviar Mensagem</string> - <string name="install_orweb">Instalar Orfox</string> <string name="save">Guardar</string> <string name="name">Nome</string> <string name="done">Concluído!</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index caf7c35f..c763c809 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -134,7 +134,6 @@ <string name="activate">Activează</string> <string name="send_email">Trimite email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Poţi primi o adresă de punte prin email,web sau prin scanarea codului de punte QR.Selectează ”Email” sau ”Web” de mai jos pentru a primi adresa de punte.\n\nCând ai primit adresa,copiaz-o şi introdu-o în preferinţele de PUNŢI din setările Orbot şi mai apoi reporniţi. </string> - <string name="install_orweb">Instalează Orfox</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> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 682e4673..549387d0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -111,9 +111,7 @@ <string name="pref_disable_network_title">Автозасыпание без сети</string> <string name="pref_disable_network_summary">Переводить Tor в спящий режим при отсутствии интернета</string> <string name="newnym">Вы переключились на новый идентификатор 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> + <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> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN-режим</string> <string name="send_email">Отправить письмо</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Вы можете получить адрес моста по электронной почте, с сайта или путём сканирования QR-кода. Выберите \"Эл. почта\" или \"Сайт\" ниже, чтобы запросить адрес моста.\n\nПолученный адрес скопируйте и вставьте его в разделе настроек Orbot \"Мосты\", после чего перезапустите приложение.</string> - <string name="install_orweb">Установить Orfox</string> <string name="vpn_default_world">Мир (авто)</string> <string name="hidden_services">Скрытые службы</string> <string name="title_activity_hidden_services">Скрытые службы</string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index a6be0788..8877c736 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -134,7 +134,6 @@ <string name="activate">Aktivovať</string> <string name="send_email">Poslať email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Môžete získať adresu premostenia cez email, web, alebo naskenovaním QR kódu premostenia. Vyberte \'Email\' alebo \'Web\' nižšie pre vyžiadanie adresy premostenia.\n\nAkonáhle budete mať adresu, skopírujte a vložte ju do nastavení \"Premostenia\" v nastaveniach Orbot a reštartujte ho.</string> - <string name="install_orweb">Inštalovať Orfox</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> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index cb93b44e..bc373863 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -109,8 +109,6 @@ <string name="pref_disable_network_title">Без Мреже Auto-Sleep</string> <string name="pref_disable_network_summary">Умири Тор када је недоступан интернет</string> <string name="newnym">Прешли сте на нови Тор идентитет!</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> <string name="updating_settings_in_tor_service">ажурирање подешавања Тор мреже</string> @@ -141,7 +139,6 @@ <string name="apps_mode">VPN Мод</string> <string name="send_email">Пошаљи Е-пошту</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Можете добити bridge адресу преко е-поште. на web-у или скенирањем bridge QR кода. Одабери \'E-пошта\' или \'Web\' испод да би сте затражили bridge адресу.\n\nЈедном када добијете адресу. копирај& налепи је у \"Bridges\" преференцији у Орбот подешавањима и поново покрените.</string> - <string name="install_orweb">Инсталирати Орфокс</string> <string name="vpn_default_world">Глобално (Аутоматски)</string> <string name="hidden_services">Скривени Сервиси</string> <string name="title_activity_hidden_services">Скривени Сервиси</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 609865dc..350da961 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -111,8 +111,6 @@ <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="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> <string name="updating_settings_in_tor_service">uppdaterar inställningar i Tor-tjänsten</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN-läge</string> <string name="send_email">Skicka e-post</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Du kan få en brygg-adress via e-post, via webben eller genom att skanna en QR-kod för en brygga. Välj \'E-post\' eller \'Webb\' nedan för att begära en brygg-adress.\n\nNär du väl har en adress, kopiera & klistra in den i inställningen för \"Bryggor\" i Orbot och starta om.</string> - <string name="install_orweb">Installera Orfox</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> diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index bb1cbf7c..402e9f59 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -35,7 +35,6 @@ <string name="error">பிழை</string> <string name="bridges">Bridgeகள்</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> diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 33740121..9effbcc6 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -111,8 +111,6 @@ <string name="pref_disable_network_title">ไม่พบเครือข่าย พักการใช้งานอัตโนมัติ</string> <string name="pref_disable_network_summary">พักการใช้งาน Tor เมื่อไม่มีอินเทอร์เน็ต</string> <string name="newnym">คุณได้เปลี่ยนมาใช้ตัวตน 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> <string name="network_connectivity_is_good_waking_tor_up_">การเชื่อมต่อเสถียร เปิดใช้งาน Tor...</string> <string name="updating_settings_in_tor_service">ปรับปรุงการตั้งค่าในบริการ Tor</string> @@ -143,7 +141,6 @@ <string name="apps_mode">โหมด VPN</string> <string name="send_email">ส่งอีเมล</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">คุณสามารถรับที่อยู่ของ Bridge ได้โดยผ่านอีเมล เว็บ หรือการสแกนรหัสคิวอาร์ของ Bridge เลือก \'อีเมล\' หรือ \'เว็บ\' ด้านล่างเพื่อขอที่อยู่ของ Bridge\n\nเมื่อคุณได้ที่อยู่แล้ว ให้คัดลอก & วางลงในการปรับแต่งลักษณะของ \"Bridge\" ในการตั้งค่าของ Orbit และเริ่มการทำงานใหม่</string> - <string name="install_orweb">ติดตั้ง Orfox</string> <string name="vpn_default_world">ส่วนรวม (อัตโนมัติ)</string> <string name="hidden_services">บริการที่ซ่อน</string> <string name="title_activity_hidden_services">บริการที่ซ่อน</string> diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index 853866dc..7a8edf1c 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -112,7 +112,6 @@ <string name="get_bridges_web">Web</string> <string name="activate">Activate</string> <string name="send_email">Send Email</string> - <string name="install_orweb">I-install ang Orfox</string> <string name="save">I-save</string> <string name="name">Name</string> </resources> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b99672e8..e100a10b 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -111,9 +111,7 @@ <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="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> + <string name="no_network_connectivity_putting_tor_to_sleep_">Herhangi bir ağ bağlantısı yok. Tor uyutuluyor...</string> <string name="network_connectivity_is_good_waking_tor_up_">Ağ bağlantısı iyi. Tor uyandırılıyor... </string> <string name="updating_settings_in_tor_service">Tor hizmet ayarları güncelleniyor</string> <string name="pref_socks_title">Tor SOCKS</string> @@ -143,8 +141,7 @@ <string name="apps_mode">VPN Kipi</string> <string name="send_email">E-posta Gönder</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Köprü adresini e-posta, web ya da QR kodu ile edinebilirsiniz. Köprü adresini istemek için aşağıdan \'E-posta\' ya da \'Web\' seçeneğini seçin. \n\nAdresi edindikten sonra kopyalayıp Orbot ayarlarındaki \"Köprüler\" alanına kopyalayın ve Orbot uygulamasını yeniden başlatın.</string> - <string name="install_orweb">Orfox Kurulsun</string> - <string name="vpn_default_world">Genel (Otomatik)</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> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index aca5a26c..a103899a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -111,8 +111,6 @@ <string name="pref_disable_network_title">Не використовувати режим сну</string> <string name="pref_disable_network_summary">Переводити в режим сну при відсутності інтернет-з\'єднання</string> <string name="newnym">Ви перемкнулись на новий ідентифікатор 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> <string name="network_connectivity_is_good_waking_tor_up_">Доступ до мережі хороший. Tor виходить з режиму сну…</string> <string name="updating_settings_in_tor_service">оновлення налаштувань у сервісі Tor</string> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN Спосіб</string> <string name="send_email">Надіслати листа</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Ви можете отримати адресу мосту через електронну пошту, веб або відсканувавши QR-код мосту. Оберіть «Email» чи «Веб» унизу, щоб подати запит на адресу мосту.\n\nКоли у Вас буде адреса, скопіюйте і вставте її у розділі «Мости» налаштувань Orbot і перезапустіть його.</string> - <string name="install_orweb">Встановити Orfox</string> <string name="vpn_default_world">Глобальний (автоматичний)</string> <string name="hidden_services">Приховані Послуги</string> <string name="title_activity_hidden_services">Приховані Послуги</string> diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml index 2ae0bcfa..470ee983 100644 --- a/app/src/main/res/values-uz/strings.xml +++ b/app/src/main/res/values-uz/strings.xml @@ -28,7 +28,6 @@ <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> + <string name="save">Saqlash</string> <string name="name">Ism</string> </resources> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 972869f3..d6945b59 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -134,7 +134,6 @@ <string name="activate">Kích hoạt</string> <string name="send_email">Gửi email</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">Bạn có thể lấy một địa chỉ bridge qua email, web hoặc quét mã QR. Chọn \"Email\" hoặc \"Web\" bên dưới để yêu cầu một địa chỉ bridge.\n\nMột khi đã có địa chỉ, hãy sao chép nó vào thiết đặt \"Bridge\" trong cài đặt Orbot rồi khởi động lại phần mềm.</string> - <string name="install_orweb">Cài đặt Orfox</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> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index c7b18981..33fb0153 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -136,7 +136,6 @@ <string name="send_email">发送电子邮件</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">您可以通过电子邮件、网页或扫描网桥QR码来获取网桥地址。点击下方的“电子邮件”或“网页”按钮来获取网桥地址。当您获取到网桥地址后，请将其复制并粘贴到Orbot设置中的“网桥”一项并重新启动</string> - <string name="install_orweb">安装 Orfox</string> <string name="save">保存</string> <string name="name">名称</string> <string name="please_restart_Orbot_to_enable_the_changes">请重启 Orbot 以使变更生效</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3e0315ea..7d39bccf 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -111,8 +111,6 @@ <string name="pref_disable_network_title">無網路時自動休眠</string> <string name="pref_disable_network_summary">當沒有網路可用時，讓 Tor 休眠</string> <string name="newnym">您已切換到新的 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="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> @@ -143,7 +141,6 @@ <string name="apps_mode">VPN 模式</string> <string name="send_email">寄送電子信件</string> <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">您可以透過 email 取得網橋位址，或者在網際網路上搜尋，或者掃描網橋的 QR 碼。在下面選擇 \'Email\' 或者 \'Web\' 來取得網橋位址。\n\n取得網橋位址後，將它複製貼上到｢網橋｣的設定項中，然後重新啟動 Orbot。</string> - <string name="install_orweb">安裝 Orfox</string> <string name="vpn_default_world">全域(自動)</string> <string name="hidden_services">隱藏服務</string> <string name="title_activity_hidden_services">隱藏服務</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1e0b85c5..c86f0f0c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -126,8 +126,6 @@ <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="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> <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> @@ -184,8 +182,6 @@ <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy & paste it into the \"Bridges\" preference in Orbot\'s settings and restart.</string> - <string name="install_orweb">Install Orfox</string> - <string name="vpn_default_world">Global (Auto)</string> <string name="hidden_services">Onion Services</string> <string name="title_activity_hidden_services">Onion Services</string> diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index 8898439e..14210483 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -8,8 +8,7 @@ import android.content.Intent; public interface TorServiceConstants { String TOR_APP_USERNAME = "org.torproject.android"; - String BROWSER_APP_USERNAME = "info.guardianproject.orfox"; - + //String DIRECTORY_TOR_BINARY = "bin"; String DIRECTORY_TOR_DATA = "data";

1 0

[orbot/master] reset default ports to 9050, 8118 but make them dynamic if needed
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 814fbb31a58bbcfa4863376354366ac4f974fcd0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Jun 18 14:48:59 2019 -0400 reset default ports to 9050, 8118 but make them dynamic if needed - ports will be checked and if not available, increment +1 - new setting add to allow static setting of http port value --- app/src/main/res/values/strings.xml | 4 ++ app/src/main/res/xml/preferences.xml | 10 ++++- .../torproject/android/service/OrbotConstants.java | 50 +++++++++++----------- .../org/torproject/android/service/TorService.java | 30 ++++++++++--- .../android/service/TorServiceConstants.java | 4 +- 5 files changed, 63 insertions(+), 35 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d1b28772..1e0b85c5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -136,6 +136,10 @@ <string name="pref_socks_summary">Port that Tor offers its SOCKS proxy on (default: 9050 or 0 to disable)</string> <string name="pref_socks_dialog">SOCKS Port Config</string> + <string name="pref_http_title">Tor HTTP</string> + <string name="pref_http_summary">Port that Tor offers its HTTP proxy on (default: 8118 or 0 to disable)</string> + <string name="pref_http_dialog">HTTP Port Config</string> + <string name="pref_transport_title">Tor TransProxy Port</string> <string name="pref_transport_summary">Port that Tor offers its Transparent Proxy on (default: 9040 or 0 to disable)</string> <string name="pref_transport_dialog">TransProxy Port Config</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 53aa5ecd..ac596cf3 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -244,7 +244,7 @@ <PreferenceCategory android:title="Debug"> <EditTextPreference - android:defaultValue="auto" + android:defaultValue="9050" android:dialogTitle="@string/pref_socks_dialog" android:inputType="number" android:key="pref_socks" @@ -252,6 +252,14 @@ android:title="@string/pref_socks_title" /> <EditTextPreference + android:defaultValue="8118" + android:dialogTitle="@string/pref_http_dialog" + android:inputType="number" + android:key="pref_http" + android:summary="@string/pref_http_summary" + android:title="@string/pref_http_title" /> + + <EditTextPreference android:defaultValue="auto" android:dialogTitle="@string/pref_transport_dialog" android:inputType="number" diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java index e7f09a77..0ad83f77 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java @@ -5,41 +5,41 @@ package org.torproject.android.service; public interface OrbotConstants { - public final static String TAG = "Orbot"; + String TAG = "Orbot"; - public final static String PREFS_KEY = "OrbotPrefs"; - public final static String PREFS_KEY_TORIFIED = "PrefTord"; + String PREFS_KEY = "OrbotPrefs"; + String PREFS_KEY_TORIFIED = "PrefTord"; - public final static int FILE_WRITE_BUFFER_SIZE = 2048; + int FILE_WRITE_BUFFER_SIZE = 2048; //path to check Tor against - public final static String URL_TOR_CHECK = "https://check.torproject.org"; + String URL_TOR_CHECK = "https://check.torproject.org"; - public final static String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport="; - - public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; - //public final static String PREF_BRIDGES_OBFUSCATED = "pref_bridges_obfuscated"; - public final static String PREF_OR = "pref_or"; - public final static String PREF_OR_PORT = "pref_or_port"; - public final static String PREF_OR_NICKNAME = "pref_or_nickname"; - public final static String PREF_REACHABLE_ADDRESSES = "pref_reachable_addresses"; - public final static String PREF_REACHABLE_ADDRESSES_PORTS = "pref_reachable_addresses_ports"; - public final static int RESULT_CLOSE_ALL = 0; + String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport="; + + String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; + //String PREF_BRIDGES_OBFUSCATED = "pref_bridges_obfuscated"; + String PREF_OR = "pref_or"; + String PREF_OR_PORT = "pref_or_port"; + String PREF_OR_NICKNAME = "pref_or_nickname"; + String PREF_REACHABLE_ADDRESSES = "pref_reachable_addresses"; + String PREF_REACHABLE_ADDRESSES_PORTS = "pref_reachable_addresses_ports"; + int RESULT_CLOSE_ALL = 0; - public final static String PREF_DISABLE_NETWORK = "pref_disable_network"; + String PREF_DISABLE_NETWORK = "pref_disable_network"; - public final static String PREF_TOR_SHARED_PREFS = "org.torproject.android_preferences"; + String PREF_TOR_SHARED_PREFS = "org.torproject.android_preferences"; - public final static int MAX_LOG_LENGTH = 10000; - - public final static String PREF_SOCKS = "pref_socks"; + String PREF_SOCKS = "pref_socks"; + + String PREF_HTTP = "pref_http"; - public final static String PREF_ISOLATE_DEST = "pref_isolate_dest"; + String PREF_ISOLATE_DEST = "pref_isolate_dest"; - public final static String PREF_CONNECTION_PADDING = "pref_connection_padding"; - public final static String PREF_REDUCED_CONNECTION_PADDING = "pref_reduced_connection_padding"; + String PREF_CONNECTION_PADDING = "pref_connection_padding"; + String PREF_REDUCED_CONNECTION_PADDING = "pref_reduced_connection_padding"; - public final static String PREF_PREFER_IPV6 = "pref_prefer_ipv6"; - public final static String PREF_DISABLE_IPV4 = "pref_disable_ipv4"; + String PREF_PREFER_IPV6 = "pref_prefer_ipv6"; + String PREF_DISABLE_IPV4 = "pref_disable_ipv4"; } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index f4785a0f..cbd06301 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -656,13 +656,20 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon // extraLines.append("RunAsDaemon 1").append('\n'); // extraLines.append("AvoidDiskWrites 1").append('\n'); - String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, String.valueOf(TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); + String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, (TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT)); if (socksPortPref.indexOf(':')!=-1) socksPortPref = socksPortPref.split(":")[1]; socksPortPref = checkPortOrAuto(socksPortPref); + String httpPortPref = prefs.getString(OrbotConstants.PREF_HTTP, (TorServiceConstants.HTTP_PROXY_PORT_DEFAULT)); + + if (httpPortPref.indexOf(':')!=-1) + httpPortPref = httpPortPref.split(":")[1]; + + httpPortPref = checkPortOrAuto(httpPortPref); + String isolate = ""; if(prefs.getBoolean(OrbotConstants.PREF_ISOLATE_DEST, false)) { @@ -745,17 +752,26 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon } - private String checkPortOrAuto (String port) + private String checkPortOrAuto (String portString) { - if (!port.equalsIgnoreCase("auto")) + if (!portString.equalsIgnoreCase("auto")) { - boolean isPortUsed = TorServiceUtils.isPortOpen("127.0.0.1",Integer.parseInt(port),500); + boolean isPortUsed = true; + int port = Integer.parseInt(portString); + + while (isPortUsed) { + isPortUsed = TorServiceUtils.isPortOpen("127.0.0.1", port, 500); - if (isPortUsed) //the specified port is not available, so let Tor find one instead - port = "auto"; + if (isPortUsed) //the specified port is not available, so let Tor find one instead + port++; + } + + + return port + ""; } - return port; + return portString; + } public boolean updateTorConfigCustom(File fileTorRcCustom, String extraLines) throws IOException, FileNotFoundException, TimeoutException { diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index dcbb824a..8898439e 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -61,8 +61,8 @@ public interface TorServiceConstants { // String TOR_VPN_DNS_LISTEN_ADDRESS = "127.0.0.1"; // int CONTROL_PORT_DEFAULT = 9051; - String HTTP_PROXY_PORT_DEFAULT = "auto"; // like Privoxy! - String SOCKS_PROXY_PORT_DEFAULT = "auto"; + String HTTP_PROXY_PORT_DEFAULT = "8118"; // like Privoxy! + String SOCKS_PROXY_PORT_DEFAULT = "9050"; //path to check Tor against String URL_TOR_CHECK = "https://check.torproject.org";

1 0

[orbot/master] Merge branch 'bitmold-remove_orfox'
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit e448c18b450423cca58e221dfcf30524ccb4fdf1 Merge: 656d39b7 351ef96f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 5 07:24:03 2019 -0400 Merge branch 'bitmold-remove_orfox' .../org/torproject/android/OrbotMainActivity.java | 118 ++------------------- .../android/ui/onboarding/OnboardingActivity.java | 63 ----------- app/src/main/res/drawable/orfox64.png | Bin 4142 -> 0 bytes app/src/main/res/values-ar/strings.xml | 5 +- app/src/main/res/values-ay/strings.xml | 5 +- app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 7 +- app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 3 - app/src/main/res/values-cs-rCZ/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 3 - app/src/main/res/values-el/strings.xml | 5 +- app/src/main/res/values-es-rAR/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 5 +- app/src/main/res/values-eu/strings.xml | 3 - app/src/main/res/values-fa/strings.xml | 3 - app/src/main/res/values-fi/strings.xml | 3 +- app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 5 +- app/src/main/res/values-gl/strings.xml | 5 +- app/src/main/res/values-he/strings.xml | 5 +- app/src/main/res/values-hi/strings.xml | 5 +- app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 5 +- app/src/main/res/values-id/strings.xml | 1 - app/src/main/res/values-in-rID/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 3 - app/src/main/res/values-it/strings.xml | 3 - app/src/main/res/values-iw/strings.xml | 3 +- app/src/main/res/values-ja/strings.xml | 3 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 5 +- app/src/main/res/values-nb/strings.xml | 4 +- app/src/main/res/values-nl/strings.xml | 3 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 5 +- app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 5 +- app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 3 - app/src/main/res/values-sv/strings.xml | 3 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 3 - app/src/main/res/values-tl/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 7 +- app/src/main/res/values-uk/strings.xml | 3 - app/src/main/res/values-uz/strings.xml | 3 +- app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 3 - app/src/main/res/values/strings.xml | 4 - .../android/service/TorServiceConstants.java | 3 +- 54 files changed, 29 insertions(+), 309 deletions(-)

1 0

[orbot/master] Fixes VPN Request Cancel Bugs
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 2ebd338483d29588beba30323bed0ad22ed11fcb Author: bim <dsnake(a)protonmail.com> Date: Wed Jun 26 23:12:53 2019 -0400 Fixes VPN Request Cancel Bugs - Cancelling the VPN Permission Request left the user on a blank screen. This happened on the main activity and in the onboarding flow - If on the main screen you enable VPN but then deny the permission, the switch was previously activiated despite VPN permissions being denied. --- .../org/torproject/android/OrbotMainActivity.java | 5 +- .../torproject/android/vpn/VPNEnableActivity.java | 53 +++++++++------------- 2 files changed, 25 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 59a6d89b..e280147e 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -602,7 +602,7 @@ public class OrbotMainActivity extends AppCompatActivity Prefs.putUseVpn(enable); if (enable) { - startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); + startActivityForResult(new Intent(OrbotMainActivity.this, VPNEnableActivity.class), REQUEST_VPN); } else stopVpnService(); @@ -952,8 +952,9 @@ public class OrbotMainActivity extends AppCompatActivity if (response == RESULT_OK) { sendIntentToService(TorServiceConstants.CMD_VPN); } - else + else if (response == VPNEnableActivity.ACTIVITY_RESULT_VPN_DENIED) { + mBtnVPN.setChecked(false); Prefs.putUseVpn(false); } } diff --git a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java index e883913f..c1b30c50 100644 --- a/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java +++ b/app/src/main/java/org/torproject/android/vpn/VPNEnableActivity.java @@ -24,20 +24,15 @@ public class VPNEnableActivity extends AppCompatActivity { private Handler h = new Handler(); @Override - public void onCreate( Bundle icicle ) { - + public void onCreate(Bundle icicle ) { requestWindowFeature(Window.FEATURE_NO_TITLE); - //getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); super.onCreate( icicle ); Log.d("VPNEnableActivity","prompting user to start Orbot VPN"); - - } - public void onResume () - { + public void onResume() { super.onResume(); if (checkVpn) @@ -53,10 +48,9 @@ public class VPNEnableActivity extends AppCompatActivity { } } - public void promptStartVpnService () - { + public void promptStartVpnService () { + // todo no actual prompting happens here and this should be refactored startVpnService(); - } private void startVpnService () @@ -88,27 +82,27 @@ public class VPNEnableActivity extends AppCompatActivity { } } - - @Override - protected void onActivityResult(int request, int response, Intent data) { - super.onActivityResult(request, response, data); + + public static final int ACTIVITY_RESULT_VPN_DENIED = 63; + + @Override + protected void onActivityResult(int request, int response, Intent data) { + super.onActivityResult(request, response, data); - if (request == REQUEST_VPN && response == RESULT_OK) - { - sendIntentToService(TorServiceConstants.CMD_VPN); - - h.postDelayed(new Runnable () { - - public void run () - { - sendIntentToService(TorServiceConstants.ACTION_START); - finish(); + if (request == REQUEST_VPN && response == RESULT_OK) { + sendIntentToService(TorServiceConstants.CMD_VPN); + h.postDelayed(new Runnable () { + @Override + public void run () { + sendIntentToService(TorServiceConstants.ACTION_START); + finish(); } }, 1000); - - - - } + } + else if (request == REQUEST_VPN && response == RESULT_CANCELED) { + setResult(ACTIVITY_RESULT_VPN_DENIED); + finish(); + } } @@ -122,8 +116,5 @@ public class VPNEnableActivity extends AppCompatActivity { { startService(torService); } - - } - }

1 0

[orbot/master] Merge pull request #234 from bitmold/vpn_request_cancel_bug_fixes
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 4a79476e47f43531fe6952952f52e42965c6cb57 Merge: b0cf7424 2ebd3384 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 5 07:25:42 2019 -0400 Merge pull request #234 from bitmold/vpn_request_cancel_bug_fixes Fixes VPN Request Cancel Bugs .../org/torproject/android/OrbotMainActivity.java | 5 +- .../torproject/android/vpn/VPNEnableActivity.java | 53 +++++++++------------- 2 files changed, 25 insertions(+), 33 deletions(-)

1 0

[orbot/master] remove minSDK from OrbotService manifest
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 43d807fdef0917944dbbe7e9df88d189907f4485 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 5 08:02:18 2019 -0400 remove minSDK from OrbotService manifest --- orbotservice/src/main/AndroidManifest.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/orbotservice/src/main/AndroidManifest.xml b/orbotservice/src/main/AndroidManifest.xml index 0f70c64b..801a9c18 100644 --- a/orbotservice/src/main/AndroidManifest.xml +++ b/orbotservice/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android.service"> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> - <uses-sdk android:minSdkVersion="16"/> </manifest>

1 0

[orbot/master] Fixes #237: Upgrade to Gradle 5.x
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 8c232f73ea2be1cba4602c603e5a3c4942eacf9b Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Jun 30 21:00:22 2019 -0700 Fixes #237: Upgrade to Gradle 5.x --- build.gradle | 2 +- gradle.properties | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- orbotservice/build.gradle | 5 +++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 8563b2eb..dd82e239 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.4.1' } } diff --git a/gradle.properties b/gradle.properties index f6a934d9..d5f3dfc4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,11 +6,10 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:… # org.gradle.parallel=true #Mon Jun 20 21:44:59 EDT 2016 -android.useDeprecatedNdk=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57678c30..9dfc5f7e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index c416f6e9..d39361f1 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -24,6 +24,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + lintOptions { + abortOnError false + } + } dependencies {

1 0

[orbot/master] Merge branch 'sisbell-sisbell_237'
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 124273fd96dba3a20a8b0f56ef56d7b313909363 Merge: 4a79476e 43d807fd Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 5 08:02:28 2019 -0400 Merge branch 'sisbell-sisbell_237' build.gradle | 2 +- gradle.properties | 3 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- orbotservice/build.gradle | 5 +++++ orbotservice/src/main/AndroidManifest.xml | 1 - 5 files changed, 8 insertions(+), 5 deletions(-)

1 0

[orbot/master] Removed Obsolete Version Checks
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 2b6abd7e659b8d3ca5fad061d4f284342ad72ab2 Author: lexi <dnsake(a)protonmail.com> Date: Fri Mar 29 13:57:00 2019 -0400 Removed Obsolete Version Checks I took out all of the version checks that considered SDK Versions that are < API Level 16 (the lowest SDK version supported by Orbot) --- .../org/torproject/android/OrbotMainActivity.java | 55 +++++----------------- .../android/service/util/CustomNativeLoader.java | 12 ++--- .../android/service/util/TorServiceUtils.java | 10 +--- 3 files changed, 19 insertions(+), 58 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 9676abc9..d1929f88 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -12,10 +12,8 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; -import java.util.List; import java.util.Locale; import java.util.StringTokenizer; -import java.util.TimerTask; import org.json.JSONArray; import org.torproject.android.service.OrbotConstants; @@ -37,7 +35,6 @@ import org.torproject.android.ui.hiddenservices.permissions.PermissionManager; import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; import org.torproject.android.vpn.VPNEnableActivity; -import android.annotation.SuppressLint; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; import android.app.AlertDialog; @@ -54,10 +51,8 @@ import android.content.SharedPreferences.Editor; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.pm.ResolveInfo; import android.database.Cursor; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Message; @@ -69,7 +64,6 @@ import android.support.v7.widget.SwitchCompat; import android.support.v7.widget.Toolbar; import android.text.Html; import android.text.TextUtils; -import android.util.AttributeSet; import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; @@ -141,16 +135,6 @@ public class OrbotMainActivity extends AppCompatActivity PulsatorLayout mPulsator; - - //this is needed for backwards compat back to Android 2.3.* - @SuppressLint("NewApi") - public View onCreateView(View parent, String name, Context context, AttributeSet attrs) - { - if(Build.VERSION.SDK_INT >= 11) - return super.onCreateView(parent, name, context, attrs); - return null; - } - private void migratePreferences() { String hsPortString = mPrefs.getString("pref_hs_ports", ""); if (hsPortString.length() > 0) { @@ -320,34 +304,21 @@ public class OrbotMainActivity extends AppCompatActivity mBtnVPN = (SwitchCompat)findViewById(R.id.btnVPN); - boolean canDoVPN = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH; + boolean useVPN = Prefs.useVpn(); + mBtnVPN.setChecked(useVPN); - if (!canDoVPN) - { - //if not SDK 14 or higher, we can't use the VPN feature - mBtnVPN.setVisibility(View.GONE); - } - else - { - boolean useVPN = Prefs.useVpn(); - mBtnVPN.setChecked(useVPN); - - //auto start VPN if VPN is enabled - if (useVPN) - { - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); - } - - mBtnVPN.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() - { - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) - { - enableVPN(isChecked); - } - }); + //auto start VPN if VPN is enabled + if (useVPN) { + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + } + + mBtnVPN.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { + enableVPN(isChecked); + } + }); - } mBtnBridges = (SwitchCompat)findViewById(R.id.btnBridges); mBtnBridges.setChecked(Prefs.bridgesEnabled()); diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java index 6e75a98e..bae4b068 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/CustomNativeLoader.java @@ -1,7 +1,6 @@ package org.torproject.android.service.util; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.os.Build; import android.util.Log; @@ -11,7 +10,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import java.util.zip.ZipInputStream; public class CustomNativeLoader { @@ -45,11 +43,9 @@ public class CustomNativeLoader { } out.close(); - if (Build.VERSION.SDK_INT >= 9) { - destLocalFile.setReadable(true, false); - destLocalFile.setExecutable(true, false); - destLocalFile.setWritable(true); - } + destLocalFile.setReadable(true, false); + destLocalFile.setExecutable(true, false); + destLocalFile.setWritable(true); return true; } catch (Exception e) { @@ -122,7 +118,7 @@ public class CustomNativeLoader { } } catch (Throwable e) { - Log.e(TAG, e.getMessage(),e); + Log.e(TAG, e.getMessage(), e); } diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java index 764bc9ec..78913a67 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/TorServiceUtils.java @@ -12,7 +12,6 @@ import java.net.Socket; import android.content.Context; import android.content.SharedPreferences; -import android.os.Build; import org.torproject.android.service.OrbotConstants; import org.torproject.android.service.TorServiceConstants; @@ -111,13 +110,8 @@ public class TorServiceUtils implements TorServiceConstants { } - public static SharedPreferences getSharedPrefs (Context context) - { - if (Build.VERSION.SDK_INT>=Build.VERSION_CODES.HONEYCOMB) - return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS); - else - return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,Context.MODE_PRIVATE); - + public static SharedPreferences getSharedPrefs (Context context) { + return context.getSharedPreferences(OrbotConstants.PREF_TOR_SHARED_PREFS,0 | Context.MODE_MULTI_PROCESS); } public static void killProcess(File fileProcBin) throws Exception {

1 0

[orbot/master] Removed Constraint Layout Dependency
by n8fr8＠torproject.org 05 Jul '19

05 Jul '19

commit 8ed080f99878f4bdec867dcc6e5521f5f3f69996 Author: lexi <dsnake(a)protonmail.com> Date: Sat Mar 23 23:28:34 2019 -0400 Removed Constraint Layout Dependency It was unused and shaves off 0.1MB from the total APK size. --- app/build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6b59a43d..e5ef358b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,11 +67,9 @@ android { } dependencies { - implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation project(':orbotservice') implementation 'com.android.support:design:28.0.0' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation 'com.github.javiersantos:AppUpdater:2.6.4' - }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2019