tor-commits October 2011

tor-commits@lists.torproject.org

18 participants
1256 discussions

[orbot/master] clean up of main class imports
by n8fr8＠torproject.org 29 Oct '11

29 Oct '11

commit 838bd6a76145939bef09b3c7c8daee40fa473a91 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Oct 29 02:54:52 2011 -0400 clean up of main class imports --- src/org/torproject/android/Orbot.java | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 96eb6d6..e105db7 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -6,11 +6,6 @@ package org.torproject.android; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.util.StringTokenizer; - import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorServiceConstants; @@ -38,13 +33,10 @@ import android.os.Message; import android.os.RemoteException; import android.preference.PreferenceManager; import android.util.Log; -import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; -import android.view.MotionEvent; import android.view.View; -import android.view.View.OnClickListener; import android.view.View.OnLongClickListener; import android.widget.ImageView; import android.widget.TextView;

1 0

[orbot/master] fixes for wizard transproxy screen
by n8fr8＠torproject.org 29 Oct '11

29 Oct '11

commit 73265cec1d1eb8e095078e3525d9ca8c81888226 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Oct 28 13:39:14 2011 -0400 fixes for wizard transproxy screen --- res/layout/layout_about.xml | 2 +- res/layout/layout_apps.xml | 18 +++- .../torproject/android/settings/AppManager.java | 13 +++- .../android/wizard/ConfigureTransProxy.java | 91 ++++++++++++++------ 4 files changed, 92 insertions(+), 32 deletions(-) diff --git a/res/layout/layout_about.xml b/res/layout/layout_about.xml index f81a940..0e0be56 100644 --- a/res/layout/layout_about.xml +++ b/res/layout/layout_about.xml @@ -80,7 +80,7 @@ android:paddingLeft="15px" android:textStyle="bold" android:textColor="#00ff00" /> - <TextView android:text="Tor v0.2.2.25: https://www.torproject.org" + <TextView android:text="Tor v0.2.3.6-alpha: https://www.torproject.org" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" diff --git a/res/layout/layout_apps.xml b/res/layout/layout_apps.xml index afd3618..ddd546d 100644 --- a/res/layout/layout_apps.xml +++ b/res/layout/layout_apps.xml @@ -1,9 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:duplicateParentState="false"> +<RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:duplicateParentState="false"> + + + +<Button android:layout_width="fill_parent" + android:layout_height="wrap_content" android:id="@+id/btnsave" + android:text="@string/button_close" android:layout_alignParentBottom="true" /> + + <ListView android:layout_above="@id/btnsave" android:layout_alignParentTop="true" android:layout_width="fill_parent" android:layout_height="fill_parent" android:id="@+id/applistview"></ListView> +</RelativeLayout> diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 6874f2d..3ced335 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -28,6 +28,7 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ArrayAdapter; +import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -55,8 +56,6 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC mAppManager = this; - - } @@ -66,6 +65,16 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC super.onResume(); listApps = (ListView)findViewById(R.id.applistview); + Button btnSave = (Button)findViewById(R.id.btnsave); + btnSave.setOnClickListener(new OnClickListener() + { + + @Override + public void onClick(View v) { + finish(); + } + }); + if (!appsLoaded) loadApps(); } diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 05e4e68..a343e04 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -39,7 +39,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { { super.onCreate(savedInstanceState); context = this; - + } @Override @@ -56,9 +56,41 @@ public class ConfigureTransProxy extends Activity implements TorConstants { protected void onResume() { super.onResume(); + setupUI(); + + } + private void setupUI () + { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + + boolean transEnabled = prefs.getBoolean(PREF_TRANSPARENT, false); + + if (transEnabled) + { + boolean transAllEnabled = prefs.getBoolean(PREF_TRANSPARENT_ALL, false); + + if (transAllEnabled) + { + RadioButton rb0 = (RadioButton)findViewById(R.id.radio0); + rb0.setChecked(true); + + + } + else + { + RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); + rb1.setChecked(true); + + } + + Button next = ((Button)findViewById(R.id.btnWizard2)); + next.setEnabled(true); + } + + } private void stepSix(){ @@ -85,13 +117,29 @@ public class ConfigureTransProxy extends Activity implements TorConstants { //Dirty flag variable - improve logic @Override public void onClick(View v) { - if( flag == 1 ) - context.startActivity(new Intent(context, AppManager.class)); - - else + showWizardFinal(); } }); + + + RadioButton rb0 = (RadioButton)findViewById(R.id.radio0); + RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); + RadioButton rb2 = (RadioButton)findViewById(R.id.radio2); + + rb1.setOnClickListener(new OnClickListener() + { + + @Override + public void onClick(View v) { + + context.startActivity(new Intent(context, AppManager.class)); + + + + } + + }); RadioGroup mRadioGroup = (RadioGroup)findViewById(R.id.radioGroup); mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){ @@ -101,14 +149,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { public void onCheckedChanged(RadioGroup group, int checkedId){ Button next = ((Button)findViewById(R.id.btnWizard2)); next.setEnabled(true); - next.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - - showWizardFinal(); - } - }); RadioButton rb0 = (RadioButton)findViewById(R.id.radio0); RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); @@ -129,23 +169,13 @@ public class ConfigureTransProxy extends Activity implements TorConstants { else if(rb1.isChecked()) { - flag = 1; + flag++; pEdit.putBoolean(PREF_TRANSPARENT, true); pEdit.putBoolean(PREF_TRANSPARENT_ALL, false); pEdit.putString("radiobutton","rb1"); pEdit.commit(); - - next.setOnClickListener(new View.OnClickListener() { - - @Override - public void onClick(View v) { - - context.startActivity(new Intent(context, AppManager.class)); - - - } - }); + } else if(rb2.isChecked()) { @@ -189,4 +219,15 @@ public class ConfigureTransProxy extends Activity implements TorConstants { } + + @Override + protected void onRestoreInstanceState(Bundle savedInstanceState) { + super.onRestoreInstanceState(savedInstanceState); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + + } } \ No newline at end of file

1 0

[orbot/master] updates to properly support tor-tether mode
by n8fr8＠torproject.org 29 Oct '11

29 Oct '11

