- tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' of gitlab.com:guardianproject/orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 68b3104ad257393d82f509a3f21d13bae15e2fee Merge: c3b64f85 84f0be7c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 10 10:52:11 2021 -0500 Merge branch 'master' of gitlab.com:guardianproject/orbot

1 0

[orbot/master] Fixed some random compiler warnings, while reading through the code.
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 80e92e9d4e0bb55a986b4dff63d225cc4a0e4134 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Tue Nov 16 13:09:21 2021 +0100 Fixed some random compiler warnings, while reading through the code. --- app/src/main/AndroidManifest.xml | 13 +++++++++---- .../java/org/torproject/android/service/OrbotService.java | 8 ++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3779e386..9e8a452a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,7 +44,8 @@ <activity android:name=".OrbotMainActivity" android:excludeFromRecents="false" - android:launchMode="singleTop"> + android:launchMode="singleTop" + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> @@ -70,8 +71,9 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> - </activity>  + </activity> +  <activity android:name=".service.util.DummyActivity" android:allowTaskReparenting="true" @@ -160,7 +162,9 @@ android:name=".core.OnBootReceiver" android:enabled="true" android:exported="true"> - <intent-filter android:directBootAware="true"> + + <intent-filter android:directBootAware="true" + tools:targetApi="n"> <action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" /> <action android:name="android.intent.action.QUICKBOOT_POWERON" /> @@ -172,7 +176,8 @@ android:name=".service.OrbotService" android:enabled="true" android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false"> + android:stopWithTask="false" + android:exported="true"> <intent-filter> <action android:name="android.net.VpnService" /> </intent-filter> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 280d26e3..2f189a08 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -74,6 +74,8 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; import IPtProxy.IPtProxy; + +import androidx.annotation.ChecksSdkIntAtLeast; import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -110,6 +112,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb public static File appBinHome; public static File appCacheHome; private final ExecutorService mExecutor = Executors.newCachedThreadPool(); + @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.LOLLIPOP) boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP; TorEventHandler mEventHandler; OrbotVpnManager mVpnManager; @@ -425,6 +428,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } + @SuppressWarnings("ResultOfMethodCallIgnored") @Override public void onCreate() { super.onCreate(); @@ -632,7 +636,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return portString; } - public boolean updateTorConfigCustom(File fileTorRcCustom, String extraLines) throws IOException, TimeoutException { + public boolean updateTorConfigCustom(File fileTorRcCustom, String extraLines) throws IOException { FileWriter fos = new FileWriter(fileTorRcCustom, false); PrintWriter ps = new PrintWriter(fos); ps.print(extraLines); @@ -1328,7 +1332,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb Bridge b = new Bridge(); b.type = st.nextToken(); - StringBuffer sbConfig = new StringBuffer(); + StringBuilder sbConfig = new StringBuilder(); while (st.hasMoreTokens()) sbConfig.append(st.nextToken()).append(' ');

1 0

[orbot/master] Merge pull request #543 from tladesignz/master
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8e5cc3a7779d8931d734cb6475fb281fdedae901 Merge: 68b3104a 80e92e9d Author: bitmold <dsnake(a)protonmail.com> Date: Thu Nov 18 11:20:30 2021 -0500 Merge pull request #543 from tladesignz/master Fixed some random compiler warnings, while reading through the code. app/src/main/AndroidManifest.xml | 13 +++++++++---- .../java/org/torproject/android/service/OrbotService.java | 8 ++++++-- 2 files changed, 15 insertions(+), 6 deletions(-)

1 0

[orbot/master] removed unused FileProvider.xml mentioned in #540
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f989be3edc5cae1e1da163f9ff40ed0d0ce01479 Author: b <dsnake(a)protonmail.com> Date: Thu Dec 9 20:08:49 2021 -0500 removed unused FileProvider.xml mentioned in #540 --- app-tv/src/main/res/xml/hidden_services_paths.xml | 4 ---- app/src/main/AndroidManifest.xml | 10 ---------- app/src/main/res/xml/hidden_services_paths.xml | 4 ---- 3 files changed, 18 deletions(-) diff --git a/app-tv/src/main/res/xml/hidden_services_paths.xml b/app-tv/src/main/res/xml/hidden_services_paths.xml deleted file mode 100644 index 073732b6..00000000 --- a/app-tv/src/main/res/xml/hidden_services_paths.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<paths xmlns:android="http://schemas.android.com/apk/res/android"> - <files-path name="hidden-services" path="hidden_services/" /> -</paths> \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9e8a452a..f9a0838c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -139,16 +139,6 @@ android:name=".ui.v3onionservice.clientauth.ClientAuthContentProvider" android:exported="false"/> - <provider - android:name="androidx.core.content.FileProvider" - android:authorities="org.torproject.android.ui.hiddenservices.storage" - android:exported="false" - android:grantUriPermissions="true"> - <meta-data - android:name="android.support.FILE_PROVIDER_PATHS" - android:resource="@xml/hidden_services_paths" /> - </provider> - <receiver android:name=".service.StartTorReceiver" android:exported="true" diff --git a/app/src/main/res/xml/hidden_services_paths.xml b/app/src/main/res/xml/hidden_services_paths.xml deleted file mode 100644 index 22485918..00000000 --- a/app/src/main/res/xml/hidden_services_paths.xml +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<paths> - <files-path name="hidden-services" path="hidden_services/" /> -</paths> \ No newline at end of file

1 0

[orbot/master] Update BUILD.md
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit afc97fe909b5bcee1f5849e7fbefcdf60ed38ba2 Author: bitmold <dsnake(a)protonmail.com> Date: Tue Dec 7 12:37:37 2021 -0500 Update BUILD.md Removed submodule that Orbot no longer has (as a git submodule), added syntax coloring --- BUILD.md | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/BUILD.md b/BUILD.md index 28b636a1..3575b117 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,8 +1,6 @@ -This document explains how to properly build an Android package of Orbot from -source. +# Building Orbot -Orbot includes, in the external directory, git repo submodules of: -- JTorControl: The Tor Control Library for Java +Orbot includes, in the external directory, git submodules of: - BadVPN - JSocks @@ -12,29 +10,33 @@ Please install the following prerequisites (instructions for each follows): - Android Native Development Kit or NDK (for C/C++ code) http://developer.android.com/sdk/ndk/index.html *(This can be installed through Android Studio's SDK Manager)* Be sure that you have all of the git submodules up-to-date: - - git submodule update --init --recursive - +```bash +git submodule update --init --recursive +``` You then need to run "ndk-build" and the following commands to compile and prepare Orbot's native code: -UNIX: - - cd orbotservice/src/main - ndk-build (located in Android/Sdk/ndk/VERSION/) - mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/libpdnsd.so - mv libs/arm64-v8a/pdnsd libs/arm64-v8a/libpdnsd.so - mv libs/x86/pdnsd libs/x86/libpdnsd.so - mv libs/x86_64/pdnsd libs/x86_64/libpdnsd.so - -Windows: - - cd orbotservice\src\main - ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) - ren libs\armeabi-v7a\pdnsd libpdnsd.so - ren libs\arm64-v8a\pdnsd libpdnsd.so - ren libs\x86\pdnsd libpdnsd.so - ren libs\x86_64\pdnsd libpdnsd.so +## UNIX based + +```bash +cd orbotservice/src/main +ndk-build #(located in Android/Sdk/ndk/VERSION/) +mv libs/armeabi-v7a/pdnsd libs/armeabi-v7a/libpdnsd.so +mv libs/arm64-v8a/pdnsd libs/arm64-v8a/libpdnsd.so +mv libs/x86/pdnsd libs/x86/libpdnsd.so +mv libs/x86_64/pdnsd libs/x86_64/libpdnsd.so +``` + +## Windows + +```bat +cd orbotservice\src\main +ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) +ren libs\armeabi-v7a\pdnsd libpdnsd.so +ren libs\arm64-v8a\pdnsd libpdnsd.so +ren libs\x86\pdnsd libpdnsd.so +ren libs\x86_64\pdnsd libpdnsd.so +``` Now build the Android app using Android Studio/gradle

1 0

[orbot/master] made setEnabled() call null safe
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit a1d04487b4e2caf5204ff03385fbdf660e356293 Author: bitmold <dsnake(a)protonmail.com> Date: Fri Dec 10 14:29:11 2021 -0500 made setEnabled() call null safe didn't see this --- .../org/torproject/android/core/ui/SettingsPreferencesActivity.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt index 04dd6266..79f00544 100644 --- a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt +++ b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt @@ -34,7 +34,7 @@ class SettingsPreferencesActivity : PreferenceActivity() { val bridgesEnabled = getSharedPreferences("org.torproject.android_preferences", MODE_MULTI_PROCESS).getBoolean("pref_bridges_enabled", false) findPreference("pref_be_a_snowflake")?.isEnabled = !bridgesEnabled - findPreference("pref_be_a_snowflake_limit").isEnabled = !bridgesEnabled + findPreference("pref_be_a_snowflake_limit")?.isEnabled = !bridgesEnabled } override fun attachBaseContext(newBase: Context) = super.attachBaseContext(LocaleHelper.onAttach(newBase)) @@ -67,4 +67,4 @@ class SettingsPreferencesActivity : PreferenceActivity() { putExtra(BUNDLE_KEY_PREFERENCES_XML, xmlPrefId) } } -} \ No newline at end of file +}

1 0

[orbot/master] return val of pluggableTransportsInstall always the same + never used
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2637e1f05b26a3c23d59e1a4e467433e449d4698 Author: b <dsnake(a)protonmail.com> Date: Fri Dec 10 00:57:44 2021 -0500 return val of pluggableTransportsInstall always the same + never used --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +- .../src/main/java/org/torproject/android/service/OrbotService.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 3853f957..e0079b94 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -804,7 +804,7 @@ public class OrbotMainActivity extends AppCompatActivity implements OrbotConstan } - + if (autoStartFromIntent) { autoStartFromIntent = false; Intent resultIntent = lastStatusIntent; diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 2f189a08..4b9a12e6 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -502,7 +502,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb return mCurrentStatus; } - private boolean pluggableTransportInstall() { + private void pluggableTransportInstall() { File fileCacheDir = new File(getCacheDir(), "pt"); if (!fileCacheDir.exists()) @@ -511,8 +511,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb IPtProxy.setStateLocation(fileCacheDir.getAbsolutePath()); String fileTestState = IPtProxy.getStateLocation(); debug("IPtProxy state: " + fileTestState); - - return false; } private File updateTorrcCustomFile() throws IOException, TimeoutException {

1 0

[orbot/master] Cleaned up About Dialog:
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit aa48f6b6a6c152157e6454c5073aaecb55c5a014 Author: bim <dsnake(a)protonmail.com> Date: Sat Nov 6 13:03:03 2021 -0400 Cleaned up About Dialog: - Gave it andorid material padding so view is centered - Removed redundant "some orbot details" string under "About" - Used consistent colors with other parts of app - Migrated hardcoded english strings to string res so dialog can be better localized --- app/src/main/res/layout/layout_about.xml | 67 +++++++++++------------------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-ay/strings.xml | 3 +- app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 3 +- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn-rBD/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs-rCZ/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-cy/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rGB/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es-rAR/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 3 +- app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt-rLT/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 3 +- app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 1 - app/src/main/res/values-ms-rMY/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro-rRO/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-si-rLK/strings.xml | 1 - app/src/main/res/values-sk-rSK/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sq/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 3 +- app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tl/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - 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 | 3 +- 66 files changed, 34 insertions(+), 116 deletions(-) diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml index 47f9e695..be4490c6 100644 --- a/app/src/main/res/layout/layout_about.xml +++ b/app/src/main/res/layout/layout_about.xml @@ -8,33 +8,24 @@ <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="15px" - android:paddingTop="15px" - android:text="@string/wizard_details" - android:textColor="#00ff00" - android:textStyle="bold" /> + android:orientation="vertical" + android:paddingLeft="?dialogPreferredPadding" + android:paddingRight="?dialogPreferredPadding"> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" android:text="@string/wizard_details_msg" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingLeft="15px" android:paddingTop="15px" - android:text="Version: " - android:textColor="#00ff00" + android:text="@string/version" + android:textColor="@color/bright_green" android:textStyle="bold" /> <TextView @@ -42,80 +33,71 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:paddingLeft="15px" android:text="- Unknown -" - android:textColor="#ffffff" /> + android:textColor="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingLeft="15px" android:paddingTop="15px" android:text="@string/project_home" - android:textColor="#00ff00" + android:textColor="@color/bright_green" android:textStyle="bold" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" android:text="@string/project_urls" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingLeft="15px" android:paddingTop="15px" android:text="@string/third_party_software" - android:textColor="#00ff00" + android:textColor="@color/bright_green" android:textStyle="bold" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" android:text="@string/tor_version" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" android:text="@string/libevent_version" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" android:text="@string/obfsproxy_version" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" android:text="@string/openssl_version" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> <TextView android:layout_width="fill_parent" android:layout_height="wrap_content" - android:paddingLeft="15px" android:paddingTop="15px" - android:text="License: " - android:textColor="#00ff00" + android:text="@string/license" + android:textColor="@color/bright_green" android:textStyle="bold" /> <TextView @@ -123,9 +105,8 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" - android:paddingLeft="15px" - android:textColor="#ffffff" - android:textColorLink="#ffffff" /> + android:textColor="@android:color/white" + android:textColorLink="@android:color/white" /> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 1cb80b23..70d9eeea 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">فحص QR الجسر</string> <string name="menu_share_bridge">مشاركة QR الجسر</string>  - <string name="wizard_details">بعض التفاصيل عن اوربوت</string>  <string name="pref_general_group">عام</string> <string name="pref_start_boot_title">شغل اوربوت عند فتح الجهاز</string> diff --git a/app/src/main/res/values-ay/strings.xml b/app/src/main/res/values-ay/strings.xml index 1fe09e38..02f84b96 100644 --- a/app/src/main/res/values-ay/strings.xml +++ b/app/src/main/res/values-ay/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Jalakipañ QR waruqaña</string> <string name="menu_share_bridge">Jalakipañ QR ch\'iqiyaña</string>  - <string name="wizard_details">Orbotxat juk\'amp yatiñataki</string> - <string name="wizard_details_msg">Orbot wakichawix inakiwa ukatx Tor ukaniwa, Obfs4Proxy, BadVPN, Tun2Socks ukhamarak LibEvent. Proxy HTTP (8118) ukhamarak mä proxy SOCKS (9050) Tor taypin utjayi. Mä rooteat atamirinx Orbotax Tor tuqiw taqpach llika yatiyäwinak apayarakispawa.</string> + <string name="wizard_details_msg">Orbot wakichawix inakiwa ukatx Tor ukaniwa, Obfs4Proxy, BadVPN, Tun2Socks ukhamarak LibEvent. Proxy HTTP (8118) ukhamarak mä proxy SOCKS (9050) Tor taypin utjayi. Mä rooteat atamirinx Orbotax Tor tuqiw taqpach llika yatiyäwinak apayarakispawa.</string>  <string name="pref_general_group">Wakiskiri</string> <string name="pref_start_boot_title">Orbot qhantaykas qalltaña</string> diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index 95d6653e..b20ed1ed 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">KörpüQR kodu skan edin</string> <string name="menu_share_bridge">KörpüQR kodu paylaşın</string>  - <string name="wizard_details">Bəzi Orbot Detalları</string>  <string name="pref_general_group">Əsas</string> <string name="pref_start_boot_title">Android Açıldıqda Orbotu Başlat</string> diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index 21727a41..69d16e7d 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Сканаваць QR-код моста</string> <string name="menu_share_bridge">Апублікаваць QR-код моста</string>  - <string name="wizard_details">Некаторыя звесткі пра праграму Orbot</string> - <string name="wizard_details_msg">Orbot — гэта праграма з адкрытым зыходным кодам, якая ўтрымоўвае Tor, Obfs4Proxy, BadVPN, Tun2Socks і LibEvent. Яно прапануе лакальны HTTP- (8118) і SOCKS-проксі (9050) у сетку Tor. Orbot таксама дазваляе на прыладах з правамі root перасылаць увесь інтэрнэт-трафік праз Tor.</string> + <string name="wizard_details_msg">Orbot — гэта праграма з адкрытым зыходным кодам, якая ўтрымоўвае Tor, Obfs4Proxy, BadVPN, Tun2Socks і LibEvent. Яно прапануе лакальны HTTP- (8118) і SOCKS-проксі (9050) у сетку Tor. Orbot таксама дазваляе на прыладах з правамі root перасылаць увесь інтэрнэт-трафік праз Tor.</string>  <string name="pref_general_group">Агульныя</string> <string name="pref_start_boot_title">Запускаць Orbot пры загрузцы</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 5377f78f..26e5d737 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Сканирай BridgeQR</string> <string name="menu_share_bridge">Сподели BridgeQR</string>  - <string name="wizard_details">Някои Орбот детайли</string>  <string name="pref_general_group">Главни</string> <string name="pref_start_boot_title">Стартирай Орбот при стартиране на устройството</string> diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index 1865d1a9..8e227c2b 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -34,7 +34,6 @@ <string name="disable">টর অক্ষম</string> <string name="pref_start_boot_title">বুট-এ অরবট শুরু করুন</string> <string name="wizard_details_msg">অরবট একটি ওপেন-সোর্স অ্যাপ্লিকেশন যা টর, ওবফস 4 প্রক্সি, ব্যাডভিপিএন টুন 2 সোকস, লিবিভেন্ট এবং পলিপো রয়েছে। এটি টোর নেটওয়ার্কে একটি স্থানীয় HTTP প্রক্সি (8118) এবং একটি SOCKS প্রক্সি (9050) সরবরাহ করে। অরবোটে টোরের মাধ্যমে সমস্ত ইন্টারনেট ট্র্যাফিক প্রেরণ করার ক্ষমতাও রুটযুক্ত ডিভাইসে রয়েছে।</string> - <string name="wizard_details">অরবটের কিছু বিবরণ</string> <string name="pref_allow_background_starts_title">পটভূমিতে শুরুর অনুমতি দাও</string> <string name="pref_entrance_node_dialog">প্রবেশ নোডে ঢুকো</string> <string name="pref_entrance_node_summary">প্রথম হপের জন্য ফিঙ্গারপ্রিন্ট, নিক, দেশ এবং ঠিকানা</string> diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 10589997..2e3e0d58 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -34,7 +34,6 @@ <string name="pref_node_configuration">নোড কনফিগারেশন</string> <string name="pref_start_boot_summary">অরবোট স্বয়ংক্রিয়ভাবে শুরু করো এবং তোমার অ্যান্ড্রয়েড ডিভাইস বুট হওয়ার পরে টরে সংযুক্ত করো</string> <string name="pref_start_boot_title">বুট-এর সময় অরবট শুরু করো</string> - <string name="wizard_details">অরবটের কিছু বিবরণ</string> <string name="menu_share_bridge">ব্রিজকিউআর শেয়ার করো</string> <string name="menu_scan">ব্রিজকিউআর চেক করো</string> <string name="main_layout_upload">আপলোড</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 94ae2c59..44756ed5 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Escaneja el BridgeQR</string> <string name="menu_share_bridge">Comparteix el BridgeQR</string>  - <string name="wizard_details">Alguns detalls de l\'Orbot</string> <string name="wizard_details_msg">Orbot és una aplicació de codi obert que conté Tor, Obfs4Proxy, BadVPN, Tun2Socks i LibEvent. Proporciona un proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. En dispositius root Orbot també té la capacitat d\'enviar tot el trànsit d\'Internet a través de Tor.</string>  <string name="pref_general_group">General</string> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 328eb65c..a2483278 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skenovat BridgeQR</string> <string name="menu_share_bridge">Sdílet BridgeQR</string>  - <string name="wizard_details">Pár detailů o Orbot</string>  <string name="pref_general_group">Obecné</string> <string name="pref_start_boot_title">Spustit Orbot při startu systému</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index b064e0c9..0977bacd 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skenovat QR kód bridge</string> <string name="menu_share_bridge">Sdílet QR kód bridge</string>  - <string name="wizard_details">Detaily o Orbotu</string>  <string name="pref_general_group">Hlavní</string> <string name="pref_start_boot_title">Spustit Orbot při zapnutí zařízení</string> diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index ef85ec01..cf9baaa4 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -13,7 +13,6 @@ <string name="button_about">Amdanom ni</string> <string name="menu_exit">Gadael</string>  - <string name="wizard_details">Rhai manylion am Orbot</string>  <string name="pref_general_group">Cyffredinol</string>  diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c41936a2..aece24bf 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skan BridgeQR</string> <string name="menu_share_bridge">Del BridgeQR</string>  - <string name="wizard_details">Nogle Orbot detaljer</string>  <string name="pref_general_group">Generelt</string> <string name="pref_start_boot_title">Start Orbot ved opstart</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6bd8ef68..eb401c59 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">BrückenQR scannen</string> <string name="menu_share_bridge">BrückenQR teilen</string>  - <string name="wizard_details">Nähere Informationen zu Orbot</string> <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung, die Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent enthält. Sie stellt einen lokalen HTTP-Proxy (Port: 8118) und einen SOCKS-Proxy (Port: 9050) in das Tor-Netzwerk bereit. Auf gerooteten Geräten kann Orbot auch sämtliche Internetverbindungen durch Tor leiten.</string>  <string name="pref_general_group">Allgemein</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3cab2df2..ebeba2a1 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Σάρωση BridgeQR</string> <string name="menu_share_bridge">Κοινή χρήση BridgeQR</string>  - <string name="wizard_details">Μερικές λεπτομέρειες για το Orbot</string> <string name="wizard_details_msg">Το Orbot είναι μια εφαρμογή ανοικτού λογισμικού που περιέχει τα Tor, Obfs4Proxy, BadVPN, Tun2Socks καί LibEvent. Διαθέτει τοπικούς πληρεξούσιους διακομιστές HTTP (8118) και SOCKS (9050) για το δίκτυο Tor. Σε συσκευές που έχουν διαμορφωθεί για ριζική χρήση, το Orbot μπορεί να μεταδίδει όλη την διαδυκτιακή κυκλοφορία μέσω Tor.</string>  <string name="pref_general_group">Γενικά</string> diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 683d4365..2c712197 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Scan BridgeQR</string> <string name="menu_share_bridge">Share BridgeQR</string>  - <string name="wizard_details">Some Orbot Details</string> <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN, Tun2Socks and LibEvent. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string>   diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index db021c1f..613f6719 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -14,7 +14,6 @@ <string name="button_about">Pri</string> <string name="menu_exit">Eliri</string>  - <string name="wizard_details">Kelkaj Detaloj pri Orbot</string>  <string name="pref_general_group">Ĝenerala</string> <string name="pref_start_boot_title">Ŝalti Orbot dum praŝargado</string> diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 09a73952..470360f0 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Escanea código QR</string> <string name="menu_share_bridge">Compartir el código QR</string>  - <string name="wizard_details">Algunos detalles de Orbot</string> - <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN, Tun2Socks y LibEvent. Proporciona un proxy local HTTP (8118) y un proxy SOCKS (9050) adentro de la red de Tor. Orbot también tiene la habilidad, en dispositivos ruteados, de enviar todo el trafico de Internet a través de Tor</string> + <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN, Tun2Socks y LibEvent. Proporciona un proxy local HTTP (8118) y un proxy SOCKS (9050) adentro de la red de Tor. Orbot también tiene la habilidad, en dispositivos ruteados, de enviar todo el trafico de Internet a través de Tor</string>  <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Arrancar Orbot al inicio</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 7884cfbb..1ff3483e 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Escanear QR de bridge</string> <string name="menu_share_bridge">Compartir QR de bridge</string>  - <string name="wizard_details">Algunos detalles de Orbot</string> <string name="wizard_details_msg">Orbot es una aplicación de código abierto que contiene Tor, Obfs4Proxy, BadVPN, Tun2Socks y LibEvent. Proporciona un proxy HTTP (8118) y un proxy SOCKS (9050) hacia el interior de la red Tor. En una maquina rooteada, Orbot también tiene la capacidad de enviar todo el tráfico de Internet a través de Tor.</string>  <string name="pref_general_group">General</string> diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 844b61c9..9124a605 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -16,7 +16,6 @@ <string name="button_about">Lähemalt</string> <string name="menu_exit">Välja</string>  - <string name="wizard_details">Mõned Orbot\'i detailid</string>  <string name="pref_general_group">Üldist</string> <string name="pref_start_boot_title">Käivita Orbot seadme käivitumisel</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index e782d963..0511eb5b 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Eskaneatu BridgeQR</string> <string name="menu_share_bridge">Partekatu BridgeQR</string>  - <string name="wizard_details">Orbot xehetasun batzuk</string> <string name="wizard_details_msg">Tor, Obfs4Proxy, BadVPN, Tun2Socks eta LibEvent dituen kode irekiko aplikazio bat da Orbot. Tor sarera sartzeko HTTP proxya (8118) eta SOCKS proxya (9050) eskaintzen ditu. Rooteatutako gailuetan Orbot-ek interneteko trafiko guztia Tor bidez bidali dezake baita ere.</string>  <string name="pref_general_group">Orokorra</string> diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 7acbd5f6..242bd8b9 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">اسکن BridgeQR</string> <string name="menu_share_bridge">اشتراک BridgeQR</string>  - <string name="wizard_details">برخی جزییات درباره اوربوت</string> <string name="wizard_details_msg">اوربات نرم‌افزاری آزاد است که شامل تور، Obfs4Proxy، BadVPN، Tun2Socks، LibEvent و پولیپو می‌شود. این نرم‌افزار یک اچ‌تی‌تی‌پی پراکسی (8118) و ساکس (9050) محلی روی شبکه تور فراهم می‌کند. همچنین اوربات می‌تواند روی دستگاه‌های روت شده، تمام ترافیک اینترنت را ار تور عبور دهد.</string>  <string name="pref_general_group">کلی</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index fd9b3136..3537eaf9 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skannaa sillan QR-koodi</string> <string name="menu_share_bridge">Jaa sillan QR-koodi</string>  - <string name="wizard_details">Joitakin Orbotin lisätietoja</string>  <string name="pref_general_group">Yleiset</string> <string name="pref_start_boot_title">Aloita Orbot käynnistettäessä</string> diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 818d7194..6690fbb9 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Balayer le code QR d’un pont</string> <string name="menu_share_bridge">Partager le code QR d’un pont</string>  - <string name="wizard_details">Quelques détails sur Orbot</string>  <string name="pref_general_group">Général</string> <string name="pref_start_boot_title">Démarrer Orbot à l’amorçage</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 7acca81d..5d5c0c1a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Balayer un code QR de pont</string> <string name="menu_share_bridge">Partager un code QR de pont</string>  - <string name="wizard_details">Quelques détails sur Orbot</string> - <string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, Obfs4Proxy, BadVPN Tun2Socks et LibEvent. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil débridé, d’envoyer tout le trafic Internet par Tor.</string> + <string name="wizard_details_msg">Orbot est une application à code source ouvert incluant Tor, Obfs4Proxy, BadVPN Tun2Socks et LibEvent. Elle fournit un mandataire local HTTP (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Orbot a aussi la capacité, sur un appareil débridé, d’envoyer tout le trafic Internet par Tor.</string>  <string name="pref_general_group">Général</string> <string name="pref_start_boot_title">Démarrer Orbot à l’amorçage</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index fe428b35..5cdb6094 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Escanear BridgeQR</string> <string name="menu_share_bridge">Compartir BridgeQR</string>  - <string name="wizard_details">Algúns detalles sobre Orbot</string> <string name="wizard_details_msg">Orbot é unha aplicación de código-aberto que contén a Tor, Obfs4Proxy, BadVPN, Tun2Socks e LibEvent. Proporciona un proxy HTTP (8118) e un proxy SOCKS (9050) na rede Tor. Orbot tamén pode, nun dispositivo con acceso root, enviar todo o tráfico de internet a través de Tor.</string>  <string name="pref_general_group">Xeral</string> diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index a6217880..0f5aa8ad 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -19,7 +19,6 @@ <string name="menu_scan">स्कैन ब्रिज क्यूआर</string> <string name="menu_share_bridge">शेयर ब्रिज QR</string>  - <string name="wizard_details">कुछ औरबोट विवरण</string> <string name="wizard_details_msg">ऑरबोट एक ओपन-सोर्स एप्लिकेशन है जिसमें टोर, ओबफ्स 4 प्रोक्सी, बैड वीपीएन टोन 2 एसॉक्स, लिबवेवेंट और पोलीपो शामिल हैं। यह टो नेट नेटवर्क में एक स्थानीय HTTP प्रॉक्सी (8118) और एक सॉक्स प्रॉक्सी (9050) प्रदान करता है। ऑरबोट की भी क्षमता है, रूट डिवाइस पर, टो के माध्यम से सभी इंटरनेट ट्रैफिक भेजने के लिए</string>  <string name="pref_general_group">समन्य </string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 9f1e0162..f1543697 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Skeniraj BridgeQR</string> <string name="menu_share_bridge">Podijeli BridgeQR</string>  - <string name="wizard_details">Detalji o Orbot-u</string> -  +  <string name="pref_general_group">Općenito</string> <string name="pref_start_boot_title">Pokreni Orbot pri pokretanju</string> <string name="pref_start_boot_summary">Automatski pokreni Orbot i poveži Tor kad se Android uređaj pokrene</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 6ac2622d..126513f5 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">BridgeQR szkennelése</string> <string name="menu_share_bridge">BridgeQR megosztása</string>  - <string name="wizard_details">Néhány Orbot adat</string> <string name="wizard_details_msg">Az Orbot egy nyilt forráskódú alkalmazás ami Tor, Obfs4Proxy, BadVPN, Tun2Socks és LibEvent alkalmazásokat tartalmaz. Helyi HTTP proxyt (8118) és SOCKS proxyt (9050) biztosít a Tor hálózatba. Az Orbot továbbá képes arra, hogy rootolt eszközön a teljes internet forgalmat keresztül küldje a Tor-on.</string>  <string name="pref_general_group">Általános</string> diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index cae38518..84e61051 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Pindai BridgeQR</string> <string name="menu_share_bridge">Bagikan BridgeQR</string>  - <string name="wizard_details">Beberapa Rincian Orbot</string>  <string name="pref_general_group">Umum</string> <string name="pref_start_boot_title">Mulai Orbot saat Boot</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 9b23f2fe..c2b426dc 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skanna BridgeQR</string> <string name="menu_share_bridge">Deila BridgeQR</string>  - <string name="wizard_details">Fáein nánari atriði um Orbot</string> <string name="wizard_details_msg">Orbot er opinn og frjáls hugbúnaður sem inniheldur Tor, Obfs4Proxy, BadVPN, Tun2Socks og LibEvent. Það sér um að útbúa staðværan HTTP-milliþjón (8118) og SOCKS-milliþjón (9050) inn á Tor-netið. Orbot getur einnig, á tækjum með rótaraðgangi, sent alla internetumferð í gegnum Tor.</string>  <string name="pref_general_group">Almennt</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 19f07d70..a874857d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Scansiona BridgeQR</string> <string name="menu_share_bridge">Condividi BridgeQR</string>  - <string name="wizard_details">Alcuni dettagli su Orbot</string> <string name="wizard_details_msg">Orbot è un\'applicazione open source che contiene Tor, Obfs4proxy, BadVPN, Tun2Socks e LibEvent. Esso fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) per la rete Tor. Orbot permette anche, nei dispositivi rootati, di inviare tutto il traffico tramite Tor.</string>  <string name="pref_general_group">Generale</string> diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 6609092c..a9d46e66 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -17,7 +17,6 @@ <string name="menu_scan">סרוק BridgeQR</string> <string name="menu_share_bridge">שתף BridgeQR</string>  - <string name="wizard_details">פרטים מסוימים של Orbot </string> <string name="wizard_details_msg">Orbot הוא יישומון קוד פתוח הכולל את Tor,‏ Obfs4Proxy,‏ BadVPN,‏ Tun2Socks ו־LibEvent. הוא מתחבר לרשת Tor באמצעות שרת מתווך HTTP מקומי (8118) ושרת מתווך SOCKS (פורט 9050). Orbot יכול בנוסף עם הרשאות על לנתב את כל תעבורת האינטרנט של המכשיר דרך Tor כבררת מחדל.</string>  <string name="pref_general_group">כללי</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 18c10e0a..1d2b9b83 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">ブリッジQRをスキャン</string> <string name="menu_share_bridge">ブリッジQRを共有</string>  - <string name="wizard_details">Orbot詳細</string> <string name="wizard_details_msg">Orbot はTor、Obfs4Proxy、BadVPN、Tun2Socks、LibEventを含むオープンソースアプリです。ローカルHTTPプロキシ (8118) と SOCKSプロキシ (9050) をTorネットワークに接続します。root化された端末ではOrbotは全ての通信をTorを通して行うこともできます。</string>  <string name="pref_general_group">一般</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e0d6a39f..188bc4bf 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">브릿지 QR코드 스캔하기</string> <string name="menu_share_bridge">브릿지 QR코드 공유하기</string>  - <string name="wizard_details">Orbot에 대한 몇몇 상세사항</string>  <string name="pref_general_group">일반</string> <string name="pref_start_boot_title">부팅 후 Orbot 시작</string> diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 84f4a16c..7fbbea79 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -107,7 +107,6 @@ <string name="pref_proxy_type_title">Išeinančio įgaliotojo serverio tipas</string> <string name="pref_allow_background_starts_title">Leisti paleisti fone</string> <string name="pref_entrance_node_dialog">Įveskite įėjimo mazgus</string> - <string name="wizard_details">Keletas „Orbot“ detalių</string> <string name="status_disabled">„Orbot“ yra išjungtas</string> <string name="status_starting_up">„Orbot“ paleidžiama…</string> <string name="v3_import_auth_private">Importuoti .auth_private</string> diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index c06585c9..5e14f71b 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Nuskaityti tilto QR kodą</string> <string name="menu_share_bridge">Dalintis tilto QR kodu</string>  - <string name="wizard_details">Orbot detalės</string> - <string name="wizard_details_msg">Orbot yra atviro kodo programėlė, kuri susideda iš Tor, Obfs4Proxy, BadVPN, Tun2Socks ir LibEvent. Ji leidžia jungtis prie Tor tinklo per HTTP (8118) ir SOCKS (9050) tarpinius serverius. Orbot taip pat leidžia perkelti visą tinklo srautą per Tor tinklą, jeigu turite root/supernaudotojo privilegijas.</string> + <string name="wizard_details_msg">Orbot yra atviro kodo programėlė, kuri susideda iš Tor, Obfs4Proxy, BadVPN, Tun2Socks ir LibEvent. Ji leidžia jungtis prie Tor tinklo per HTTP (8118) ir SOCKS (9050) tarpinius serverius. Orbot taip pat leidžia perkelti visą tinklo srautą per Tor tinklą, jeigu turite root/supernaudotojo privilegijas.</string>  <string name="pref_general_group">Bendra</string>  diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index b5e41698..89457775 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skenēt BridgeQR</string> <string name="menu_share_bridge">Koplietot BridgeQR</string>  - <string name="wizard_details">Vairāk informācijas par Orbot</string>  <string name="pref_general_group">Vispārīgi</string> <string name="pref_start_boot_title">Startēt Orbot, kad ielādējas</string> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index d464ec58..631dd453 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Скенирај QR на мост</string> <string name="menu_share_bridge">Сподели QR на мост</string>  - <string name="wizard_details">Неколку детали за Orbot</string> <string name="wizard_details_msg">Orbot e апликација со отворен код која содржи Tor Obfs4Proxy, BadVPN, Tun2Socks и LibEvent. Овозможува локален HTTP прокси (8118) и SOCKS прокси (9050) во Tor мрежата. Orbot исто така има можност, на уред со root пристап, да го испраќа целиот интернет сообраќај преку Tor.</string>  <string name="pref_general_group">Општо</string> diff --git a/app/src/main/res/values-ms-rMY/strings.xml b/app/src/main/res/values-ms-rMY/strings.xml index bfd5f44c..9ea256e6 100644 --- a/app/src/main/res/values-ms-rMY/strings.xml +++ b/app/src/main/res/values-ms-rMY/strings.xml @@ -14,7 +14,6 @@ <string name="button_about">Tentang</string> <string name="menu_exit">Keluar</string>  - <string name="wizard_details">Maklumat Orbot</string>  <string name="pref_general_group">Umum</string> <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string> diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index c3acfb10..bf9114ed 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -13,7 +13,6 @@ <string name="button_about">Tentang</string> <string name="menu_exit">Keluar</string>  - <string name="wizard_details">Maklumat Orbot</string>  <string name="pref_general_group">Umum</string> <string name="pref_start_boot_title">Mulakan Orbot semasa Boot</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index bb64e597..e48373c9 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skann BridgeQR</string> <string name="menu_share_bridge">Del BridgeQR</string>  - <string name="wizard_details">Noen Orbot-detaljer</string>  <string name="pref_general_group">Generelt</string> <string name="pref_start_boot_title">Start Orbot ved oppstart</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9140435c..f40b469d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">BridgeQR scannen</string> <string name="menu_share_bridge">BridgeQR delen</string>  - <string name="wizard_details">Enkele Orbot-gegevens</string> <string name="wizard_details_msg">Orbot is een openbronapplicatie die Tor, Obfs4Proxy, BadVPN, Tun2Socks en LibEvent bevat. Het creëert een lokale HTTP-proxy (8118) en een SOCKS-proxy (9050) naar het Tor-netwerk. Orbot heeft ook de mogelijkheid om al het internetverkeer over het Tor-netwerk te sturen.</string>  <string name="pref_general_group">Algemeen</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8498ab0d..ee2af178 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skanuj BridgeQR</string> <string name="menu_share_bridge">Podziel się BridgeQR</string>  - <string name="wizard_details">Niektóre szczegóły o Orbocie</string>  <string name="pref_general_group">Ogólne</string> <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 32b039ad..2408a3bf 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Escanear um BridgeQR</string> <string name="menu_share_bridge">Compartilhar o BridgeQR</string>  - <string name="wizard_details">Alguns Detalhes Sobre o Orbot</string> <string name="wizard_details_msg">O Orbot é um software de código aberto que contem Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Ele fornece um proxy local HTTP (8118) e um proxy SOCKS (9050) como acesso a rede Tor. Orbot também tem a habilidade, em dispositivos com acesso root, de enviar todo o trafego de Internet via rede Tor.</string>  <string name="pref_general_group">Geral</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 02490a92..74fe4c4b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Digitalizar BridgeQR</string> <string name="menu_share_bridge">Compartilhar BridgeQR</string>  - <string name="wizard_details">Alguns Detalhes do Orbot</string>  <string name="pref_general_group">Geral</string> <string name="pref_start_boot_title">Iniciar o Orbot no Arranque</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 31728d34..1c247319 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -16,7 +16,6 @@ <string name="menu_scan">Digitalizar BridgeQR</string> <string name="menu_share_bridge">Compartilhar BridgeQR</string>  - <string name="wizard_details">Alguns Detalhes do Orbot</string>  <string name="pref_general_group">Geral</string> <string name="pref_start_boot_title">Iniciar o Orbot no Arranque</string> diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 7c95af48..1a048c02 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -28,7 +28,6 @@ <string name="pref_start_boot_summary">Pornește automat Orbot și conectează Tor atunci când dispozitivul tău Android pornește</string> <string name="pref_start_boot_title">Porniți Orbot la pornire</string> <string name="wizard_details_msg">Orbot este o aplicație open-source care conține Tor, Obfs4Proxy, BadVPN, Tun2Socks și LibEvent. Acesta oferă un proxy HTTP local (8118) și un proxy SOCKS (9050) în rețeaua Tor. Orbot are, de asemenea, capacitatea, pe dispozitivul înrădăcinat, de a trimite tot traficul de internet prin Tor.</string> - <string name="wizard_details">Câteva detalii despre Orbot</string> <string name="menu_share_bridge">Distribuie BridgeQR</string> <string name="menu_scan">Scanare BridgeQR</string> <string name="main_layout_upload">Încărcați</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 60e863f1..cb96f0fe 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Scanează BridgeQR</string> <string name="menu_share_bridge">Distribuie BridgeQR</string>  - <string name="wizard_details">Detalii Orbot</string>  <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Porneşte Orbot la boot-are</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index fff53662..92e25650 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Сканировать QR-код моста</string> <string name="menu_share_bridge">Опубликовать QR-код моста</string>  - <string name="wizard_details">Некоторые сведения о программе Orbot</string> <string name="wizard_details_msg">Orbot - это приложение с открытым исходным кодом, которое содержит Tor, Obfs4Proxy, BadVPN, Tun2Socks и LibEvent. Оно предоставляет локальный HTTP-прокси (8118) и SOCKS-прокси (9050) в сеть Tor. Orbot также имеет возможность на рутированном устройстве отправлять весь интернет-трафик через Tor.</string>  <string name="pref_general_group">Общие</string> diff --git a/app/src/main/res/values-si-rLK/strings.xml b/app/src/main/res/values-si-rLK/strings.xml index d969e0c3..3529a9b2 100644 --- a/app/src/main/res/values-si-rLK/strings.xml +++ b/app/src/main/res/values-si-rLK/strings.xml @@ -15,7 +15,6 @@ <string name="button_about">පිළිබඳව</string> <string name="menu_exit">පිටවන්න</string>  - <string name="wizard_details">Orbot පිළිබද ඇතැම් විස්තර </string>  <string name="pref_general_group">පොදු</string> <string name="pref_start_boot_title">Orbot ඇරඹුම් ධාවකයේ අරඹන්න </string> diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index f5aae067..5367634a 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -25,7 +25,6 @@ <string name="menu_exit">Ukončenie</string> <string name="menu_scan">Skenovať BridgeQR</string> <string name="menu_share_bridge">Zdieľať BridgeQR</string> - <string name="wizard_details">Niektoré podrobnosti Orbotu</string> <string name="wizard_details_msg">Orbot je open-source aplikácia, ktorá obsahuje Tor, Obfs4Proxy, BadVPN, Tun2Socks a LibEvent. Poskytuje lokálny HTTP proxy (8118) a SOCKS proxy (9050) do siete Tor. Orbot má tiež možnosť na koreňovom zariadení posielať všetok internetový prenos cez Tor.</string> <string name="pref_general_group">Všeobecné</string> <string name="pref_start_boot_title">Spustiť Orbot pri štarte</string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e9f5f779..50d44207 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Zoskenovať BridgeQR</string> <string name="menu_share_bridge">Zdielať BridgeQR</string>  - <string name="wizard_details">Niekoľko detailov o Orbot</string>  <string name="pref_general_group">Všeobecné</string> <string name="pref_start_boot_title">Spustiť Orbot pri štarte</string> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 4696b84e..b7b4777b 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -14,7 +14,6 @@ <string name="button_about">O programu</string> <string name="menu_exit">Izhod</string>  - <string name="wizard_details">Nekaj podrobnosti o Orbot-u</string>  <string name="pref_general_group">Splošno</string>  diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 9850d2f1..383b94db 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -10,7 +10,6 @@ <string name="button_about">Informacione</string> <string name="menu_exit">Dil</string>  - <string name="wizard_details">Disa detaje te Orbot</string>  <string name="pref_general_group">Të Përgjithshme</string>  diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 23ed463d..8c95d2d9 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">Скенирај BridgeQR</string> <string name="menu_share_bridge">Подели BridgeQR</string>  - <string name="wizard_details">Детаљи о Орботу</string> - <string name="wizard_details_msg">Орбот је апликација отвореног кода која садржи Тор, Obfs4Proxy, BadVPN, Tun2Socks и LibEvent. Омогућава локални HTTP proxy (8118) и SOCKS proxy (9050) у Тор мрежу. Орбот такође има могућност да на рутованом уређају шаље сав интернет саобраћај преко Тор-а.</string> + <string name="wizard_details_msg">Орбот је апликација отвореног кода која садржи Тор, Obfs4Proxy, BadVPN, Tun2Socks и LibEvent. Омогућава локални HTTP proxy (8118) и SOCKS proxy (9050) у Тор мрежу. Орбот такође има могућност да на рутованом уређају шаље сав интернет саобраћај преко Тор-а.</string>  <string name="pref_general_group">Опште</string> <string name="pref_start_boot_title">Покрени Орбот при покретању уређаја</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2dc2eaeb..eb55cc62 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Skanna BridgeQR</string> <string name="menu_share_bridge">Dela BridgeQR</string>  - <string name="wizard_details">Orbot-information</string> <string name="wizard_details_msg">Orbot är ett program med öppen källkod som innehåller Tor, Obfs4Proxy, BadVPN, Tun2Socks och LibEvent. Den tillhandahåller en lokal HTTP-proxy (8118) och en SOCKS-proxy (9050) i Tor-nätverket. Orbot har också förmågan att, på rotad enhet, skicka all internettrafik genom Tor.</string>  <string name="pref_general_group">Allmänt</string> diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 1971ddc2..127969b3 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -17,7 +17,6 @@ <string name="menu_scan">ஸ்கேன் BridgeQR</string> <string name="menu_share_bridge">BridgeQR பகிர்ந்திடு</string>  - <string name="wizard_details">ஆர்பாட் பற்றிய தகவல்</string>  <string name="pref_general_group">பொது</string>  diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 52f7d9fa..b2195ba4 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">สแกน BridgeQR</string> <string name="menu_share_bridge">แชร์ BridgeQR</string>  - <string name="wizard_details">รายละเอียดเกี่ยวกับ Orbot</string> <string name="wizard_details_msg">Orbot เป็นแอปพลิเคชันโอเพ่นซอร์สที่ประกอบด้วย Tor, Obfs4Proxy, BadVPN, Tun2Socks และ LibEvent โดย Orbot จะสร้างพร็อกซี (8118) และพร็อกซี SOCKS (9050) ในเครื่อง ภายในเครือข่าย Tor Orbot ยังสามารถทำการรับส่งข้อมูลทั้งหมดส่งผ่าน Tor ได้บนอุปกรณ์ที่ได้ทำการ root แล้ว</string>  <string name="pref_general_group">ทั่วไป</string> diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index 26bf6601..5b03388e 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -15,7 +15,6 @@ <string name="menu_exit">Labasan</string> <string name="menu_share_bridge">Ipamahagi ang BridgeQR</string>  - <string name="wizard_details">Ilang detalye sa Orbot</string>  <string name="pref_general_group">Pangkalahatan</string> <string name="pref_start_boot_title">Umpisahan ang Orboot sa Boot</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 81a13a47..c55bee2c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">QR kodu tara</string> <string name="menu_share_bridge">QR kodu paylaş</string>  - <string name="wizard_details">Bazı Orbot Ayrıntıları</string> <string name="wizard_details_msg">Orbot; Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent yapılarını kapsayan açık kaynaklı bir uygulamadır. Tor ağına bağlanmak için bir yerel HTTP vekil sunucu (8118) ve bir SOCKS vekil sunucu (9050) sağlar. Orbot ayrıca, rootlanmış aygıtlarda tüm internet trafiğini Tor üzerinden gönderebilir.</string>  <string name="pref_general_group">Genel</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 2cb12888..7bae74ea 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Сканувати BridgeQR</string> <string name="menu_share_bridge">Поділитися BridgeQR</string>  - <string name="wizard_details">Деякі відомості про програму Orbot</string> <string name="wizard_details_msg">Orbot — це програма з відкритим кодом, яка містить Tor, Obfs4Proxy, BadVPN, Tun2Socks, LibEvent. Він забезпечує локальний HTTP-проксі (8118) та проксі SOCKS (9050) у мережу Tor. Orbot також має здатність, на кореневому пристрої, відправляти весь інтернет-трафік через Tor.</string>  <string name="pref_general_group">Основні</string> diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 6d2436c2..8ed80903 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Quét mã BridgeQR</string> <string name="menu_share_bridge">Chia sẻ mã BridgeQR</string>  - <string name="wizard_details">Vài chi tiết về Orbot</string>  <string name="pref_general_group">Cài đặt chung</string> <string name="pref_start_boot_title">Chạy Orbot khi khởi động thiết bị</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2c035a47..a6979c54 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">扫描网桥 QR 码</string> <string name="menu_share_bridge">分享网桥 QR 码</string>  - <string name="wizard_details">更多 Orbot 信息</string>  <string name="pref_general_group">常规</string> <string name="pref_start_boot_title">开机时启动 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 3896c742..7a78b2a9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -18,8 +18,7 @@ <string name="menu_scan">掃描網橋 QR 碼</string> <string name="menu_share_bridge">分享網橋 QR 碼</string>  - <string name="wizard_details">Orbot 的一些詳細資料</string> - <string name="wizard_details_msg">Orbot 是一款開源應用,其包含 Tor, Obfs4Proxy, BadVPN, Tun2Socks 與 LibEvent.它提供了本地的 HTTP 代理 (8118) 與 SOCKS 代理 (9050) 到 Tor 網路中. Orbot 也有能力可在取得最高權限的設備上來利用 Tor 傳送互聯網流量</string> + <string name="wizard_details_msg">Orbot 是一款開源應用,其包含 Tor, Obfs4Proxy, BadVPN, Tun2Socks 與 LibEvent.它提供了本地的 HTTP 代理 (8118) 與 SOCKS 代理 (9050) 到 Tor 網路中. Orbot 也有能力可在取得最高權限的設備上來利用 Tor 傳送互聯網流量</string>  <string name="pref_general_group">一般</string> <string name="pref_start_boot_title">開機時自動啟動 Orbot</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a6dbbe00..e1310d85 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,6 @@ <string name="menu_scan">Scan BridgeQR</string> <string name="menu_share_bridge">Share BridgeQR</string>  - <string name="wizard_details">Some Orbot Details</string> <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN, Tun2Socks and LibEvent. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network.</string>  <string name="pref_general_group">General</string> @@ -93,6 +92,8 @@ <string name="project_home">Project Home:</string> <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">3rd-Party-Software: </string> + <string name="version">Version:</string> + <string name="license">License:</string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent: http://www.monkey.org/~provos/libevent/</string> <string name="obfsproxy_version">Obfs4proxy: https://github.com/Yawning/obfs4</string>

1 0

[orbot/master] Update .gitlab-ci.yml file
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 84f0be7c742b7dde2886a45716510a2864b8b839 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Wed Nov 10 15:51:56 2021 +0000 Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e12e5f5..0e2fac61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,9 @@ image: openjdk:11-jdk variables: -ANDROID_COMPILE_SDK: "30" -ANDROID_BUILD_TOOLS: "30.0.3" -ANDROID_SDK_TOOLS: "6858069_latest" + ANDROID_COMPILE_SDK: "30" + ANDROID_BUILD_TOOLS: "30.0.3" + ANDROID_SDK_TOOLS: "6858069_latest" before_script:

1 0

[orbot/master] Fixes #549 snowflake preferences are greyed on when bridges are in use
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2cc79c18342a912549e9e054f1d0001917f4265f Author: b <dsnake(a)protonmail.com> Date: Fri Dec 10 00:41:17 2021 -0500 Fixes #549 snowflake preferences are greyed on when bridges are in use also added string res for snowflake proxy category so it can be localized --- app/src/main/res/values/strings.xml | 3 ++- app/src/main/res/xml/preferences.xml | 2 +- .../org/torproject/android/core/ui/SettingsPreferencesActivity.kt | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1310d85..c3a43f01 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -251,9 +251,10 @@ <string name="in_a_browser">In a browser, visit %s and tap "Get Bridges" > "Just Give Me Bridges!"</string> <string name="paste_bridges">Paste Bridges</string> <string name="use_qr_code">Use QR Code</string> + <string name="snowflake_proxy_pref_category">Snowflake Proxy (Experimental)</string> <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> - <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device</string> + <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device. (This can\'t be used if you connect alongside bridges)</string> <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 28e06052..0b2eb525 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -291,7 +291,7 @@ android:title="@string/pref_disable_network_title" /> </PreferenceCategory> - <PreferenceCategory android:title="Experimental"> + <PreferenceCategory android:title="@string/snowflake_proxy_pref_category"> <CheckBoxPreference android:defaultValue="false" android:key="pref_be_a_snowflake" diff --git a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt index 8aa3af17..04dd6266 100644 --- a/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt +++ b/appcore/src/main/java/org/torproject/android/core/ui/SettingsPreferencesActivity.kt @@ -13,6 +13,7 @@ import org.torproject.android.core.LocaleHelper class SettingsPreferencesActivity : PreferenceActivity() { private var prefLocale: ListPreference? = null + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) addPreferencesFromResource(intent.getIntExtra(BUNDLE_KEY_PREFERENCES_XML, 0)) @@ -30,6 +31,10 @@ class SettingsPreferencesActivity : PreferenceActivity() { finish() false } + + val bridgesEnabled = getSharedPreferences("org.torproject.android_preferences", MODE_MULTI_PROCESS).getBoolean("pref_bridges_enabled", false) + findPreference("pref_be_a_snowflake")?.isEnabled = !bridgesEnabled + findPreference("pref_be_a_snowflake_limit").isEnabled = !bridgesEnabled } override fun attachBaseContext(newBase: Context) = super.attachBaseContext(LocaleHelper.onAttach(newBase))

1 0