March 2017 - tor-commits - lists.torproject.org

[orbot/master] delete files from storage
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit f76f58e2bf75ce04326a55659731c332360eb835 Author: arrase <arrase(a)gmail.com> Date: Mon Nov 28 23:43:43 2016 +0100 delete files from storage --- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java index 4e0643e..ac5df74 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java @@ -10,8 +10,11 @@ import android.support.v4.app.DialogFragment; import android.support.v7.app.AlertDialog; import org.torproject.android.R; +import org.torproject.android.service.TorServiceConstants; import org.torproject.android.ui.hiddenservices.providers.HSContentProvider; +import java.io.File; + public class HSDeleteDialog extends DialogFragment { @NonNull @@ -25,11 +28,25 @@ public class HSDeleteDialog extends DialogFragment { public void onClick(DialogInterface dialog, int which) { switch (which) { case DialogInterface.BUTTON_POSITIVE: + // Delete from db context.getContentResolver().delete( HSContentProvider.CONTENT_URI, HSContentProvider.HiddenService._ID + "=" + arguments.getInt("_id"), null ); + + // Delete from interal storage + String base = context.getFilesDir().getAbsolutePath() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR; + File dir = new File(base, "hs" + arguments.getString("port")); + + if (dir.isDirectory()) { + String[] children = dir.list(); + for (String aChildren : children) { + new File(dir, aChildren).delete(); + } + dir.delete(); + } + break; case DialogInterface.BUTTON_NEGATIVE:

1 0

[orbot/master] non perfect but better option to start/stop
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 7a9ad4720b87b71b003e05c3b396b0d2c72f7b1a Author: arrase <arrase(a)gmail.com> Date: Mon Nov 28 22:06:09 2016 +0100 non perfect but better option to start/stop --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 9 ++++++++- app/src/main/res/values/strings.xml | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 8e03f56..aeb4a18 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -602,7 +602,14 @@ public class OrbotMainActivity extends AppCompatActivity hsutils.restoreKeyBackup(hsPort, hsKeyPath); } - startTor(); + if (torStatus.equals(TorServiceConstants.STATUS_OFF)) { + startTor(); + } else { + stopTor(); + Toast.makeText( + this, R.string.start_tor_again_for_finish_the_process, Toast.LENGTH_LONG + ).show(); + } new Thread() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 656a3dd..bab15f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -351,4 +351,5 @@ <string name="restore_backup">Restore Backup</string> <string name="create_a_backup_first">Create a backup first</string> <string name="name_can_t_be_empty">Name can\'t be empty</string> + <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string> </resources>

1 0

[orbot/master] type selection spinner
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit f6f4d26645594b62c8cc05310f409f5f38d5eeb4 Author: arrase <arrase(a)gmail.com> Date: Tue Nov 29 01:41:41 2016 +0100 type selection spinner --- .../ui/hiddenservices/HiddenServicesActivity.java | 40 +++++++++++++++++++++- app/src/main/res/menu/hs_menu.xml | 10 +++++- app/src/main/res/values/arrays.xml | 5 ++- app/src/main/res/values/strings.xml | 1 + 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java index 5771701..99af182 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java @@ -8,13 +8,16 @@ import android.database.Cursor; import android.os.Bundle; import android.os.Handler; import android.support.design.widget.FloatingActionButton; +import android.support.v4.view.MenuItemCompat; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.ListView; +import android.widget.Spinner; import android.widget.Toast; import org.torproject.android.R; @@ -29,6 +32,7 @@ public class HiddenServicesActivity extends AppCompatActivity { public final int WRITE_EXTERNAL_STORAGE_FROM_ACTIONBAR = 1; private ContentResolver mResolver; private OnionListAdapter mAdapter; + private FloatingActionButton fab; private String mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=1"; @@ -43,7 +47,7 @@ public class HiddenServicesActivity extends AppCompatActivity { mResolver = getContentResolver(); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -96,6 +100,40 @@ public class HiddenServicesActivity extends AppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.hs_menu, menu); + + MenuItem item = menu.findItem(R.id.hs_type); + Spinner spinner = (Spinner) MenuItemCompat.getActionView(item); + + ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource( + this, R.array.array_hs_types, android.R.layout.simple_spinner_item); + + adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + + spinner.setAdapter(adapter); + + spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + + @Override + public void onItemSelected(AdapterView<?> arg0, View v, int pos, long id) { + if (pos == 0) { + mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=1"; + fab.show(); + } else { + mWhere = HSContentProvider.HiddenService.CREATED_BY_USER + "=0"; + fab.hide(); + } + + mAdapter.changeCursor(mResolver.query( + HSContentProvider.CONTENT_URI, HSContentProvider.PROJECTION, mWhere, null, null + )); + } + + @Override + public void onNothingSelected(AdapterView<?> arg0) { + // Do nothing + } + }); + return true; } diff --git a/app/src/main/res/menu/hs_menu.xml b/app/src/main/res/menu/hs_menu.xml index cfe580d..e82a935 100644 --- a/app/src/main/res/menu/hs_menu.xml +++ b/app/src/main/res/menu/hs_menu.xml @@ -1,5 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/hs_type" + android:background="#ff00" + android:title="@string/service_type" + app:actionViewClass="android.widget.Spinner" + app:showAsAction="always" /> + <item android:id="@+id/menu_restore_backup" android:title="@string/restore_backup" /> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 795a419..d0f2201 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -9,5 +9,8 @@ <item>Get New Bridges</item> <item></item> </string-array> - + <string-array name="array_hs_types"> + <item>User services</item> + <item>App services</item> + </string-array> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f189cd3..c8af6bb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -361,4 +361,5 @@ <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string> <string name="confirm_service_deletion">Confirm service deletion</string> <string name="click_again_for_backup">Click again for backup</string> + <string name="service_type">Service type</string> </resources>

1 0

[orbot/master] bug fix
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 9e0bdcf147b1ceba26844195330507e6ff0619bf Author: arrase <arrase(a)gmail.com> Date: Sun Nov 27 23:52:35 2016 +0100 bug fix --- .../main/java/org/torproject/android/OrbotMainActivity.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 59dba4b..c1e37fb 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -623,7 +623,12 @@ public class OrbotMainActivity extends AppCompatActivity ); if (onion != null && onion.getCount() > 0) { + onion.moveToNext(); hostname = onion.getString(onion.getColumnIndex(HSContentProvider.HiddenService.NAME)); + + if(hostname == null || hostname.length() < 1) + continue; + nResult.putExtra("hs_host", hostname); if (hsKeyPath != null) { @@ -649,11 +654,10 @@ public class OrbotMainActivity extends AppCompatActivity } onion.close(); + setResult(RESULT_OK, nResult); + finish(); } } - - setResult(RESULT_OK, nResult); - finish(); } }.start();