commit ef5c506fddb76d521493a38bd13fd440156db446 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Oct 28 23:53:40 2011 -0400 updates to properly support tor-tether mode --- res/raw/torrc | 8 ++++---- res/raw/torrctether | 14 ++++++++++++++ src/org/torproject/android/Orbot.java | 5 ++++- .../android/service/TorBinaryInstaller.java | 3 +++ src/org/torproject/android/service/TorService.java | 14 +++++++++++++- .../android/service/TorServiceConstants.java | 2 ++ src/org/torproject/android/wizard/Permissions.java | 12 ++++++++++++ 7 files changed, 52 insertions(+), 6 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index d1cd7fd..f3d79d2 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,14 +1,14 @@ SocksPort 9050 SafeSocks 1 Log notice stdout +ControlListenAddress 127.0.0.1 ControlPort 9051 CookieAuthentication 1 RelayBandwidthRate 20 KBytes RelayBandwidthBurst 20 KBytes UseBridges 0 AutomapHostsOnResolve 1 -TransListenAddress 0.0.0.0 +TransListenAddress 127.0.0.1 TransPort 9040 -DNSListenAddress 0.0.0.0 -DNSPort 5400 - +DNSListenAddress 127.0.0.1 +DNSPort 5400 \ No newline at end of file diff --git a/res/raw/torrctether b/res/raw/torrctether new file mode 100644 index 0000000..3edb5c8 --- /dev/null +++ b/res/raw/torrctether @@ -0,0 +1,14 @@ +SocksPort 9050 +SafeSocks 1 +Log notice stdout +ControlListenAddress 127.0.0.1 +ControlPort 9051 +CookieAuthentication 1 +RelayBandwidthRate 20 KBytes +RelayBandwidthBurst 20 KBytes +UseBridges 0 +AutomapHostsOnResolve 1 +TransListenAddress 0.0.0.0 +TransPort 9040 +DNSListenAddress 0.0.0.0 +DNSPort 5400 \ No newline at end of file diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5470042..96eb6d6 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -588,7 +588,10 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants lblStatus.setText(lblMsg); if (torServiceMsg != null && torServiceMsg.length() > 0) - showAlert("Update", torServiceMsg, false); + { + // showAlert("Update", torServiceMsg, false); + lblStatus.setText(torServiceMsg); + } boolean showFirstTime = prefs.getBoolean("connect_first_time",true); diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index b540f0c..a3b1995 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -50,6 +50,9 @@ public class TorBinaryInstaller implements TorServiceConstants { is = context.getResources().openRawResource(R.raw.torrc); streamToFile(is,installFolder, TORRC_ASSET_KEY, false, false); + is = context.getResources().openRawResource(R.raw.torrctether); + streamToFile(is,installFolder, TORRC_TETHER_KEY, false, false); + is = context.getResources().openRawResource(R.raw.privoxy); streamToFile(is,installFolder, PRIVOXY_ASSET_KEY, false, false); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 70b7c9c..c4b7b1f 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -582,6 +582,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst showAlert("Status", "TransProxy enabled for Tethering!"); TorTransProxy.enableTetheringRules(this); + + // mBinder.updateConfiguration("TransListenAddress", "0.0.0.0", false); + // mBinder.updateConfiguration("DNSListenAddress", "0.0.0.0", false); + } } else @@ -617,6 +621,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); + + if (transProxyTethering) + { + torrcPath = new File(appBinHome, TORRC_TETHER_KEY).getAbsolutePath(); + } + String[] torCmd = {torBinaryPath + " DataDirectory " + appDataHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n"}; boolean runAsRootFalse = false; @@ -1430,7 +1442,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mBinder.updateConfiguration("HiddenServiceDir","", false); } - + mBinder.saveConfiguration(); return true; diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 759d0ce..e47ed71 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -15,6 +15,8 @@ public interface TorServiceConstants { //torrc (tor config file) public final static String TORRC_ASSET_KEY = "torrc"; + public final static String TORRC_TETHER_KEY = "torrctether"; + public final static String TOR_CONTROL_COOKIE = "control_auth_cookie"; //how to launch tor diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index ecb7b50..f2c24a0 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -137,6 +137,18 @@ public class Permissions extends Activity implements TorConstants { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); boolean hasRoot = prefs.getBoolean("has_root",false); + + if (!hasRoot) + { + + hasRoot = TorServiceUtils.isRootPossible(); + + Editor pEdit = prefs.edit(); + pEdit.putBoolean(PREF_HAS_ROOT,hasRoot); + pEdit.commit(); + + } + if (hasRoot) { try {

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 29 Oct '11

29 Oct '11

commit 15fbc001bdcbd1c37bdd0e27068c613267414585 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 29 04:15:34 2011 +0000 Update translations for orbot --- values-ar/strings.xml | 51 ++++++++++++++++++++++++++++++++--------- values-ca/strings.xml | 51 ++++++++++++++++++++++++++++++++--------- values-de/strings.xml | 51 ++++++++++++++++++++++++++++++++--------- values-es/strings.xml | 51 ++++++++++++++++++++++++++++++++--------- values-fa/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-fr/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-hu/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-it/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-mk/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-nb/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-nl/strings.xml | 51 ++++++++++++++++++++++++++++++++--------- values-pl/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-pt/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-ru/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-sv/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values-zh/strings.xml | 49 ++++++++++++++++++++++++++++++++------- values/strings.xml | 61 +++++++++++++++++++++++++++++++++++++------------ 17 files changed, 686 insertions(+), 169 deletions(-) diff --git a/values-ar/strings.xml b/values-ar/strings.xml index e43e865..c0c0201 100644 --- a/values-ar/strings.xml +++ b/values-ar/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">اوربوت (Orbot)</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">أنا متصل بشبكة تور</string> <string name="status_disabled">\"تم إيقاف اوربوت</string> <string name="status_shutting_down">جاري إغلاق اوربوت</string> - <string name="tor_process_connecting">بدء تور...</string> - <string name="tor_process_connecting_step2">ضبط التحكم...</string> - <string name="tor_process_connecting_step3">مكتمل.</string> - <string name="tor_process_connecting_step4">انتظار.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">تحذير: حركة مرورك ليست خفية الى الآن! من فضلك قم بتكوين التطبيقات الخاصة بك لإستخدام HTTP proxy 127.0.0.1:8118 أو SOCK4A أو SOKS5 127.0.0.1:9050</string> <string name="menu_home">الصفحة الرئيسية</string> <string name="menu_browse">تصفّح</string> @@ -57,9 +55,6 @@ <string name="btn_finish">إنهاء</string> <string name="btn_okay">موافق</string> <string name="btn_cancel">إلغاء</string> - <string name="wizard_welcome_msg">بفضل أوربوت، صار ممكنا استعمال تور في أندرويد. تور هو برنامج مجاني وشبكة مفتوحة تساعد على حمايتك من مراقبة الشبكات التي تهدد الخصوصية والحرية الشخصية والعلاقات والأنشطة التجارية السرية ورقابة الدول المعروفة بإسم تحليل حركة المرور. - -*تحذير: *تثبيت أوربوت على جهازك_لن_يقوم بإخفاء تحركات حركة مرورك بشكل سحري! سوف يساعدك هذا المعالج على البدء.</string> <string name="wizard_details">بعض التفاصيل عن أوربوت</string> <string name="wizard_details_msg">أوربوت هو تطبيق مفتوح المصدر والذي يضم تور, LibEvent وPrixovy. يعمل على توفير وكيل HTTP محلي (8118) ووكيل SOCKS (9050) إلى شبكة تور. يتوفر لدى أوربوت القدرة على إرسال جميع حركات مرور الانترنت من خلال تور على الجهاز ذات حقوق المسؤول (root). </string> <string name="wizard_permissions_root">تم منح الإذن</string> @@ -76,7 +71,6 @@ <string name="wizard_tips_tricks">تطبيقات مهيئة لأوربوت</string> <string name="wizard_tips_msg">نشجعكم على تحميل واستخدام التطبيقات التي تعرف كيفية الاتصال مباشرة بأوربوت. اضغط على الأزرار في الأسفل للتثبيت.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> <string name="wizard_tips_proxy">إعدادات الوكيل - تعلم كيفية تكوين التطبيقات لتعمل مع أوربوت</string> <string name="wizard_proxy_help_info">إعدادات الوكيل</string> <string name="wizard_proxy_help_msg">اذا كان تطبيق أندرويد الذي تستخدمه يمكن ان يدعم استخدام وكيل HTTP او SOCKS , عندها يمكنك تكوينه للإتصال بأوربوت واستخدام تور. @@ -90,8 +84,6 @@ </string> <string name="wizard_final">أوربوت جاهز!</string> <string name="wizard_final_msg">مئات الآلاف من الناس في جميع أنحاء العالم يستخدمون تور لأسباب عديدة: الصحفيين والمدونين، والعاملين في مجال حقوق الإنسان، والجنود والشركات والمواطنين من الأنظمة القمعية، والمواطنين العاديين ... والآن أنت مستعد لأن تستخدمه كذلك!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time"> لقد قمت بإتصال ناجح الى شبكة تور - لكن هذا لا يعني بأن جهازك في مأمن. يمكنك استخدام خيار \'تحقق\' من القائمة لإختبار المتصفح الخاص بك. قم بزيارتنا على https://guardianproject.info/apps/orbot او ارسل رسالة الكترونية الى help(a)guardianproject.info لمعرفة المزيد.</string> @@ -100,4 +92,41 @@ <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"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (أندرويد 1.x فقط) - متصفح مصمّم للخصوصية لأوربوت </string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-ca/strings.xml b/values-ca/strings.xml index d4bc6d7..f3978dc 100644 --- a/values-ca/strings.xml +++ b/values-ca/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Connectat a la xarxa Tor</string> <string name="status_disabled">Orbot està desactivat</string> <string name="status_shutting_down">Orbot s\'està aturant</string> - <string name="tor_process_connecting">Iniciant Tor...</string> - <string name="tor_process_connecting_step2">Preparant el control...</string> - <string name="tor_process_connecting_step3">acomplert.</string> - <string name="tor_process_connecting_step4">esperant.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ATENCIÓ : El trànsit de la teva connexió ja no es anònim! Siusplau, configura les teves aplicacions per a usar HTTP proxy 127.0.0.1:8118, per SOCKS4A o SOCKS5 proxy 127.0.0.1:9050</string> <string name="menu_home">Lloc d\'inici</string> <string name="menu_browse">Navega</string> @@ -57,9 +55,6 @@ <string name="btn_finish">Fi</string> <string name="btn_okay">D\'acord</string> <string name="btn_cancel">Cancel·la</string> - <string name="wizard_welcome_msg">Orbot et porta Tor a l\'Android. Tor és programari lliure i una xarxa oberta que t\'ajuda a defensar-te d\'una vigilància a través de la xarxa, amenaçant la teva privacitat i llibertat personal, informació confidencial, activitats i relacions, i seguretat estatal coneguda com anàlisi de trànsit. - -*ALERTA:* Instal·lar Orbot _no_ convertirà la teva connexió en anònima instantàniament! Aquest assistent t\'ajudarà a començar.</string> <string name="wizard_details">Alguns detalls d\'Orbot...</string> <string name="wizard_details_msg">Orbot és una aplicació de codi lliure que conté Tor, LibEvent i Privoxy. Proporciona un Proxy HTTP local (8118) i un proxy SOCKS (9050) a la xarxa Tor. Orbot també té capacitat d\'enviar tot el trànsit de dades d\'internet a través de Tor.</string> <string name="wizard_permissions_root">Permís concedit</string> @@ -76,7 +71,6 @@ <string name="wizard_tips_tricks">Aplicacions per a usar-se amb Orbot</string> <string name="wizard_tips_msg">T\'animem a descarregar-te &amp; utilitza aplicacions que sàpiguen com connectar-se directament a Orbot. Fes clic als botons de sota per instal·lar.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</string> <string name="wizard_tips_proxy">Coniguració de Proxy - Aprèn a configurar aplicacions per a què funcionin amb Orbot</string> <string name="wizard_proxy_help_info">Configuració de Proxy</string> <string name="wizard_proxy_help_msg">Si l\'aplicació d\'Android que estàs utilitzant admet l\'ús d\'un proxy HTTP o SOCKS, pots configurar-la per a connectar-se a Orbot i utilitzar Tor. @@ -90,8 +84,6 @@ Pots aprendre més coses sobre l\'ús dels proxys a Android al FAQ de: http://ti </string> <string name="wizard_final">Orbot és a punt!</string> <string name="wizard_final_msg">Centenars de milers de persones arreu del món utilitzen Tor per un gran ventall de raons: periodistes i blocaires, treballadors pels drets humans, agents de l\'autoritat, soldats, corporacions, ciutadans de règims opressors, i ciutadans qualssevol... I ara tu també ho pots fer!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">T\'has connectat correctament a la xarxa Tor, però això NO vol dir que el teu dispositiu sigui segur. Pots utilitzar la opció \'Comprova\' del menú per provar el teu navegador. Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu electrònic a help(a)guardianproject.info per a saber-ne més.</string> @@ -100,4 +92,41 @@ Visita\'ns a https://guardianproject.info/apps/orbot o envia\'ns un correu elect <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"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Només Android 1.x) - Navegador dissenyat per la privacitat &amp; per a Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-de/strings.xml b/values-de/strings.xml index 0cd9792..0714f9c 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Verbunden mit dem Tor-Netzwerk</string> <string name="status_disabled">\"Orbot ist deaktiviert</string> <string name="status_shutting_down">Orbot wird beendet</string> - <string name="tor_process_connecting">Starte Tor...</string> - <string name="tor_process_connecting_step2">Baue Kontrollverbindung auf...</string> - <string name="tor_process_connecting_step3">erfolgreich abgeschlossen.</string> - <string name="tor_process_connecting_step4">warte.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">WARNUNG: Ihr Datenverkehr ist noch nicht anonymisiert! Bitte stellen Sie Ihre Programme so ein, dass sie entweder den HTTP Proxy 127.0.0.1:8118 oder den SOCKS4A bzw. SOCKS5 Proxy 127.0.0.1:9050 nutzen.</string> <string name="menu_home">Home</string> <string name="menu_browse">Durchstöbern</string> @@ -57,9 +55,6 @@ <string name="btn_finish">Fertigstellen</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Abbrechen</string> - <string name="wizard_welcome_msg">Orbot bringt Tor auf Android Geräte. Tor ist ein freies Programm und ein offenes Netzwerk, dass Ihnen hilft sich gegen Datenverkehrsüberwachung zu wehren, eine Form der Onlineüberwachung, die Ihre persönliche Freiheit, Privatsphäre, vertrauliche Geschäfte und Geschäftseziehungen bedroht. - -*WARNUNG:* Durch die Installation von Orbot wird _nicht_ sofort Ihr kompletter Datenverkehr anonymisiert! Hilfestellung erhalten Sie von diesem Assistenten.</string> <string name="wizard_details">Nähere Informationen zu Orbot</string> <string name="wizard_details_msg">Orbot ist eine quelloffene Anwendung die Tor, LibEvent und Privoxy enthält. Es stellt einen lokalen HTTP Proxy (8118) und einen SOCKS Proxy (9050) zum Tor-Netzwerk zur Verfügung. Orbot hat auf einem System mit Administrationsrechten auch die Fähigkeit, jeglichen Internetverkehr über das Tor-Netzwerk abzuwickeln.</string> <string name="wizard_permissions_root">Erlaubnis erteilt</string> @@ -76,7 +71,6 @@ <string name="wizard_tips_tricks">Programme, für die Orbot aktiviert ist</string> <string name="wizard_tips_msg">Wir raten Ihnen Programme herunterzuladen &amp; zu nutzen, die wissen, wie sie sich direkt mit Orbot verbinden. Klicken Sie zum Installieren auf den Knopf unten.</string> <string name="wizard_tips_otrchat">Gibberbot - Ein sicheres Instant-Messaging Programm für Android</string> - <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string> <string name="wizard_tips_proxy">Proxy-Einstellungen - Lernen Sie Anwendungen so zu konfigurieren, dass sie mit Orbot zusammenarbeiten.</string> <string name="wizard_proxy_help_info">Proxy-Einstellungen</string> <string name="wizard_proxy_help_msg">Wenn das Android-Programm, das Sie benutzten die Verwendung von HTTP- oder SOCKS-Proxys unterstützt, können Sie es konfigurieren sich mit Orbot zu verbinden und Tor zu nutzen. @@ -90,8 +84,6 @@ Erfahren Sie mehr über die Verwendung von Proxys unter Android in den FAQ unter </string> <string name="wizard_final">Orbot ist bereit!</string> <string name="wizard_final_msg">Hunderttausende Menschen auf der ganzen Welt nutzen Tor aus einer Vielzahl von Gründen: Journalisten und Blogger, Menschenrechtsaktivisten, Strafverfolgungsbehörden, Soldaten, Unternehmen, Bürger repressiver Regime und ganz normale Menschen... und sind Sie ebenfalls bereit!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">Sie haben sich erfolgreich mit dem Tor-Netzwerk verbunden - das bedeutet aber NICHT, dass Ihr Gerät sicher ist. Sie können die \'Überprüfen\'-Option aus dem Menü benutzen, um Ihren Browser zu testen. Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail an help(a)guardianproject.info um mehr darüber zu erfahren.</string> @@ -100,4 +92,41 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_general_group">Allgemein</string> <string name="pref_start_boot_title">Orbot beim Systemstart ausführen</string> <string name="pref_start_boot_summary">Automatisches starten von Orbor und verbinden von Tor, wenn dein Android-Gerät startet</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Nur Android 1.x) - Ein für Privatsphäre &amp; Orbot entworfener Browser</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-es/strings.xml b/values-es/strings.xml index 065c81d..f294f8a 100644 --- a/values-es/strings.xml +++ b/values-es/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Conectado a la Red de Tor</string> <string name="status_disabled">\"Orbot está desactivado</string> <string name="status_shutting_down">Orbot se está cerrando</string> - <string name="tor_process_connecting">Iniciando Tor...</string> - <string name="tor_process_connecting_step2">Configurción de control...</string> - <string name="tor_process_connecting_step3">completo.</string> - <string name="tor_process_connecting_step4">esperando.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ADVERTENCIA: ¡Su tráfico no es anónimo aún! Por favor, configure sus aplicaciones para usar el Proxy HTTP 127.0.0.1:8118, el SOCKS4A o el Proxy SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Principal</string> <string name="menu_browse">Examinar</string> @@ -57,9 +55,6 @@ <string name="btn_finish">Finalizar</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Cancelar</string> - <string name="wizard_welcome_msg">Orbot proporciona Tor a Android. Tor es un software libre y una red abierta que le ayuda a defenderse contra una forma de vigilancia que amenaza su libertad y privacidad personal, la confidencialidad en los negocios y en las relaciones, y la seguridad del Estado conocida como análisis de tráfico. - -*ADVERTENCIA:* ¡Instalando Orbot _NO_ anonimizará mágicamente su tráfico del móvil! Este assitente le ayudará a empezar.</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, LibEvent y Privoxy. Provee un Proxy HTTP local (8118) y un Proxy SOCKS (9050) en la red Tor. Orbot también tiene la habilidad, en un dispositivo enrutador, de enviar todo el tráfico de Internet a través de Tor.</string> <string name="wizard_permissions_root">Permiso Concedido</string> @@ -76,7 +71,6 @@ <string name="wizard_tips_tricks">Aplicaciones activas en Orbot</string> <string name="wizard_tips_msg">Le invitamos a descargar y utilizar aplicaciones que saben cómo conectarse directamente a Orbot. Haga clic en los botones a continuación para Instalar.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> <string name="wizard_tips_proxy">Configuraciones Proxy - Aprenda cómo configurar aplicaciones para que trabajen con Orbot</string> <string name="wizard_proxy_help_info">Configuraciones Proxy</string> <string name="wizard_proxy_help_msg">Si la aplicación Android que está utilizando puede soportar el uso de un Proxy HTTP o SOCKS, entonces puede configurarla para conectar a Orbot y utilizar Tor. @@ -90,8 +84,6 @@ Puede aprender más acerca de los proxys en Android a través de las Preguntas F </string> <string name="wizard_final">¡Orbot está listo!</string> <string name="wizard_final_msg">Cientos de miles de personas alrededor del mundo usan Tor por una amplia variedad de razones: periodistas y bloggers, trabajadores de los derechos humanos, oficiales de policía, soldados, corporaciones, ciudadanos de regímenes represivos y ciudadanos ordinarios... ¡y ahora también lo estás!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">Se ha conectado con éxito a la red Tor, pero eso NO significa que su dispositivo es seguro. Puede utilizar la opción \'Comprobar\' desde el menú para probar su navegador. Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo electrónico a help(a)guardianproject.info para aprender más.</string> @@ -100,4 +92,41 @@ Visítenos en https://guardianproject.info/apps/orbot o envíenos un correo elec <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"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Sólo Android 1.x) - Navegador diseñado para la privacidad y para Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-fa/strings.xml b/values-fa/strings.xml index ee5a5f5..2b1d469 100644 --- a/values-fa/strings.xml +++ b/values-fa/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">اوربات</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">پیوسته به شبکه ی Tor</string> <string name="status_disabled">اوربات غیرفعال شده است.</string> <string name="status_shutting_down">اوربات در حال بسته شدن است.</string> - <string name="tor_process_connecting">شروع تُر ...</string> - <string name="tor_process_connecting_step2">راه اندازی نظارت...</string> - <string name="tor_process_connecting_step3">كامل شد.</string> - <string name="tor_process_connecting_step4">در انتظار.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">هشدار: فعالیت شما هنوز \"گمنام\" نیست! لطفن اپلیکیشن خود را تنظیم کنید تا از HTTP پروکسی 127.0.0.1:8118 و یا SOCKS4A و یا SOCKS5 پروکسی 127.0.01:9050 استفاده کند.</string> <string name="menu_home">خانه</string> <string name="menu_browse">جستجو</string> @@ -57,7 +55,6 @@ <string name="btn_finish">پایان</string> <string name="btn_okay">لغو</string> <string name="btn_cancel">لغو</string> - <string name="wizard_welcome_msg">اوربات Tor را به آندرونید وارد می کند. Tor نرم افزاری رایگان و شبکه ای باز است که در مقابل تهدید شبکه های نظارتی علیه آزادی و حریم فردی، فعالیت ها و روابط محرمانه شرکت ها، و امنیت ملی، که \"کاوش فعالیت\" معروف است، به شما کمک می کند. *هشدار:* نصب اوربات به تنهایی قادر نیست معجزه ای صورت دهد و فعالیت آنلاین شما را مخفی کند! این ابزار تنها کمک می کند که قدم اول را بردارید.</string> <string name="wizard_details">برخی جزئیات در مورد اوربات</string> <string name="wizard_details_msg">اوربات اپلیکیشنی با متن-باز است که شامل Tor, LibEvent و Privoxy. این اپلیکیشن، HTTP پروکسی (8118) محلی و SOCKS پروکسی (9050) را در شبکه Tor در دسترس قرار می دهد. اوربات همچنین قادر است بر روی ابزار root شده، تمام ترافیک اینترنت را از Tor ارسال کند.</string> <string name="wizard_permissions_root">مجوز صادر گردید</string> @@ -74,18 +71,52 @@ <string name="wizard_tips_tricks">اپلیکیشن هایی که برای اوربات تنظیم شده اند</string> <string name="wizard_tips_msg">توصیه می کنیم داون لود و فعال کنید؛ اپلیکیشن هایی را استفاده کنید که مستقیم به اوربات وصل می شوند. دکمه های زیر را فشار دهید تا نصب شود. </string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> <string name="wizard_tips_proxy">تنظیمات پروکسی - یادگیری تنظیم اپلیکیشن ها برای کار با اوربات</string> <string name="wizard_proxy_help_info">تنظیمات پروکسی</string> <string name="wizard_proxy_help_msg">اگر اپلیکشین آندرونوید مورد استفاده شما قابلیت کار با HTTP و یا SOCKS پروکسی دارد می توانید تنظیمش کنید تا به اوربات وصل شود و از Tor استفاده کند. تنظیمات سرویس دهنده 127.0.0.1 و یا \"سرویس-ده محلی\" است. برای HTTP تنظیمات درگاه (port) 8118 است. برای SOCKS، پروکسی مناسب، 9050 است. شما می بایست SOCKS4A و یا در صورت امکان از socks5 استفاده کنید. در صورت نیاز به اطلاعات بیشتر در مورد انتقالده آندروید، می توانید به FAQ (سوالهای معمول) در http://tinyurl.com/proxyandroid مراجعه کنید.</string> <string name="wizard_final">اوربات آماده استفاده میباشد!</string> <string name="wizard_final_msg">صدها هزار نفر در سراسر جهان به دلایل گوناگون از Tor استفاده می کنند: روزنامه نویسها و بلاگرها، کارکنان حقوق بشر، ماموران انتظامی، سربازان، شرکتها، شهروندان دولتهای سرکوبگر، و شهروندان عادی، و حالا شما نیز آماده استفاده از آن هستید!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">اکنون با موفقیت به شبکه Tor وصل شده اید اما به آن معنا نیست که سیستم شما ایمن است. می توانید از منیو گزینه /\"Check/\" را برای آزمایش مرورگر انتخاب کنید. به ما در صفحه https://guardianproject.info/apps/orbot مراجعه کنید و به آدرس help(a)guardianproject.info ایمیلی بفرستید تا اطلاعات بیشتری دریافت کنید. </string> <string name="tor_check">با این قدم پیشفرض مرورگر وب شما به صفحه https://check.torproject.org باز می شود تا شما مشاهده کنید آیا اوربات تنظیم شده است و آیا شما به Tor وصل شده اید یا نه.</string> <string name="pref_hs_group">سرويس هاي مخفي</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"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (فقط آندروید 1.x) - مرورگر طراحی شده برای حفظ حریم خصوصی و افزونساز اوربات</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 78b44b3..82531a4 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Connecté au réseau Tor</string> <string name="status_disabled">\"Orbot est désactivé</string> <string name="status_shutting_down">Orbot s\'arrête</string> - <string name="tor_process_connecting">Démarrage de Tor...</string> - <string name="tor_process_connecting_step2">Configuration en cours...</string> - <string name="tor_process_connecting_step3">effectué.</string> - <string name="tor_process_connecting_step4">en attente.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">AVERTISSEMENT: Votre traffic n\'est pas encore anonyme ! Veuillez configurer vos applications pour qu\'elles utilisent le proxy HTTP à 127.0.0.1:8118 ou le proxy SOCKS4A ou SOCKS5 à 127.0.0.1:9050</string> <string name="menu_home">Accueil</string> <string name="menu_browse">Parcourir</string> @@ -57,7 +55,6 @@ <string name="btn_finish">Fin</string> <string name="btn_okay">Valider</string> <string name="btn_cancel">Annuler</string> - <string name="wizard_welcome_msg">Orbot permet de fournir les services de Tor à Android. Tor est un logiciel libre et un réseau ouvert qui aide à vous défendre contre une forme de surveillance des réseaux informatiques qui menace les libertés individuelles et l\'anonymat, la confidentialité des activités d\'affaires et des relations interpersonnelles, et la sécurité des gouvernements, connu sous le nom d\'analyse de trafic \ n \ n * AVERTISSEMENT : * Il ne suffit pas d\'installer Orbot pour que votre trafic mobile soit anonymisé ! Cet assistant va vous y aider.</string> <string name="wizard_details">Quelques détails sur Orbot</string> <string name="wizard_details_msg">Orbot est une application logicielle libre qui contient Tor, LibEvent et Privoxy. Il fournit un proxy local HTTP (8118) et un proxy SOCKS (9050) dans le réseau Tor. Orbot a aussi la capacité, avec les droits administrateurs, d\'envoyer tout le trafic Internet à travers Tor.</string> <string name="wizard_permissions_root">Permission accordée</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">Applications avec Orbot</string> <string name="wizard_tips_msg">Nous vous encouragons à télécharger &amp; utiliser les applications conçues pour se connecter directement à Orbot. Cliquez sur les boutons ci-dessous pour installer.</string> <string name="wizard_tips_otrchat">Gibberbot - Client de messagerie instantanée pour Android</string> - <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string> <string name="wizard_tips_proxy">Configuration du proxy - Apprendre comment configurer les applications pour qu\'elles fonctionnent avec Orbot</string> <string name="wizard_proxy_help_info">Configuration du proxy</string> <string name="wizard_proxy_help_msg">Si l\'application Android que vous utilisez peut supporter un proxy HTTP ou un proxy SOCKS, vous pouvez la configurer pour se connecter à Orbot et utiliser Tor./n/n @@ -84,12 +80,47 @@ </string> <string name="wizard_final">Orbot est prêt!</string> <string name="wizard_final_msg">Des milliers de personnes dans le monde utilisent Tor pour une grande variétés de raisons : journalistes et bloggers, défenseurs des droits de l\'homme, policiers, soldats, entreprises, les citoyens de régimes répressifs, et aussi de simples citoyens ... et maintenant vous êtes prêts aussi !</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time"> Vous êtes connectés avec succés au réseau Tor - mais cela ne signifie PAS que votre appareil est sécurisé. Vous pouvez utiliser l\'option \'Vérifier\' du menu pour vérifier avec votre navigateur. \n\nAllez à la page https://guardianproject.info/apps/orbot ou envoyez un courriel à help(a)guardianproject.info pour en savoir plus.</string> <string name="tor_check">Ceci va ouvrir la page https://check.torproject.org avec le navigateur web par défaut pour vérifier si Orbot est suffisamment configuré pour vous connecter à Tor.</string> <string name="pref_hs_group">Services cachés</string> <string name="pref_general_group">Général</string> <string name="pref_start_boot_title">Exécuter Orbot automatiquement</string> <string name="pref_start_boot_summary">Démarrer automatiquement Orbot et se connecter à Tor quand votre périphérique Android démarre</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Android 1.x seulement) - navigateur créé pour protéger votre vie privée &amp; pour Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-hu/strings.xml b/values-hu/strings.xml index d135dd2..6ed5ff8 100644 --- a/values-hu/strings.xml +++ b/values-hu/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Csatlakozva a Tor hálózathoz</string> <string name="status_disabled">\"Orbot deaktiválva</string> <string name="status_shutting_down">Az Orbot leállítás alatt</string> - <string name="tor_process_connecting">Tor indítása...</string> - <string name="tor_process_connecting_step2">Vezérlő beállítása...</string> - <string name="tor_process_connecting_step3">kész.</string> - <string name="tor_process_connecting_step4">várakozik.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">FIGYELEM: A forgalma még nem névtelen! Állítsa be alkalmazásait, hogy HTTP proxy használjanak a 127.0.0.1:8118 címen vagy SOCKS4A vagy SOCKS5 proxy-t a 127.0.0.1:9050 címen</string> <string name="menu_home">Kezdőlap</string> <string name="menu_browse">Tallóz</string> @@ -57,7 +55,6 @@ <string name="btn_finish">Befejezés</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Mégsem</string> - <string name="wizard_welcome_msg">Az Orbot elérhetővé teszi a Tor-t Android-on. A Tor egy ingynes szoftver és egy nyílt hálózat, amely védi a hálózati megfigyeléstől, ezáltal magánéletét és személyes szabadságát, bizalmas üzleti tevékenységeit és kapcsolatait, védi az állami szervek forgalom elemzésétől.\n\n*FIGYELEM:* Az Orbot telepítése _NEM_ egy varázslattal teszi névtelenné mobil forgalmát! Ez a varázsló végigvezeti a kezdeteken.</string> <string name="wizard_details">Néhány Orbot Tudnivaló</string> <string name="wizard_details_msg">Az Orbot egy nyílt forrás alkalmazás, ami a Tor, a LibEvent és Privoxy csomagot tartalmazza. Szolgáltatása egy helyi HTTP proxy (8118) és egy SOCKS proxy (9050) a Tor hálózat felé. Az Orbot további tulajdonsága, hogy rootolt készülék esetén képes a teljes internet forgalom Tor hálózaton keresztül küldésére.</string> <string name="wizard_permissions_root">Jogosultság megadva</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">Orbot-engedélyezett alkalmazások</string> <string name="wizard_tips_msg">Javasoljuk, hogy töltsön le és használjon olyan alkalmazásokat, amelyek tudják, hogyna kell közvetlenül kapcsolódni az Orbot-hoz. Kattintson az gombokra alább a telepítéshez.</string> <string name="wizard_tips_otrchat">Gibberbot - Biztonságos azonnali üzenetküldő kliens Android-ra</string> - <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</string> <string name="wizard_tips_proxy">Proxy beállítások - Tanulja meg, hogyan állíthatja be alkalmazásait, hogy együttműködjenek az Orbot-tal</string> <string name="wizard_proxy_help_info">Proxy beállítások</string> <string name="wizard_proxy_help_msg">Ha az Android alkalmazás, amit használ képes a HTTP vagy SOCKS proxy-k használatára, akkor be tudja állítani, hogy csatlakozzon az Orbot-hoz és használj a Tor-t.\n\n @@ -84,12 +80,47 @@ </string> <string name="wizard_final">Az Orbot kész!</string> <string name="wizard_final_msg">Több száezren használják szerte a világon a Tor-t különböző okokból: újságírók, bloggerek, emberi jogi aktivisták, rendvédelmi szervek dolgozói, katonák, vállalatok, elnyomó rezsimek polgárai, vagy csak egyszerű polgárok... és most készen áll erre Ön is!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time"> Sikeresen csatlakozott a Tor hálózathoz - de ez NEM azt jelenti, hogy a készüléke biztonságos. Ellenőrizze az \'Ellenőrzés\' opcióval a menüből a böngészőjét.\n\nLátogassa meg a https://guardianproject.info/apps/orbot oldalt vagy küldjön emailt a help(a)guardianproject.info címre a további információkért.</string> <string name="tor_check">Ez megnyitja az alapértelmezett böngészőt, és elnavigálja a https://check.torproject.orgoldalra, hogy ellenőrizze, hogy az Orbot helyesen konfigurált-e, és hogy csatlakozott-e a Tor hálózathoz.</string> <string name="pref_hs_group">Rejtett szolgáltatások</string> <string name="pref_general_group">Általános</string> <string name="pref_start_boot_title">Az Orbot indítása bekapcsoláskor</string> <string name="pref_start_boot_summary">Automatikusan elindítja az Orbot-ot, és csatlakozik a hálózathoz, amikor az Android eszköz elindul</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (csak Android 1.x) - Böngésző, kifejezetten adatvédelemre és az Orbot-hoz</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-it/strings.xml b/values-it/strings.xml index 8cf7205..eadd004 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Connesso alla rete Tor</string> <string name="status_disabled">\"Orbot è disattivato</string> <string name="status_shutting_down">Orbot si sta spegnendo</string> - <string name="tor_process_connecting">Avvio di Tor..</string> - <string name="tor_process_connecting_step2">Controllo impostazioni...</string> - <string name="tor_process_connecting_step3">completo.</string> - <string name="tor_process_connecting_step4">in attesa.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ATTENZIONE: Il traffico non è ancora anonimo! Configura le applicazioni per utilizzare il proxy HTTP 127.0.0.1:8118, SOCKS4A o proxy SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Home</string> <string name="menu_browse">Sfoglia</string> @@ -57,7 +55,6 @@ <string name="btn_finish">Fine</string> <string name="btn_okay">Ok</string> <string name="btn_cancel">Annulla</string> - <string name="wizard_welcome_msg"></string> <string name="wizard_details">Alcuni dettagli su Orbot</string> <string name="wizard_details_msg">Orbot è un\' applicazione open-source che contiene Tor, LibEvent and Privoxy. Fornisce un proxy HTTP locale (8118) e un proxy SOCKS (9050) verso la rete Tor. Orbot ha anche la capacità, su dispositivi con root, di far passare tutto il traffico internet attraverso Tor.</string> <string name="wizard_permissions_root">Permesso concesso</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">App abilitate per Orbot</string> <string name="wizard_tips_msg">Ti invitiamo a scaricare &amp; usare app che possono connettersi direttamente a Orbot. Fai click sui pulsanti qui sotto per installare.</string> <string name="wizard_tips_otrchat">Gibberbot - Client sicuro di instant messaging per Android</string> - <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string> <string name="wizard_tips_proxy">Impostazioni proxy - Ulteriori informazioni su come configurare le app per funzionare con Orbot</string> <string name="wizard_proxy_help_info">Impostazioni proxy</string> <string name="wizard_proxy_help_msg">Se la versione di Android che stai utilizzando supporta l\'utilizzo di un proxy HTTP o SOCKS allora puoi utilizzarla per connetterti a Orbot e utilizzare Tor.\n\n @@ -84,8 +80,6 @@ Ulteriori informazioni sul proxying per Android nelle FAQ all\' indirizzo: http: </string> <string name="wizard_final">Orbot è pronto!</string> <string name="wizard_final_msg">Centinaia di migliaia di persone nel mondo usano Tor per una varietà di motivi: giornalisti e bloggers, lavoratori per i diritti umani, ufficiali delle forze dell\'ordine, soldati, aziende, cittadini di paesi repressivi, e anche cittadini qualunque... e ora sei pronto a farlo anche tu!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">Ti sei collegato correttamente alla rete Tor - ma questo NON significa che il dispositivo è sicuro. È possibile utilizzare l\'opzione \'Controlla\' dal menù per testare il browser. \n\n Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una mail a help(a)guardianproject.info per saperne di più.</string> <string name="tor_check">Si aprirà il browser web predefinito per https://check.torproject.org per controllare se Orbot probabilmente è configurato e si è connessi a Tor.</string> @@ -93,4 +87,41 @@ Visita il nostro sito web https://guardianproject.info/apps/orbot o invia una ma <string name="pref_general_group">Generale</string> <string name="pref_start_boot_title">Avvia Orbot al boot</string> <string name="pref_start_boot_summary">Avvia automaticamente Orbot e connetti Tor quando il dispositivo Android viene avviato</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Solo Android 1.x) - Browser progettato per la privacy e Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-mk/strings.xml b/values-mk/strings.xml index d6fdf98..2872d70 100644 --- a/values-mk/strings.xml +++ b/values-mk/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Орбот</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Поврзан на мрежата Тор</string> <string name="status_disabled">\"Орбот е дезактивиран</string> <string name="status_shutting_down">Орбот се исклучува</string> - <string name="tor_process_connecting">Вклучување на Тор...</string> - <string name="tor_process_connecting_step2">Воспоставување контрола...</string> - <string name="tor_process_connecting_step3">готово.</string> - <string name="tor_process_connecting_step4">чекање.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ВНИМАНИЕ: Вашиот сообраќај сеуште не е анонимен! Треба да ги конфигурирате Вашите апликации да го користат проксито за HTTP, 127.0.0.1:8118, или проксито за SOCKS4A или SOCKS5, 127.0.0.1:9050</string> <string name="menu_home">Дома</string> <string name="menu_browse">Прелистување</string> @@ -57,7 +55,6 @@ <string name="btn_finish">Крај</string> <string name="btn_okay">Во ред</string> <string name="btn_cancel">Откажи се</string> - <string name="wizard_welcome_msg">Орбот овозможува работа со Тор на Андроид. Тор е слободен софтвер и отворена мрежа којашто Ви помага да се заштитите од одреден вид мрежно прислушкување, познат како анализа на сообраќај (traffic analysis), кој претставуваат закана за личната слобода и приватност, за стопанските дејности и односи од доверлив карактер, како и за државната безбедност.\n\n*ВНИМАНИЕ:*Самиот факт што сте го инсталирале Орбот _нема_ автоматски да го направи Вашиот мобилен сообраќај анонимен! Но, овој прозор ќе Ви помогне да се иницирате.</string> <string name="wizard_details">Некои детали за Орбот</string> <string name="wizard_details_msg">Орбот е апликација со отворен код којашто го содржи Тор, LibEvent и Privoxy. Таа Ви нуди локални проксиња за HTTP (порт 8118) и SOCKS (порт 9050) за поврзување со мрежата Тор. Орбот исто така нуди можност, на уреди со root пристап, целиот сообраќај да се пренасочи преку Тор.</string> <string name="wizard_permissions_root">Дозволата е издадена</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">Орбот-вклучени апликации</string> <string name="wizard_tips_msg">Ви препорачуваме да презимате и користите апликации кои што знаат како директно да се поврзат со Орбот. Притиснете на копчињата подолу за инсталирање.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> <string name="wizard_tips_proxy">Подесувања на прокси - Научете како да ги конфигурирате апликациите да работат со Орбот</string> <string name="wizard_proxy_help_info">Подесувања на прокси</string> <string name="wizard_proxy_help_msg">Ако апликацијата за Андроид што ја користите поддржува употреба на прокси за HTTP или SOCKS, тогаш може да ја конфигурирате да се поврзе со Орбот и да користи Тор. \n\n @@ -84,12 +80,47 @@ </string> <string name="wizard_final">Орбот е спремен!</string> <string name="wizard_final_msg">Стотици илјади луѓе низ целиот Свет го користат Тор од многу различни причини: новинари и блогери, борци за човекови права, полицајци, војници, корпорации, граѓани на репресивни режими, и обични граѓани... а сега и Вие сте спремин да го користите!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time"> Успешно се поврзавте на мрежата Тор - но ова НЕ значи дека важиот уред е сигурен. За да го проверите Вашиот браусер, изберете ја опцијата „Провери“ во менито. \n\nПосетете нѐ на https://guardianproject.info/apps/orbot или испратете порака на help(a)guardianproject.info за повеќе информации.</string> <string name="tor_check">Ова ќе ја отвори страницата https://check.torproject.org во Вашиот веб браусер за да видите дали Орбот е правилно конфигуриран и дали сте поврзани на Тор.</string> <string name="pref_hs_group">Скриени сервиси </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"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (само Андроид 1.x) - Браусер дизајниран за приватност и за Орбот</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-nb/strings.xml b/values-nb/strings.xml index b257a3c..7124442 100644 --- a/values-nb/strings.xml +++ b/values-nb/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Tilkoblet Tor-nettverket</string> <string name="status_disabled">\"Orbot er deaktivert</string> <string name="status_shutting_down">Orbot skrur seg av</string> - <string name="tor_process_connecting">Starter Tor...</string> - <string name="tor_process_connecting_step2">autentiserer kontrolltilkobling...</string> - <string name="tor_process_connecting_step3">ferdig.</string> - <string name="tor_process_connecting_step4">venter.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ADVARSEL: Trafikken din er ikke anonym helt enda! Vær vennlig og konfigurer applikasjonene dine til å bruke HTTP proxy 127.0.0.1:8118 eller SOCKS4A eller SOCKS5 proxy 127.0.0.1:9050</string> <string name="menu_home">Hjem</string> <string name="menu_browse">Gå til</string> @@ -57,7 +55,6 @@ <string name="btn_finish"></string> <string name="btn_okay"></string> <string name="btn_cancel"></string> - <string name="wizard_welcome_msg"></string> <string name="wizard_details"></string> <string name="wizard_details_msg"></string> <string name="wizard_permissions_root"></string> @@ -74,18 +71,52 @@ <string name="wizard_tips_tricks"></string> <string name="wizard_tips_msg"></string> <string name="wizard_tips_otrchat"></string> - <string name="wizard_tips_orweb"></string> <string name="wizard_tips_proxy"></string> <string name="wizard_proxy_help_info"></string> <string name="wizard_proxy_help_msg"></string> <string name="wizard_final"></string> <string name="wizard_final_msg"></string> - <string name="otrchat_apk_url"></string> - <string name="orweb_apk_url"></string> <string name="connect_first_time"></string> <string name="tor_check"></string> <string name="pref_hs_group"></string> <string name="pref_general_group"></string> <string name="pref_start_boot_title"></string> <string name="pref_start_boot_summary"></string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb"></string> + <string name="orweb_apk_url"></string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-nl/strings.xml b/values-nl/strings.xml index 005c6f3..641e9d3 100644 --- a/values-nl/strings.xml +++ b/values-nl/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Verbonden met het Tor netwerk</string> <string name="status_disabled">Orbot is uitgeschakeld</string> <string name="status_shutting_down">Orbot is bezig met afsluiten</string> - <string name="tor_process_connecting">Bezig met opstarten van Tor...</string> - <string name="tor_process_connecting_step2">Bezig met instellen aansturing</string> - <string name="tor_process_connecting_step3">klaar.</string> - <string name="tor_process_connecting_step4">aan het wachten.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">WAARSCHUWING: Je verkeer is nog niet anononiem! Stel je programma\'s in om gebruik te maken van HTTP proxy 127.0.0.1:8118 of SOCKS4A of SOCKS5 proxy 127.0.0.1:9050</string> <string name="menu_home">Thuis</string> <string name="menu_browse">Bladeren</string> @@ -57,9 +55,6 @@ <string name="btn_finish">Einde</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Annuleren</string> - <string name="wizard_welcome_msg">Orbot brengt Tor naar de Android. Tor is vrije software en een open netwerk dat u helpt te verdedigen tegen een vorm van netwerk toezicht, bekend als traffic analysis, welke aanvallen zijn op uw vrijheid en privacy, geheime zakelijke activiteiten relaties en inlichtingendiensten. - -*WAARSCHUWING:* Door het installeren van Orbot wordt uw verkeer _niet_ automatisch geanonimiseerd! Deze wizard helpt u hier mee.</string> <string name="wizard_details">Enkele Orbot Details</string> <string name="wizard_details_msg">Orbot is een open-source applicatie die Tor, LibEvent en Privoxy 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 internet verkeer over het Tor netwerk te sturen.</string> <string name="wizard_permissions_root">Rechten toegewezen</string> @@ -76,7 +71,6 @@ <string name="wizard_tips_tricks">Orbot-geschikte Apps</string> <string name="wizard_tips_msg">We raden je aan om apps te downloaden die zich automatisch verbinden met Orbot. Klik op de knoppen hieronder om te installeren.</string> <string name="wizard_tips_otrchat">Gibberbot - Veilige instant messaging client voor Android</string> - <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string> <string name="wizard_tips_proxy">Proxy Instellingen - Leer hoe je apps te configureren voor Orbot</string> <string name="wizard_proxy_help_info">Proxy Instellingen</string> <string name="wizard_proxy_help_msg">Als de Android app die je gebruikt beschikt over een HTTP of SOCKS proxy instelling, dan kun je het configureren zodat het via Orbot over het Tor netwerk gaat. @@ -89,8 +83,6 @@ Je kunt meer leren over het proxy-en op Android door naar de FAQ op http://tinyu </string> <string name="wizard_final">Orbot is klaar!</string> <string name="wizard_final_msg">Honderdduizenden verschillende mensen over de wereld gebruiken Tor, voor verschillende redenen. Zoals: journalisten, bloggers, mensen rechten medewerkers, soldaten, bedrijven, burgers met onderdrukte religies, en natuurlijk normale mensen... En nu ben jij er ook klaar voor!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">Je bent succesvol verbonden met het Tor netwerk, maar dit betekent NIET dat je apparaat volledig veilig is. Gebruik te \'Check\' optie vanuit het menu om je browser te testen. Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een email naar help(a)guardianproject.info voor vragen.</string> @@ -99,4 +91,41 @@ Bezoek onze website op https://guardianproject.info/apps/orbot of stuur een emai <string name="pref_general_group">Algemeen</string> <string name="pref_start_boot_title">Start Orbot bij boot</string> <string name="pref_start_boot_summary">Start Orbot automatisch en verbind metTor wanneer je Android apparaat opstart.</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Alleen Android 1.x) - Browser gemaakt voor privacy &amp; voor Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-pl/strings.xml b/values-pl/strings.xml index 21d4173..00a56ae 100644 --- a/values-pl/strings.xml +++ b/values-pl/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Podłączony do sieci Tor</string> <string name="status_disabled">Orbot wyłączony</string> <string name="status_shutting_down">Orbot wyłącza się</string> - <string name="tor_process_connecting">Tor startuje...</string> - <string name="tor_process_connecting_step2">Ustawianie sterowania...</string> - <string name="tor_process_connecting_step3">zakończono.</string> - <string name="tor_process_connecting_step4">oczekiwanie.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">UWAGA: Twoja komunikacja nie jest jeszcze anonimowa! Proszę skonfiguruj aplikacje aby używały serwera proxy HTTP 127.0.0.1:8118 lub SOCKS4A lub SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Start</string> <string name="menu_browse">Przeglądaj</string> @@ -57,7 +55,6 @@ <string name="btn_finish">Koniec</string> <string name="btn_okay">OK</string> <string name="btn_cancel">Anuluj</string> - <string name="wizard_welcome_msg">Orbot daje Tora Androidowi. Tor jest otwartym oprogramowaniem i otwartą siecią, która pomaga bronić się przed podsłuchem sieci znanym jako analiza ruchu, który zagraża wolności osobistej i prywatności, poufnym działaniom biznesowym i relacjami oraz bezpieczeństwu państwa.\n\n*UWAGA:* Sama instalacja Orbota _nie_ zanonimizuje magicznie Twojego ruchu! Ten kreator pozwoli Ci w pierwszych krokach.</string> <string name="wizard_details">Niektóre szczegóły o Orbocie</string> <string name="wizard_details_msg">Orbot jest otwartą aplikacją zawierającą Tora, LibEvent i Privoxy. Dostarcza lokalnego pośrednika HTTP (8118) i SOCKS (9050) do sieci Tora. Orbot ma możliwość, na urządzeniu uruchomionym z prawami administratora, wysyłać cały ruch internetowy przez Tora.</string> <string name="wizard_permissions_root">Dostęp zezwolony</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">Aplikacje skonfigurowane dla Orbota</string> <string name="wizard_tips_msg">Zachęcamy do pobierania i używania aplikacji, które wiedzą, jak łączyć się bezpośrednio z Orbotem. Kliknij na poniższe przyciski, by zainstalować.</string> <string name="wizard_tips_otrchat">Gibberbot - Bezpieczny komunikator dla Androida</string> - <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> <string name="wizard_tips_proxy">Ustawienia Proxy - NDowiedz się, jak konfiguroać aplikacje do współpracy z Orbotem</string> <string name="wizard_proxy_help_info">Ustawienia Proxy</string> <string name="wizard_proxy_help_msg">Jeśli aplikacja na Androida, której używasz ma obsługę proxy HTTP lub SOCKS, możesz skonfigurować ją do łączenia się z Orbotem i używania Tora.\n\n @@ -84,12 +80,47 @@ </string> <string name="wizard_final">Orbot jest gotowy!</string> <string name="wizard_final_msg">Setki tysięcy ludzi na całym świecie używają Tora z różnych powodów: dziennikarze i blogerzy, działacze na rzecz praw człowieka, stróże prawa, żołnierze, korporacje, obywatele represyjnych reżimów i zwykli obywatele... teraz Ty też możesz!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">Pomyślnie połaczono z siecią Tora - ale to NIE oznacza, że Twoje urządzenie jest bezpieczne. Możesz użyć opcji \'Sprawdź\' w menu, aby przetestować swoją przeglądarkę. \n\nOdwiedź nas na https://guardianproject.info/apps/orbot lub wyślij email na help(a)guardianproject.info, by dowiedzieć się więcej.</string> <string name="tor_check">To otworzy Twoją domyślną przeglądarkę na adresie https://check.torproject.org w celu sprawdzenia, czy Orbot jest skonfigurowany i jest poąłczenie z Torem.</string> <string name="pref_hs_group">Usługi ukryte</string> <string name="pref_general_group">Ogólne</string> <string name="pref_start_boot_title">Uruchamiaj Orbota przy starcie</string> <string name="pref_start_boot_summary">Automatycznie uruchamiaj Orbota i łącz się z Torem, gdy Twoje urządzenie z Androidem się uruchomi</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (tylko Android 1.x) - Przeglądarka zaprojektowana do prywatności i dla Orbota</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-pt/strings.xml b/values-pt/strings.xml index f9e06b8..cc923f4 100644 --- a/values-pt/strings.xml +++ b/values-pt/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Ligação estabelecida à rede Tor</string> <string name="status_disabled">\"Orbot está Desactivado</string> <string name="status_shutting_down">Orbot a encerrar</string> - <string name="tor_process_connecting">A iniciar Tor...</string> - <string name="tor_process_connecting_step2">a autenticar a ligação de controlo...</string> - <string name="tor_process_connecting_step3">completo.</string> - <string name="tor_process_connecting_step4">a aguardar.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ATENÇÃO: A sua ligação ainda não é anónima! Por favor configure as suas aplicações para utilizarem o proxy HTTP 127.0.0.1:8118 ou o proxy SOCKS4A ou SOCKS5 127.0.0.1:9050</string> <string name="menu_home">Início</string> <string name="menu_browse">Explorar</string> @@ -57,7 +55,6 @@ <string name="btn_finish"></string> <string name="btn_okay"></string> <string name="btn_cancel"></string> - <string name="wizard_welcome_msg"></string> <string name="wizard_details"></string> <string name="wizard_details_msg"></string> <string name="wizard_permissions_root"></string> @@ -74,18 +71,52 @@ <string name="wizard_tips_tricks"></string> <string name="wizard_tips_msg"></string> <string name="wizard_tips_otrchat"></string> - <string name="wizard_tips_orweb"></string> <string name="wizard_tips_proxy"></string> <string name="wizard_proxy_help_info"></string> <string name="wizard_proxy_help_msg"></string> <string name="wizard_final"></string> <string name="wizard_final_msg"></string> - <string name="otrchat_apk_url"></string> - <string name="orweb_apk_url"></string> <string name="connect_first_time"></string> <string name="tor_check"></string> <string name="pref_hs_group"></string> <string name="pref_general_group"></string> <string name="pref_start_boot_title"></string> <string name="pref_start_boot_summary"></string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb"></string> + <string name="orweb_apk_url"></string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-ru/strings.xml b/values-ru/strings.xml index b6e6318..9ff44bf 100644 --- a/values-ru/strings.xml +++ b/values-ru/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Подключен к сети Tor</string> <string name="status_disabled">\"Orbot Отключен</string> <string name="status_shutting_down">Orbot выключается</string> - <string name="tor_process_connecting">Запуск Tor...</string> - <string name="tor_process_connecting_step2">Настройка управления...</string> - <string name="tor_process_connecting_step3">готово.</string> - <string name="tor_process_connecting_step4">ожидание.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">ВНИМАНИЕ! Ваш поток данных еще не анонимен! Пожалуйста, настройте свои приложения на использование HTTP прокси 127.0.0.1:8118 или SOCKS4A или SOCKS5 прокси 127.0.0.1:9050</string> <string name="menu_home">Домашняя страница</string> <string name="menu_browse">Просмотр</string> @@ -57,7 +55,6 @@ <string name="btn_finish">Завершить</string> <string name="btn_okay">Ok</string> <string name="btn_cancel">Отмена</string> - <string name="wizard_welcome_msg">Orbot, и Tor на Android. Tor - это бесплатное программное обеспечение и открытая сеть, которая позволяет вам сберечься от прослушивания в сети, которое угрожает вашей свободе и конфиденциальности в бизнесе, отношениях, Tor позволяет защититься от анализа трафика.\n\n*ВНИМАНИЕ:* Установка Orbot не может магическим образом анонимизировать весь ваш мобильный трафик! Этот мастер поможет вам начать.</string> <string name="wizard_details">Некоторые сведенья о программе Orbot</string> <string name="wizard_details_msg">Orbot - это приложение с открытым кодом, которое содержит Tor, LibEvent и Privoxy. Она обеспечивает работу локального HTTP прокси (8118) и SOCKS прокси (9050) в сети Tor. Orbot также позволяет, из корня устройсва, пересылать весь интернет трафик через Tor.</string> <string name="wizard_permissions_root">Разрешение получено</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">Orbot-задействованные приложения</string> <string name="wizard_tips_msg">Мы советуем вам скачать и использовать приложения, которые умеют работать напрямую через Orbot. Нажмите на кнопки ниже, чтобы запустить процесс установки.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> <string name="wizard_tips_proxy">Настройки прокси - узнайте как настроить приложения для работы с Orbot</string> <string name="wizard_proxy_help_info">Настройки Прокси</string> <string name="wizard_proxy_help_msg">Если используемое вами приложение для Android поддерживает HTTP или SOCKS, то вы можете настоить его на подключение к Orbot и использование Tor.\n\n @@ -84,12 +80,47 @@ </string> <string name="wizard_final">Программа Orbot готова к использованию!</string> <string name="wizard_final_msg">Сотни тысяч людей по всему миру используют Tor по различным причинам: журналисты и блоггеры, активисты организаций, выступающих в защиту прав человека, судебные исполнители, солдаты, корпорации, граждане стран с репрессивным режимом, и простые люди... а теперь готовы и вы!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time"> Вы успешно подключились к сети Tor, но это НЕ значит, что ваше устройство безопасно. Вы можете воспользоваться функцией \'Проверки\' из меню, чтобы потестировать ваш браузер. \n\nПосетите наш сайт: https://guardianproject.info/apps/orbot или отправьте нам письмо на адрес: help(a)guardianproject.info, чтобы узнать больше.</string> <string name="tor_check">Это приведет к запуску веб-браузера, выбранного на вашем компьютере по-умолчанию, и подключению к сайту https://check.torproject.org, с целью проверки правильности работы Orbot и определения, подключены ли вы к сети Tor.</string> <string name="pref_hs_group">Скрытые сервисы</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"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (Только для версии Android 1.x) - Браузер, разработанный для обеспечения безопасности и для Orbot</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-sv/strings.xml b/values-sv/strings.xml index 0f96e32..0012721 100644 --- a/values-sv/strings.xml +++ b/values-sv/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Uppkopplad till Tor nätverket</string> <string name="status_disabled">\"Orbot är inaktiverad</string> <string name="status_shutting_down">Orbot avslutas</string> - <string name="tor_process_connecting">Startar Tor...</string> - <string name="tor_process_connecting_step2">verifierar kontroll uppkopplingen...</string> - <string name="tor_process_connecting_step3">klar.</string> - <string name="tor_process_connecting_step4">väntar.</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">VARNING: Din trafik är inte anonym än! Vänligen konfigurera dina apps att använda HTTP proxy 127.0.0.1:8118 eller SOCKS4A/5 proxy 127.0.0.1:9050</string> <string name="menu_home">Hem</string> <string name="menu_browse">Browse</string> @@ -57,7 +55,6 @@ <string name="btn_finish"></string> <string name="btn_okay"></string> <string name="btn_cancel"></string> - <string name="wizard_welcome_msg"></string> <string name="wizard_details"></string> <string name="wizard_details_msg"></string> <string name="wizard_permissions_root"></string> @@ -74,18 +71,52 @@ <string name="wizard_tips_tricks"></string> <string name="wizard_tips_msg"></string> <string name="wizard_tips_otrchat"></string> - <string name="wizard_tips_orweb"></string> <string name="wizard_tips_proxy"></string> <string name="wizard_proxy_help_info"></string> <string name="wizard_proxy_help_msg"></string> <string name="wizard_final"></string> <string name="wizard_final_msg"></string> - <string name="otrchat_apk_url"></string> - <string name="orweb_apk_url"></string> <string name="connect_first_time"></string> <string name="tor_check"></string> <string name="pref_hs_group"></string> <string name="pref_general_group"></string> <string name="pref_start_boot_title"></string> <string name="pref_start_boot_summary"></string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb"></string> + <string name="orweb_apk_url"></string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values-zh/strings.xml b/values-zh/strings.xml index 7cd97f4..ca04f4f 100644 --- a/values-zh/strings.xml +++ b/values-zh/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">已连接到 Tor 网络</string> <string name="status_disabled">Orbot 已停用</string> <string name="status_shutting_down">Orbot 正在关闭</string> - <string name="tor_process_connecting">正在启动Tor....</string> - <string name="tor_process_connecting_step2">设置控制...</string> - <string name="tor_process_connecting_step3">完毕。</string> - <string name="tor_process_connecting_step4">等待中。</string> + <string name="tor_process_starting"></string> + <string name="tor_process_complete"></string> + <string name="tor_process_waiting"></string> <string name="not_anonymous_yet">警告: 您的通讯还不是匿名的! 请设置您的应用程序使用代理服务器 127.0.0.1:8118 或者 SOCKS4A 或者 SOCKS5 代理服务器 127.0.0.1:9050</string> <string name="menu_home">首页</string> <string name="menu_browse">浏览</string> @@ -57,7 +55,6 @@ <string name="btn_finish">完成</string> <string name="btn_okay">确定</string> <string name="btn_cancel">取消</string> - <string name="wizard_welcome_msg">Orbot 将 Tor 带到 Android 之上。Tor 是自由软件，致力于构建开放网络，帮助保护网络访问的自由和隐私，可以抵御秘密的商业活动、关系以及已知的流量分析技术。\n\n*警告：*仅仅安装 Orbot 不会自动使您的移动流量匿名化！这个向导将带您入门。</string> <string name="wizard_details">一些 Orbot 详情</string> <string name="wizard_details_msg">Orbot 是包含 Tor、LibEvent 和 Privoxy 的开源软件。它包含了一个本地 HTTP 代理(8118)和 SOCKS 代理(9050)，使您接入 Tor 网络。Orbot 在可以获得 root 权限的设备上接管所有流量经由 Tor 网络。</string> <string name="wizard_permissions_root">已赋予权限</string> @@ -74,7 +71,6 @@ <string name="wizard_tips_tricks">可用 Orbot 的应用程序</string> <string name="wizard_tips_msg">我们建议您下载和使用能直接连接到 Orbot 的应用程序。点击以下按钮安装。</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string> <string name="wizard_proxy_help_info">代理设置</string> <string name="wizard_proxy_help_msg">如果您正在使用的 Android 应用程序支持使用 HTTP 或 SOCKS 代理，您可以配置它连接到 Orbot 并使用 Tor。\n\n @@ -83,12 +79,47 @@ 您可以通过 http://tinyurl.com/proxyandroid 了解更多 Android 上使用代理的知识。</string> <string name="wizard_final">Orbot 已就绪！</string> <string name="wizard_final_msg">数以万计的各国人们因为各种原因使用 Tor：记者、人权工作者、法律工作者、士兵、公司、迫于实际情况使用的市民，当然也有普通的市民。现在你也即将成为其中的一员！</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> <string name="connect_first_time">您已成功连接至 Tor 网络 - 但这并不意味着您的设备安全。您可以使用“检查”选项测试您的浏览器。\n\n访问 https://guardianproject.info/apps/orbot 或发送邮件到 help(a)guardianproject.info 以了解更多信息。</string> <string name="tor_check">这将启动默认浏览器并访问 https://check.torproject.org 以测试是否正确配置了 Orbot 并确认您是否已经连接到 Tor。</string> <string name="pref_hs_group">隐藏服务</string> <string name="pref_general_group">General</string> <string name="pref_start_boot_title">开机启动Orbot</string> <string name="pref_start_boot_summary">当您的 Android 设备开机时自动启动 Orbot 并连接至 Tor 网络</string> + <string name="wizard_title_msg"></string> + <string name="wizard_warning_title"></string> + <string name="wizard_warning_msg"></string> + <string name="wizard_permissions_title"></string> + <string name="wizard_permissions_root_msg1"></string> + <string name="wizard_permissions_root_msg2"></string> + <string name="wizard_permissions_no_root_msg"></string> + <string name="wizard_tips_title"></string> + <string name="wizard_tips_gibberbot"></string> + <string name="gibberbot_apk_url"></string> + <string name="wizard_tips_orweb">ORWEB (仅 Android 1.x) - 着重隐私设计的浏览器</string> + <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</string> + <string name="wizard_transproxy_title"></string> + <string name="wizard_transproxy_msg"></string> + <string name="wizard_transproxy_hint"></string> + <string name="wizard_transproxy_none"></string> + <string name="pref_transparent_tethering_title"></string> + <string name="pref_transparent_tethering_summary"></string> + <string name="button_grant_superuser"></string> + <string name="pref_select_apps"></string> + <string name="pref_select_apps_summary"></string> + <string name="pref_node_configuration"></string> + <string name="pref_node_configuration_summary"></string> + <string name="pref_entrance_node"></string> + <string name="pref_entrance_node_summary"></string> + <string name="pref_entrance_node_dialog"></string> + <string name="pref_use_whispercore"></string> + <string name="pref_use_whispercore_summary"></string> + <string name="pref_proxy_type_title"></string> + <string name="pref_proxy_type_summary"></string> + <string name="pref_proxy_type_dialog"></string> + <string name="pref_proxy_host_title"></string> + <string name="pref_proxy_host_summary"></string> + <string name="pref_proxy_host_dialog"></string> + <string name="pref_proxy_port_title"></string> + <string name="pref_proxy_port_summary"></string> + <string name="pref_proxy_port_dialog"></string> </resources> diff --git a/values/strings.xml b/values/strings.xml index d5b3c50..41b14fc 100644 --- a/values/strings.xml +++ b/values/strings.xml @@ -1,7 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5.2</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> @@ -12,10 +11,9 @@ <string name="status_activated">Connected to the Tor network</string> <string name="status_disabled">\"Orbot is Deactivated</string> <string name="status_shutting_down">Orbot is shutting down</string> - <string name="tor_process_connecting">Starting Tor...</string> - <string name="tor_process_connecting_step2">Setting up control...</string> - <string name="tor_process_connecting_step3">complete.</string> - <string name="tor_process_connecting_step4">waiting.</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> @@ -50,14 +48,13 @@ <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">Welcome to Orbot</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_welcome_msg">Orbot brings Tor to Android. 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.\n\n*WARNING:* Simply installing Orbot will _not_ magically anonymize your mobile traffic! This wizard will help you get started.</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 Privoxy. 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> @@ -65,16 +62,15 @@ <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 root</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">We encourage you to download &amp; use apps that know how to connect directly to Orbot. Click on the buttons below to install.</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 in the Android Market.</string> <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> - <string name="wizard_tips_orweb">ORWEB (Android 1.x Only) - Browser designed for privacy &amp; for Orbot</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</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 @@ -83,13 +79,48 @@ You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid </string> <string name="wizard_final">Orbot is ready!</string> - <string name="wizard_final_msg">Hundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!</string> - <string name="otrchat_apk_url">market://search?q=pname:info.guardianproject.otr.app.im</string> - <string name="orweb_apk_url">market://search?q=pname:nfo.guardianproject.browser</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 \'Check\' option from the menu to test your browser. \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 default 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="wizard_final_msg">Hundreds of thousands 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="connect_first_time">You\'ve successfully connected to the Tor network - but this does NOT mean your device is secure. You can use the \'Check\' option from the menu to test your browser. \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 Services</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 is running in standard mode, and does not support root or \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string> + <string name="wizard_tips_title">Orbot-Enabled Apps</string> + <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> + <string name="gibberbot_apk_url">https://market.android.com/details?id=info.guardianproject.otr.app.im</string> + <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> + <string name="orweb_apk_url">https://market.android.com/details?id=info.guardianproject.browser</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</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_use_whispercore">Use WhisperCore</string> + <string name="pref_use_whispercore_summary">Use the proprietary NetFilter APIs provided by WhisperSystems (required device with WhisperCore installed)</string> + <string name="pref_proxy_type_title">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">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">Proxy Port</string> + <string name="pref_proxy_port_summary">Proxy server port</string> + <string name="pref_proxy_port_dialog">Enter Proxy port</string> </resources>

1 0

[tor/master] Discard all cells on a marked connection
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit cf8bffa35901a26ae840dcd715dd2f664259efb3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 17:04:15 2011 -0400 Discard all cells on a marked connection Fix for bug 4299 --- changes/bug4299 | 5 +++++ src/or/command.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/changes/bug4299 b/changes/bug4299 new file mode 100644 index 0000000..c43d814 --- /dev/null +++ b/changes/bug4299 @@ -0,0 +1,5 @@ + o Major bugfix: + - Do not process cells on a marked-for-close connection. We previously + avoided this by not calling read handlers on marked connections, but + that's not adequate for the case when cells are very small. Fixes + bug 4299; bugfix on 0.2.0.20-rc which first made small cells possible. diff --git a/src/or/command.c b/src/or/command.c index 1fa8bc6..5271a7a 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -132,6 +132,9 @@ command_process_cell(cell_t *cell, or_connection_t *conn) #define PROCESS_CELL(tp, cl, cn) command_process_ ## tp ## _cell(cl, cn) #endif + if (conn->_base.marked_for_close) + return; + /* Reject all but VERSIONS and NETINFO when handshaking. */ if (handshaking && cell->command != CELL_VERSIONS && cell->command != CELL_NETINFO) @@ -205,6 +208,9 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) } #endif + if (conn->_base.marked_for_close) + return; + /* reject all when not handshaking. */ if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) return;

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit 212c3acd42285b77ae8197a185cbb00fea2c8926 Merge: a2517fa cf8bffa Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 18:02:57 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' Conflicts: src/or/command.c changes/bug4299 | 5 +++++ src/or/command.c | 6 ++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --cc src/or/command.c index d35e2a9,5271a7a..43d304e --- a/src/or/command.c +++ b/src/or/command.c @@@ -148,19 -132,13 +148,22 @@@ command_process_cell(cell_t *cell, or_c #define PROCESS_CELL(tp, cl, cn) command_process_ ## tp ## _cell(cl, cn) #endif + if (conn->_base.marked_for_close) + return; + /* Reject all but VERSIONS and NETINFO when handshaking. */ + /* (VERSIONS should actually be impossible; it's variable-length.) */ if (handshaking && cell->command != CELL_VERSIONS && - cell->command != CELL_NETINFO) + cell->command != CELL_NETINFO) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Received unexpected cell command %d in state %s; ignoring it.", + (int)cell->command, + conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); return; + } + + if (conn->_base.state == OR_CONN_STATE_OR_HANDSHAKING_V3) + or_handshake_state_record_cell(conn->handshake_state, cell, 1); switch (cell->command) { case CELL_PADDING: @@@ -230,53 -208,12 +233,56 @@@ command_process_var_cell(var_cell_t *ce } #endif + if (conn->_base.marked_for_close) + return; + - /* reject all when not handshaking. */ - if (conn->_base.state != OR_CONN_STATE_OR_HANDSHAKING) - return; + switch (conn->_base.state) + { + case OR_CONN_STATE_OR_HANDSHAKING_V2: + if (cell->command != CELL_VERSIONS) + return; + break; + case OR_CONN_STATE_TLS_HANDSHAKING: + /* If we're using bufferevents, it's entirely possible for us to + * notice "hey, data arrived!" before we notice "hey, the handshake + * finished!" And we need to be accepting both at once to handle both + * the v2 and v3 handshakes. */ + + /* fall through */ + case OR_CONN_STATE_TLS_SERVER_RENEGOTIATING: + if (cell->command != CELL_VERSIONS) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Received a non-VERSIONS cell with command %d in state %s; " + "ignoring it.", + (int)cell->command, + conn_state_to_string(CONN_TYPE_OR,conn->_base.state)); + return; + } + break; + case OR_CONN_STATE_OR_HANDSHAKING_V3: + if (cell->command != CELL_AUTHENTICATE) + or_handshake_state_record_var_cell(conn->handshake_state, cell, 1); + break; /* Everything is allowed */ + case OR_CONN_STATE_OPEN: + if (conn->link_proto < 3) { + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Received a variable-length cell with command %d in state %s " + "with link protocol %d; ignoring it.", + (int)cell->command, + conn_state_to_string(CONN_TYPE_OR,conn->_base.state), + (int)conn->link_proto); + return; + } + break; + default: + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Received var-length cell with command %d in unexpected state " + "%s [%d]; ignoring it.", + (int)cell->command, + conn_state_to_string(CONN_TYPE_OR,conn->_base.state), + (int)conn->_base.state); + return; + } switch (cell->command) { case CELL_VERSIONS:

1 0

[tor/master] Merge branch 'bug4343'
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit 4dd8d811d669e245f95ed0fcc59de579e876ab91 Merge: 00a0de8 2018f86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 18:05:25 2011 -0400 Merge branch 'bug4343' changes/bug4343 | 5 +++++ src/common/tortls.c | 2 +- src/or/command.c | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-)

1 0

[tor/master] Bump version to 0.2.3.6-alpha-dev
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit 00a0de8508f4cb5ab28b91884c3ca1733e2a174f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 18:05:17 2011 -0400 Bump version to 0.2.3.6-alpha-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 641d46a..df5551c 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.6-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.6-alpha-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 3316b70..fceb087 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.6-alpha" +!define VERSION "0.2.3.6-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index df5f2b4..a0b66f1 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.6-alpha" +#define VERSION "0.2.3.6-alpha-dev"

1 0

[tor/master] Fix a double-free that would occur on an invalid cert in a CERTS cell
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit c2a098e9800edb27d6a3630337e0efa72dfa7ba2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 16:38:56 2011 -0400 Fix a double-free that would occur on an invalid cert in a CERTS cell We would stash the certs in the handshake state before checking them for validity... and then if they turned out to be invalid, we'd give an error and free them. Then, later, we'd free them again when we tore down the connection. Fixes bug 4343; fix on 0.2.3.6-alpha. --- changes/bug4343 | 5 +++++ src/or/command.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug4343 b/changes/bug4343 new file mode 100644 index 0000000..cee272b --- /dev/null +++ b/changes/bug4343 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Fix a double-free bug that would occur when we received an invalid + certificate in a CERT cell in the new v3 handshake. Fixes bug 4343; + bugfix on 0.2.3.6-alpha. + diff --git a/src/or/command.c b/src/or/command.c index d35e2a9..aa5a62d 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -1020,8 +1020,6 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) ERR("The certs we wanted were missing"); /* Remember these certificates so we can check an AUTHENTICATE cell */ - conn->handshake_state->id_cert = id_cert; - conn->handshake_state->auth_cert = auth_cert; if (! tor_tls_cert_is_valid(auth_cert, id_cert, 1)) ERR("The authentication certificate was not valid"); if (! tor_tls_cert_is_valid(id_cert, id_cert, 1)) @@ -1032,6 +1030,8 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) safe_str(conn->_base.address), conn->_base.port); /* XXXX check more stuff? */ + conn->handshake_state->id_cert = id_cert; + conn->handshake_state->auth_cert = auth_cert; id_cert = auth_cert = NULL; }

1 0

[tor/master] Fix a memory-poisoning memset in tortls.c
by nickm＠torproject.org 28 Oct '11

28 Oct '11

commit 7a8960cf1b34d27db0ffe0929c1810800f319c86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 16:37:42 2011 -0400 Fix a memory-poisoning memset in tortls.c --- src/common/tortls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 7aaa4e0..8cf396c 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -694,7 +694,7 @@ tor_cert_free(tor_cert_t *cert) if (cert->cert) X509_free(cert->cert); tor_free(cert->encoded); - memset(cert, 0x03, sizeof(cert)); + memset(cert, 0x03, sizeof(*cert)); tor_free(cert); }

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
126
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2011