1 0

[orbot/master] fix
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 7a941edeee7c637e6a9d4fedf84d1d76b680bb86 Author: Juan Ezquerro LLanes <juan(a)paynopain.com> Date: Tue Nov 29 11:16:35 2016 +0100 fix --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 1fe6a0b..abad2db 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -111,7 +111,7 @@ public class OrbotMainActivity extends AppCompatActivity private ActionBarDrawerToggle mDrawerToggle; /* Some tracking bits */ - private String torStatus = null; //latest status reported from the tor service + private String torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service private Intent lastStatusIntent; // the last ACTION_STATUS Intent received private SharedPreferences mPrefs = null;

1 0

[orbot/master] delete by id
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit f742b270e3221c5b1d52713afc798e1c182c24b8 Author: arrase <arrase(a)gmail.com> Date: Mon Nov 28 23:32:35 2016 +0100 delete by id --- .../android/ui/hiddenservices/HiddenServicesActivity.java | 4 ++++ .../android/ui/hiddenservices/dialogs/HSDeleteDialog.java | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java index 8e0e235..6ee3281 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java @@ -73,6 +73,10 @@ public class HiddenServicesActivity extends AppCompatActivity { Cursor item = (Cursor) parent.getItemAtPosition(position); Bundle arguments = new Bundle(); + arguments.putInt( + "_id", item.getInt(item.getColumnIndex(HSContentProvider.HiddenService._ID)) + ); + arguments.putString( "port", item.getString(item.getColumnIndex(HSContentProvider.HiddenService.PORT)) ); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java index 3523e85..4e0643e 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/dialogs/HSDeleteDialog.java @@ -2,6 +2,7 @@ package org.torproject.android.ui.hiddenservices.dialogs; import android.app.Dialog; +import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; @@ -17,14 +18,17 @@ public class HSDeleteDialog extends DialogFragment { @Override public Dialog onCreateDialog(Bundle savedInstanceState) { final Bundle arguments = getArguments(); + final Context context = getContext(); DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { switch (which) { case DialogInterface.BUTTON_POSITIVE: - getActivity().getContentResolver().delete( - HSContentProvider.CONTENT_URI, "port=" + arguments.getString("port"), null + context.getContentResolver().delete( + HSContentProvider.CONTENT_URI, + HSContentProvider.HiddenService._ID + "=" + arguments.getInt("_id"), + null ); break; @@ -35,7 +39,7 @@ public class HSDeleteDialog extends DialogFragment { } }; - return new AlertDialog.Builder(getActivity()) + return new AlertDialog.Builder(context) .setMessage(R.string.confirm_service_deletion) .setPositiveButton(R.string.btn_okay, dialogClickListener) .setNegativeButton(R.string.btn_cancel, dialogClickListener)

1 0

[orbot/master] bug fix
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 9ffb0b3915bae780b38dba223b7495d72663b7ff Author: arrase <arrase(a)gmail.com> Date: Mon Nov 28 01:04:32 2016 +0100 bug fix --- .../main/java/org/torproject/android/OrbotMainActivity.java | 13 ++++++------- .../android/ui/hiddenservices/backup/BackupUtils.java | 8 ++++++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 40d67c4..8e03f56 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -597,7 +597,12 @@ public class OrbotMainActivity extends AppCompatActivity if (onionHostname == null || onionHostname.length() < 1) { - requestTorRereadConfig(); + if (hsKeyPath != null) { + BackupUtils hsutils = new BackupUtils(getApplicationContext()); + hsutils.restoreKeyBackup(hsPort, hsKeyPath); + } + + startTor(); new Thread() { @@ -631,12 +636,6 @@ public class OrbotMainActivity extends AppCompatActivity nResult.putExtra("hs_host", hostname); - if (hsKeyPath != null) { - BackupUtils hsutils = new BackupUtils(getApplicationContext()); - hsutils.restoreKeyBackup(hsPort, hsKeyPath); - requestTorRereadConfig(); - } - if (backupToPackage != null && backupToPackage.length() > 0) { String servicePath = getFilesDir() + "/" + TorServiceConstants.HIDDEN_SERVICES_DIR + "/hs" + hsPort; File hidden_service_key = new File(servicePath, "private_key"); diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java index dbaf7e3..5a1185c 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/backup/BackupUtils.java @@ -211,12 +211,16 @@ public class BackupUtils { } public void restoreKeyBackup(int hsPort, Uri hsKeyPath) { - String keyFilePath = mHSBasePath + "/hs" + hsPort + "/private_key"; + + File serviceDir = new File(mHSBasePath, "hs" + hsPort); + + if (!serviceDir.isDirectory()) + serviceDir.mkdirs(); try { ParcelFileDescriptor mInputPFD = mContext.getContentResolver().openFileDescriptor(hsKeyPath, "r"); InputStream fileStream = new FileInputStream(mInputPFD.getFileDescriptor()); - OutputStream file = new FileOutputStream(keyFilePath); + OutputStream file = new FileOutputStream(serviceDir.getAbsolutePath() + "/private_key"); byte[] buffer = new byte[1024]; int length;

1 0

[orbot/master] feedback
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 155c18235aef73946fb1b4df2f95bf801fb9de0e Author: arrase <arrase(a)gmail.com> Date: Mon Nov 28 23:58:55 2016 +0100 feedback --- .../torproject/android/ui/hiddenservices/HiddenServicesActivity.java | 3 ++- app/src/main/res/values/strings.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java index 6ee3281..5771701 100644 --- a/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java +++ b/app/src/main/java/org/torproject/android/ui/hiddenservices/HiddenServicesActivity.java @@ -15,6 +15,7 @@ import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; +import android.widget.Toast; import org.torproject.android.R; import org.torproject.android.ui.hiddenservices.adapters.OnionListAdapter; @@ -132,7 +133,7 @@ public class HiddenServicesActivity extends AppCompatActivity { break; } case HSActionsDialog.WRITE_EXTERNAL_STORAGE_FROM_ACTION_DIALOG: { - // TODO + Toast.makeText(this, R.string.click_again_for_backup, Toast.LENGTH_LONG).show(); break; } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6294b1..2b136db 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -353,4 +353,5 @@ <string name="name_can_t_be_empty">Name can\'t be empty</string> <string name="start_tor_again_for_finish_the_process">Start Tor again for finish the process</string> <string name="confirm_service_deletion">Confirm service deletion</string> + <string name="click_again_for_backup">Click again for backup</string> </resources>

1 0

[orbot/master] fix indent
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit 8abfba5fe556c38dc04f8229b24b8100851f0757 Author: arrase <arrase(a)gmail.com> Date: Tue Nov 29 00:06:59 2016 +0100 fix indent --- app/src/main/res/values/strings.xml | 618 ++++++++++++++++++------------------ 1 file changed, 312 insertions(+), 306 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b136db..279f97d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,251 +1,257 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">Orbot</string> - <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> - <string name="internal_web_url">http://orbot/</string> - <string name="default_web_url">http://check.torproject.org</string> - <string name="secure_default_web_url">https://check.torproject.org</string> - <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> - <string name="control_permission_label">start and stop Tor</string> - <string name="tor_proxy_service_process">torproxyservice</string> - <string name="status_starting_up">Orbot is starting…</string> - <string name="status_activated">Connected to the Tor network</string> - <string name="status_disabled">Orbot is deactivated</string> - <string name="status_shutting_down">TorService is shutting down</string> - <string name="tor_process_starting">Starting Tor client…</string> - <string name="tor_process_complete">complete.</string> - <string name="tor_process_waiting">waiting.</string> - <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> - <string name="menu_home">Home</string> - <string name="menu_browse">Browse</string> - <string name="menu_settings">Settings</string> - <string name="menu_log">Log</string> - <string name="menu_info">Help</string> - <string name="menu_apps">VPN</string> - <string name="menu_start">Start</string> - <string name="menu_stop">Stop</string> - <string name="menu_about">About</string> - <string name="menu_promo_apps">Get apps…</string> - <string name="main_layout_download">Download</string> - <string name="main_layout_upload">Upload</string> - <string name="button_help">Help</string> - <string name="button_close">Close</string> - <string name="button_about">About</string> - <string name="button_clear_log">Clear Log</string> - <string name="menu_verify">Check</string> - <string name="menu_exit">Exit</string> - <string name="menu_scan">Scan BridgeQR</string> - <string name="menu_share_bridge">Share BridgeQR</string> - <string name="press_to_start">- long press to start -</string> - <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> - <string name="pref_trans_proxy_title">Transparent Proxying</string> - <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> - <string name="pref_transparent_all_title">Tor Everything</string> - <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> - <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> - <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> - <string name="pref_transparent_port_title">Port List</string> - <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> - <string name="pref_transparent_port_dialog">Enter ports to proxy</string> - <string name="pref_has_root">Request Root Access</string> - <string name="pref_has_root_summary">Request root access for transparent proxying</string> - <string name="status_install_success">Tor binaries successfully installed!</string> - <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> - <string name="title_error">Application Error</string> - <string name="wizard_title">Orbot</string> - <string name="wizard_btn_tell_me_more">About Orbot</string> - <string name="btn_next">Next</string> - <string name="btn_back">Back</string> - <string name="btn_finish">Finish</string> - <string name="btn_okay">Okay</string> - <string name="btn_cancel">Cancel</string> -  - <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> - <string name="wizard_permissions_root">Permission Granted</string> - <string name="wizard_permissions_stock">Orbot Permissions</string> - <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> - <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> - <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> - <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> - <string name="wizard_permission_enable_root">Grant Root for Orbot</string> - <string name="wizard_configure">Configure Torification</string> - <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> - <string name="wizard_configure_all">Proxy All Apps Through Tor</string> - <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> - <string name="wizard_tips_tricks">Orbot-enabled Apps</string> - <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> - <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> - <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> - <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> - <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> - <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> - <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> - <string name="wizard_proxy_help_info">Proxy Settings</string> - <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> - <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string> - <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> -  - <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Browser\' button to test your connection. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> - <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> - <string name="pref_general_group">General</string> - <string name="pref_start_boot_title">Start Orbot on Boot</string> - <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> -  -  - <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> -  - <string name="wizard_warning_title">Warning</string> - <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> -  - <string name="wizard_permissions_title">Permissions</string> - <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> - <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> - <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string> -  - <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> - <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string> - <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> - <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> - <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> -  - <string name="wizard_transproxy_title">Transparent Proxying</string> - <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> - <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> - <string name="wizard_transproxy_none">None</string> - <string name="pref_transparent_tethering_title">Tor Tethering</string> - <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> - <string name="button_grant_superuser">Request Superuser Access</string> - <string name="pref_select_apps">Select Apps</string> - <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> - <string name="pref_node_configuration">Node Configuration</string> - <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> - <string name="pref_entrance_node">Entrance Nodes</string> - <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> - <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> - <string name="pref_allow_background_starts_title">Allow Background Starts</string> - <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> - - <string name="button_proxy_all">Proxy All</string> - <string name="button_proxy_none">Proxy None</string> - <string name="button_invert_selection">Invert Selection</string> - - <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string> - - <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> - <string name="pref_proxy_type_dialog">Enter Proxy Type</string> - - <string name="pref_proxy_host_title">Outbound Proxy Host</string> - <string name="pref_proxy_host_summary">Proxy Server hostname</string> - <string name="pref_proxy_host_dialog">Enter Proxy Host</string> - - <string name="pref_proxy_port_title">Outbound Proxy Port</string> - <string name="pref_proxy_port_summary">Proxy Server port</string> - <string name="pref_proxy_port_dialog">Enter Proxy port</string> - - <string name="pref_proxy_username_title">Outbound Proxy Username</string> - <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> - <string name="pref_proxy_username_dialog">Enter Proxy Username</string> - - <string name="pref_proxy_password_title">Outbound Proxy Password</string> - <string name="pref_proxy_password_summary">Proxy Password (Optional)</string> - <string name="pref_proxy_password_dialog">Enter Proxy Password</string> - - - <string name="status">Status</string> - <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string> - <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string> - <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> - <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> - <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> - <string name="transproxy_rules_cleared">TransProxy rules cleared</string> - <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> - <string name="privoxy_is_running_on_port_">Polipo is running on port: </string> - <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string> - <string name="bridge_error">Bridge Error</string> - <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> - <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> - <string name="error">Error</string> - <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> - <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> - <string name="exit_nodes">Exit Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> - <string name="enter_exit_nodes">Enter Exit Nodes</string> - <string name="exclude_nodes">Exclude Nodes</string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> - <string name="enter_exclude_nodes">Enter Exclude Nodes</string> - <string name="strict_nodes">Strict Nodes</string> - <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> - <string name="bridges">Bridges</string> - <string name="use_bridges">Use Bridges</string> - <string name="bridges_obfuscated">Obfuscated Bridges</string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> - <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> - <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> - <string name="enter_bridge_addresses">Enter Bridge Addresses</string> - <string name="relays">Relays</string> - <string name="relaying">Relaying</string> - <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> - <string name="relay_port">Relay Port</string> - <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> - <string name="enter_or_port">Enter OR port</string> - <string name="relay_nickname">Relay nickname</string> - <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> - <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> - <string name="reachable_addresses">Reachable Addresses</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> - <string name="reachable_ports">Reachable ports</string> - <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> - <string name="enter_ports">Enter ports</string> - <string name="menu_hidden_services">Hidden Services</string> - <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> - <string name="project_home">Project Home(s): </string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> - <string name="the_tor_license">The Tor License</string> - <string name="https_torproject_org">https://torproject.org</string> - <string name="third_party_software">3rd-Party-Software: </string> - <string name="tor_version">Tor: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> - <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> - <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string> - <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> - <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> - <string name="found_existing_tor_process">found existing Tor process…</string> - <string name="something_bad_happened">Something bad happened. Check the log</string> - <string name="hidden_service_on">hidden service on:</string> - <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> - <string name="unable_to_start_tor">Unable to start Tor:</string> - <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> - <string name="pref_use_sys_iptables_title">Use Default Iptables</string> - <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> - - <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> - - <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> - <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> - - <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> - <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> - - <string name="notification_using_bridges">Bridges enabled!</string> - <string name="default_bridges" /> - <string name="set_locale_title">Language</string> - <string name="set_locale_summary">Choose the locale and language for Orbot</string> - <string name="wizard_locale_title">Choose Language</string> - <string name="wizard_locale_msg">Leave default or switch the current language</string> - <string name="powered_by">powered by Tor</string> - <string name="btn_save_settings">Save Settings</string> - <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> - <string name="bandwidth_">Bandwidth:</string> - <string name="down">down</string> - <string name="up">up</string> - <string name="pref_disable_network_title">No Network Auto-Sleep</string> - <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> - <string name="newnym">You\'ve switched to a new Tor identity!</string> - + <string name="app_name">Orbot</string> + <string name="app_description">Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</string> + <string name="internal_web_url">http://orbot/</string> + <string name="default_web_url">http://check.torproject.org</string> + <string name="secure_default_web_url">https://check.torproject.org</string> + <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string> + <string name="control_permission_label">start and stop Tor</string> + <string name="tor_proxy_service_process">torproxyservice</string> + <string name="status_starting_up">Orbot is starting…</string> + <string name="status_activated">Connected to the Tor network</string> + <string name="status_disabled">Orbot is deactivated</string> + <string name="status_shutting_down">TorService is shutting down</string> + <string name="tor_process_starting">Starting Tor client…</string> + <string name="tor_process_complete">complete.</string> + <string name="tor_process_waiting">waiting.</string> + <string name="not_anonymous_yet">WARNING: Your traffic is not anonymous yet! Please configure your applications to use HTTP proxy 127.0.0.1:8118 or SOCKS4A or SOCKS5 proxy 127.0.0.1:9050</string> + <string name="menu_home">Home</string> + <string name="menu_browse">Browse</string> + <string name="menu_settings">Settings</string> + <string name="menu_log">Log</string> + <string name="menu_info">Help</string> + <string name="menu_apps">VPN</string> + <string name="menu_start">Start</string> + <string name="menu_stop">Stop</string> + <string name="menu_about">About</string> + <string name="menu_promo_apps">Get apps…</string> + <string name="main_layout_download">Download</string> + <string name="main_layout_upload">Upload</string> + <string name="button_help">Help</string> + <string name="button_close">Close</string> + <string name="button_about">About</string> + <string name="button_clear_log">Clear Log</string> + <string name="menu_verify">Check</string> + <string name="menu_exit">Exit</string> + <string name="menu_scan">Scan BridgeQR</string> + <string name="menu_share_bridge">Share BridgeQR</string> + <string name="press_to_start">- long press to start -</string> + <string name="pref_trans_proxy_group">Transparent Proxying (Requires Root)</string> + <string name="pref_trans_proxy_title">Transparent Proxying</string> + <string name="pref_trans_proxy_summary">Automatic Torifying of Apps</string> + <string name="pref_transparent_all_title">Tor Everything</string> + <string name="pref_transparent_all_summary">Proxy traffic for all apps through Tor</string> + <string name="pref_transparent_port_fallback_title">Port Proxy Fallback</string> + <string name="pref_transparent_port_fallback_summary">WARNING: Circumvents common ports (80, 443, etc). *USE ONLY* if \'All\' or \'App\' mode doesn\'t work.</string> + <string name="pref_transparent_port_title">Port List</string> + <string name="pref_transparent_port_summary">List of ports to proxy. *USE ONLY* if \'All\' or \'App\' mode doesn\'t work</string> + <string name="pref_transparent_port_dialog">Enter ports to proxy</string> + <string name="pref_has_root">Request Root Access</string> + <string name="pref_has_root_summary">Request root access for transparent proxying</string> + <string name="status_install_success">Tor binaries successfully installed!</string> + <string name="status_install_fail">The Tor binary files were unable to be installed. Please check the log and notify tor-assistants(a)torproject.org</string> + <string name="title_error">Application Error</string> + <string name="wizard_title">Orbot</string> + <string name="wizard_btn_tell_me_more">About Orbot</string> + <string name="btn_next">Next</string> + <string name="btn_back">Back</string> + <string name="btn_finish">Finish</string> + <string name="btn_okay">Okay</string> + <string name="btn_cancel">Cancel</string> +  + <string name="wizard_details">Some Orbot Details</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, LibEvent and Polipo. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> + <string name="wizard_permissions_root">Permission Granted</string> + <string name="wizard_permissions_stock">Orbot Permissions</string> + <string name="wizard_premissions_msg_root">Excellent! We\'ve detected that you have root permissions enabled for Orbot. We will use this power wisely.</string> + <string name="wizard_permissions_msg_stock"> While it is not required, Orbot can become a more powerful tool if your device has root access. Use the button below to grant Orbot superpowers! </string> + <string name="wizard_permissions_no_root">If you don\'t have root access or have no idea what we\'re talking about, just be sure to use apps made to work with Orbot.</string> + <string name="wizard_permissions_consent">I understand and would like to continue without Superuser</string> + <string name="wizard_permission_enable_root">Grant Root for Orbot</string> + <string name="wizard_configure">Configure Torification</string> + <string name="wizard_configure_msg">Orbot gives you the option to route all application traffic through Tor OR to choose your applications individually.</string> + <string name="wizard_configure_all">Proxy All Apps Through Tor</string> + <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> + <string name="wizard_tips_tricks">Orbot-enabled Apps</string> + <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> + <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> + <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> + <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> + <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string> + <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string> + <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string> + <string name="wizard_proxy_help_info">Proxy Settings</string> + <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n \n\n\n You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n </string> + <string name="wizard_final">Orbot is ready!</string> + <string name="wizard_final_msg">Millions of people around the world use Tor for a wide variety of reasons.\n\nJournalists and bloggers, human rights defenders, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens… and now you are ready to, as well!</string> + <string name="wizard_exit_at_first_screen_toast">Please configure Orbot before you can start using it!</string> +  + <string name="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Browser\' button to test your connection. \n\nVisit us at https://guardianproject.info/apps/orbot or send an email to help(a)guardianproject.info to learn more.</string> + <string name="tor_check">This will open your web browser to https://check.torproject.org in order to see if Orbot is probably configured and you are connected to Tor.</string> + <string name="pref_hs_group">Hidden Service Hosting</string> + <string name="pref_general_group">General</string> + <string name="pref_start_boot_title">Start Orbot on Boot</string> + <string name="pref_start_boot_summary">Automatically start Orbot and connect Tor when your Android device boots</string> +  +  + <string name="wizard_title_msg">Orbot brings Tor to Android!\n\nTor helps you defend against content filtering, traffic analysis and network surveillance that threatens privacy, confidential information and personal relationships.\n\nThis wizard will help you configure Orbot and Tor on your device.</string> +  + <string name="wizard_warning_title">Warning</string> + <string name="wizard_warning_msg">Simply installing Orbot will not automatically anonymize your mobile traffic.\n\nYou must properly configure Orbot, your device and other apps to successfully use Tor.</string> +  + <string name="wizard_permissions_title">Permissions</string> + <string name="wizard_permissions_root_msg1">You can optionally grant Orbot \'Superuser\' access to enable advanced features, such as Transparent Proxying.</string> + <string name="wizard_permissions_root_msg2">If you do not want to do this, please make sure to use apps made to work with Orbot</string> + <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide root or \'Superuser\' access.\n\nPlease try the \'Apps\' mode on the main screen instead.</string> +  + <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> + <string name="wizard_tips_orweb">Orfox: Privacy-enhanced browser that works through Tor</string> + <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> + <string name="wizard_tips_fdroid">Find all Guardian Project apps on F-Droid</string> + <string name="wizard_tips_fdroid_org">Find all Guardian Project apps on https://f-droid.org</string> +  + <string name="wizard_transproxy_title">Transparent Proxying</string> + <string name="wizard_transproxy_msg">This allows your apps to automatically run through the Tor network without any configuration.</string> + <string name="wizard_transproxy_hint">(Check this box if you have no idea what we are talking about)</string> + <string name="wizard_transproxy_none">None</string> + <string name="pref_transparent_tethering_title">Tor Tethering</string> + <string name="pref_transparent_tethering_summary">Enable Tor Transparent Proxying for Wifi and USB Tethered Devices (requires restart)</string> + <string name="button_grant_superuser">Request Superuser Access</string> + <string name="pref_select_apps">Select Apps</string> + <string name="pref_select_apps_summary">Choose Apps to Route Through Tor</string> + <string name="pref_node_configuration">Node Configuration</string> + <string name="pref_node_configuration_summary">These are advanced settings that can reduce your anonymity</string> + <string name="pref_entrance_node">Entrance Nodes</string> + <string name="pref_entrance_node_summary">Fingerprints, nicks, countries and addresses for the first hop</string> + <string name="pref_entrance_node_dialog">Enter Entrance Nodes</string> + <string name="pref_allow_background_starts_title">Allow Background Starts</string> + <string name="pref_allow_background_starts_summary">Let any app tell Orbot to start Tor and related services</string> + + <string name="button_proxy_all">Proxy All</string> + <string name="button_proxy_none">Proxy None</string> + <string name="button_invert_selection">Invert Selection</string> + + <string name="pref_proxy_title">Outbound Network Proxy (Optional)</string> + + <string name="pref_proxy_type_title">Outbound Proxy Type</string> + <string name="pref_proxy_type_summary">Protocol to use for proxy server: HTTP, HTTPS, Socks4, Socks5</string> + <string name="pref_proxy_type_dialog">Enter Proxy Type</string> + + <string name="pref_proxy_host_title">Outbound Proxy Host</string> + <string name="pref_proxy_host_summary">Proxy Server hostname</string> + <string name="pref_proxy_host_dialog">Enter Proxy Host</string> + + <string name="pref_proxy_port_title">Outbound Proxy Port</string> + <string name="pref_proxy_port_summary">Proxy Server port</string> + <string name="pref_proxy_port_dialog">Enter Proxy port</string> + + <string name="pref_proxy_username_title">Outbound Proxy Username</string> + <string name="pref_proxy_username_summary">Proxy Username (Optional)</string> + <string name="pref_proxy_username_dialog">Enter Proxy Username</string> + + <string name="pref_proxy_password_title">Outbound Proxy Password</string> + <string name="pref_proxy_password_summary">Proxy Password (Optional)</string> + <string name="pref_proxy_password_dialog">Enter Proxy Password</string> + + + + <string name="status">Status</string> + <string name="setting_up_full_transparent_proxying_">Setting up full transparent proxying…</string> + <string name="setting_up_app_based_transparent_proxying_">Setting up app-based transparent proxying…</string> + <string name="transparent_proxying_enabled">Transparent proxying ENABLED</string> + <string name="transproxy_enabled_for_tethering_">TransProxy enabled for Tethering!</string> + <string name="warning_error_starting_transparent_proxying_">WARNING: error starting transparent proxying!</string> + <string name="transproxy_rules_cleared">TransProxy rules cleared</string> + <string name="couldn_t_start_tor_process_">Couldn\'t start Tor process: </string> + <string name="privoxy_is_running_on_port_">Polipo is running on port: </string> + <string name="setting_up_port_based_transparent_proxying_">Setting up port-based transparent proxying…</string> + <string name="bridge_error">Bridge Error</string> + <string name="bridge_requires_ip">In order to use the bridge feature, you must enter at least one bridge IP address.</string> + <string name="send_email_for_bridges">Send an email to bridges(a)torproject.org with the line \"get bridges\" by itself in the body of the mail from a gmail account.</string> + <string name="error">Error</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Your ReachableAddresses settings caused an exception!</string> + <string name="your_relay_settings_caused_an_exception_">Your relay settings caused an exception!</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerprints, nicks, countries and addresses for the last hop</string> + <string name="enter_exit_nodes">Enter Exit Nodes</string> + <string name="exclude_nodes">Exclude Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerprints, nicks, countries and addresses to exclude</string> + <string name="enter_exclude_nodes">Enter Exclude Nodes</string> + <string name="strict_nodes">Strict Nodes</string> + <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Use Bridges</string> + <string name="bridges_obfuscated">Obfuscated Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> + <string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> + <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> + <string name="enter_bridge_addresses">Enter Bridge Addresses</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Enable your device to be a non-exit relay</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Listening port for your Tor relay</string> + <string name="enter_or_port">Enter OR port</string> + <string name="relay_nickname">Relay nickname</string> + <string name="the_nickname_for_your_tor_relay">The nickname for your Tor relay</string> + <string name="enter_a_custom_relay_nickname">Enter a custom relay nickname</string> + <string name="reachable_addresses">Reachable Addresses</string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Run as a client behind a firewall with restrictive policies</string> + <string name="reachable_ports">Reachable ports</string> + <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> + <string name="enter_ports">Enter ports</string> + <string name="enable_hidden_services">Hidden Service Hosting</string> + <string name="run_servers_accessible_via_the_tor_network">allow on-device server to be accessible via the Tor network</string> + <string name="enter_localhost_ports_for_hidden_services">enter localhost ports for hidden services</string> + <string name="hidden_service_ports">Hidden Service Ports</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">the addressable name for your hidden service (generated automatically)</string> + <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">enable debug log to output (must use adb or aLogCat to view)</string> + <string name="project_home">Project Home(s): </string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="the_tor_license">The Tor License</string> + <string name="https_torproject_org">https://torproject.org</string> + <string name="third_party_software">3rd-Party-Software: </string> + <string name="tor_version">Tor: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> + <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> + <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string> + <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> + <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> + <string name="found_existing_tor_process">found existing Tor process…</string> + <string name="something_bad_happened">Something bad happened. Check the log</string> + <string name="hidden_service_on">hidden service on:</string> + <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> + <string name="unable_to_start_tor">Unable to start Tor:</string> + <string name="unable_to_reset_tor">Reboot your device, unable to reset Tor!</string> + <string name="pref_use_sys_iptables_title">Use Default Iptables</string> + <string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + + <string name="error_installing_binares">The Tor binaries were not able to be installed or upgraded.</string> + + <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> + <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> + + <string name="pref_use_expanded_notifications">Show expanded notification with Tor exit country and IP</string> + <string name="pref_use_expanded_notifications_title">Expanded Notifications</string> + + <string name="notification_using_bridges">Bridges enabled!</string> + <string name="default_bridges"/> + <string name="set_locale_title">Language</string> + <string name="set_locale_summary">Choose the locale and language for Orbot</string> + <string name="wizard_locale_title">Choose Language</string> + <string name="wizard_locale_msg">Leave default or switch the current language</string> + <string name="powered_by">powered by Tor</string> + <string name="btn_save_settings">Save Settings</string> + <string name="no_internet_connection_tor">No internet connection; Tor is on standby…</string> + <string name="bandwidth_">Bandwidth:</string> + <string name="down">down</string> + <string name="up">up</string> + <string name="pref_disable_network_title">No Network Auto-Sleep</string> + <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> + <string name="newnym">You\'ve switched to a new Tor identity!</string> + <string name="menu_verify_browser">Browser</string> <string name="menu_use_chatsecure">Use ChatSecure</string> @@ -256,82 +262,82 @@ <string name="no_network_connectivity_putting_tor_to_sleep_">No network connectivity. Putting Tor to sleep…</string> <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor up…</string> <string name="updating_settings_in_tor_service">updating settings in Tor service</string> - + <string name="pref_socks_title">Tor SOCKS</string> <string name="pref_socks_summary">Port that Tor offers its SOCKS proxy on (default: 9050 or 0 to disable)</string> <string name="pref_socks_dialog">SOCKS Port Config</string> - + <string name="pref_transport_title">Tor TransProxy Port</string> <string name="pref_transport_summary">Port that Tor offers its Transparent Proxy on (default: 9040 or 0 to disable)</string> <string name="pref_transport_dialog">TransProxy Port Config</string> - - + + <string name="pref_dnsport_title">Tor DNS Port</string> <string name="pref_dnsport_summary">Port that Tor offers its DNS on (default: 5400 or 0 to disable)</string> <string name="pref_dnsport_dialog">DNS Port Config</string> - - + + <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string> <string name="pref_torrc_dialog">Custom Torrc</string> - + <string name="wizard_tips_martus">Mobile Martus - Benetech Human Rights Documentation App</string> - <string name="your_tor_public_ips_">Your Tor Public IPs:</string> - <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string> - <string name="app_conflict">App Conflict</string> - + <string name="your_tor_public_ips_">Your Tor Public IPs:</string> + <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">"Please disable this app in Android->Settings->Apps if you are having problems with Orbot: "</string> + <string name="app_conflict">App Conflict</string> + + + <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string> + <string name="pref_transproxy_refresh_summary">Re-apply Transproxy rules when the network state changes</string> + + <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string> + <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string> + <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string> + <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string> + <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string> + + <string name="menu_vpn">Apps</string> + + <string name="kbps">kbps</string> + + <string name="mbps">mbps</string> + + <string name="kb">KB</string> + + <string name="mb">MB</string> + + <string name="bridges_updated">Bridges Updated</string> + + <string name="restart_orbot_to_use_this_bridge_">Please restart Orbot to enable the changes</string> + + <string name="menu_qr">QR Codes</string> + + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string> + + <string name="bridge_mode">Bridge Mode</string> + + <string name="get_bridges_email">Email</string> + <string name="get_bridges_web">Web</string> + + <string name="activate">Activate</string> + + <string name="apps_mode">Apps VPN Mode</string> + + <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable all apps on your device to run through the Tor network using the VPN feature of Android.\n\n*WARNING* This is a new, experimental feature and in some cases may not start automatically, or may stop. It should NOT be used for anonymity, and ONLY used for getting through firewalls and filters.</string> + + <string name="send_email">Send Email</string> + + <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy & paste it into the \"Bridges\" preference in Orbot\'s setting and restart.</string> + + <string name="install_orweb">Install Orfox</string> + + <string name="standard_browser">Standard Browser</string> + + <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> - <string name="pref_transproxy_refresh_title">Transproxy Auto-Refresh</string> - <string name="pref_transproxy_refresh_summary">Re-apply Transproxy rules when the network state changes</string> - - <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string> - <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string> - <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string> - <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string> - <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string> - - <string name="menu_vpn">Apps</string> - - <string name="kbps">kbps</string> - - <string name="mbps">mbps</string> - - <string name="kb">KB</string> - - <string name="mb">MB</string> - - <string name="bridges_updated">Bridges Updated</string> - - <string name="restart_orbot_to_use_this_bridge_">Please restart Orbot to enable the changes</string> - - <string name="menu_qr">QR Codes</string> - - <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string> - - <string name="bridge_mode">Bridge Mode</string> - - <string name="get_bridges_email">Email</string> - <string name="get_bridges_web">Web</string> - - <string name="activate">Activate</string> - - <string name="apps_mode">Apps VPN Mode</string> - - <string name="you_can_enable_all_apps_on_your_device_to_run_through_the_tor_network_using_the_vpn_feature_of_android_">You can enable all apps on your device to run through the Tor network using the VPN feature of Android.\n\n*WARNING* This is a new, experimental feature and in some cases may not start automatically, or may stop. It should NOT be used for anonymity, and ONLY used for getting through firewalls and filters.</string> - - <string name="send_email">Send Email</string> - - <string name="you_must_get_a_bridge_address_by_email_web_or_from_a_friend_once_you_have_this_address_please_paste_it_into_the_bridges_preference_in_orbot_s_setting_and_restart_">You can get a bridge address through email, the web or by scanning a bridge QR code. Select \'Email\' or \'Web\' below to request a bridge address.\n\nOnce you have an address, copy & paste it into the \"Bridges\" preference in Orbot\'s setting and restart.</string> - - <string name="install_orweb">Install Orfox</string> - - <string name="standard_browser">Standard Browser</string> - - <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> - - <string name="vpn_default_world">World (Location)</string> <string name="hidden_services">Hidden Services</string> <string name="title_activity_hidden_services">Hidden Services</string> + <string name="menu_hidden_services">Hidden Services</string> <string name="save">Save</string> <string name="ports">Ports</string> <string name="local_port">Local Port</string>

1 0

[orbot/master] fix string
by n8fr8＠torproject.org 02 Mar '17

02 Mar '17

commit bb5f323b71fc2f68f6e90321e6c9a19803780879 Author: arrase <arrase(a)gmail.com> Date: Tue Nov 29 00:11:25 2016 +0100 fix string --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 279f97d..f189cd3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -335,6 +335,7 @@ <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> + <string name="vpn_default_world">World (Location)</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>

1 0