tor-commits
Threads by month
- ----- 2025 -----
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
June 2015
- 22 participants
- 1870 discussions

25 Jun '15
commit a7211999c91259fc1d6bd4ffab7faef4182a1876
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Fri Jun 5 17:15:38 2015 -0400
rename zh to zh_CN following convention
---
res/values-zh-rCN/strings.xml | 286 +++++++++++++++++++++++++++++++++++++++++
res/values-zh/strings.xml | 286 -----------------------------------------
2 files changed, 286 insertions(+), 286 deletions(-)
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..8f1d1bb
--- /dev/null
+++ b/res/values-zh-rCN/strings.xml
@@ -0,0 +1,286 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">Orbot</string>
+ <string name="internal_web_url">http://orbot/</string>
+ <string name="default_web_url">http://check.torproject.org</string>
+ <string name="secure_default_web_url">https://check.torproject.org</string>
+ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+ <string name="control_permission_label">启动和停止 Tor</string>
+ <string name="tor_proxy_service_process">Tor 代理服务</string>
+ <string name="status_starting_up">Orbot 正在启动…</string>
+ <string name="status_activated">已连接到 Tor 网络</string>
+ <string name="status_disabled">Orbot 已停用</string>
+ <string name="status_shutting_down">Orbot 正在关闭</string>
+ <string name="tor_process_starting">正在启动 Tor 客户端…</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>
+ <string name="menu_settings">设置</string>
+ <string name="menu_log">日志</string>
+ <string name="menu_info">帮助</string>
+ <string name="menu_apps">应用程序</string>
+ <string name="menu_start">启动</string>
+ <string name="menu_stop">停止</string>
+ <string name="menu_about">关于</string>
+ <string name="menu_wizard">向导</string>
+ <string name="main_layout_download">下载</string>
+ <string name="main_layout_upload">上传</string>
+ <string name="button_help">帮助</string>
+ <string name="button_close">关闭</string>
+ <string name="button_about">关于</string>
+ <string name="button_clear_log">清除日志</string>
+ <string name="menu_verify">检查</string>
+ <string name="menu_exit">退出</string>
+ <string name="menu_scan">扫描网桥QR码</string>
+ <string name="menu_share_bridge">分享网桥QR码</string>
+ <string name="press_to_start">- 长按启动 -</string>
+ <string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
+ <string name="pref_trans_proxy_title">透明代理</string>
+ <string name="pref_trans_proxy_summary">应用程序自动使用 Tor</string>
+ <string name="pref_transparent_all_title">所有应用程序使用 Tor</string>
+ <string name="pref_transparent_all_summary">所有应用程序都通过 Tor 连接网络</string>
+ <string name="pref_transparent_port_fallback_title">备用代理端口</string>
+ <string name="pref_transparent_port_fallback_summary">警告:避免使用常用端口(80、443 等)。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
+ <string name="pref_transparent_port_title">端口列表</string>
+ <string name="pref_transparent_port_summary">代理端口列表。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
+ <string name="pref_transparent_port_dialog">输入代理端口</string>
+ <string name="pref_has_root">请求 Root 访问权限</string>
+ <string name="pref_has_root_summary">为透明代理请求获取 Root 访问权限</string>
+ <string name="status_install_success">Tor 程序安装成功!</string>
+ <string name="status_install_fail">Tor 程序无法安装。请查看日志并将其发送到 tor-assistants(a)torproject.org</string>
+ <string name="title_error">应用程序错误</string>
+ <string name="wizard_title">Orbot</string>
+ <string name="wizard_btn_tell_me_more">关于 Orbot</string>
+ <string name="btn_next">下一步</string>
+ <string name="btn_back">上一步</string>
+ <string name="btn_finish">完成</string>
+ <string name="btn_okay">确定</string>
+ <string name="btn_cancel">取消</string>
+ <!--Welcome Wizard strings (DJH)-->
+ <string name="wizard_details">更多 Orbot 信息</string>
+ <string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Polipo 的开源应用程序。它提供了一个本地 HTTP 代理 (8118) 和一个 SOCKS 代理 (9050) 前往 Tor 网络。Orbot 也有能力在 root 过的设备上将所有互联网流量通过 Tor 发送。</string>
+ <string name="wizard_permissions_root">已获取权限</string>
+ <string name="wizard_permissions_stock">Orbot 权限</string>
+ <string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
+ <string name="wizard_permissions_msg_stock">虽非必须,但是具有 Root 访问权限的设备可以让 Orbot 变得更强大。请使用下面的按钮授予 Orbot 这一强大的能力!</string>
+ <string name="wizard_permissions_no_root">如果没有 Root 访问权限或不明白此处所说的内容,只需确保 Orbot 支持所用的应用即可。</string>
+ <string name="wizard_permissions_consent">我明白并愿意在未获取 Root 权限的情况下继续操作</string>
+ <string name="wizard_permission_enable_root">为 Orbot 获取 Root 权限</string>
+ <string name="wizard_configure">配置 Tor 网络</string>
+ <string name="wizard_configure_msg">Orbot 提供了选项,可指定所有应用程序使用 Tor 网络或指定某些应用通过 Tor 网络进行通讯。</string>
+ <string name="wizard_configure_all">所有应用程序都使用 Tor</string>
+ <string name="wizard_configure_select_apps">选择使用 Tor 的应用程序</string>
+ <string name="wizard_tips_tricks">Orbot 支持的应用</string>
+ <string name="wizard_tips_msg">以下应用可与 Orbot 一起使用。点击下面的按钮安装,也可以通过 Google Play 商店、GuardianProject.info 网站或 F-Droid.org 查找。</string>
+ <string name="wizard_tips_otrchat">ChatSecure - Android 上的安全即时通讯客户端</string>
+ <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
+ <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
+
+
+
+ <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
+
+ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+ <string name="wizard_proxy_help_info">代理设置</string>
+ <string name="wizard_final">Orbot 已就绪!</string>
+ <string name="wizard_exit_at_first_screen_toast">请在您开始使用它前配置 Orbot!</string>
+ <!--END Welcome Wizard strings (DJH)-->
+ <string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
+ <string name="pref_hs_group">隐藏服务主机</string>
+ <string name="pref_general_group">常规</string>
+ <string name="pref_start_boot_title">开机时启动 Orbot</string>
+ <string name="pref_start_boot_summary">Android 设备开机时自动启动 Orbot 并连接 Tor 网络</string>
+ <!--New Wizard Strings-->
+ <!--Title Screen-->
+ <!--Warning screen-->
+ <string name="wizard_warning_title">警告</string>
+ <!--Permissions screen-->
+ <string name="wizard_permissions_title">权限</string>
+ <string name="wizard_permissions_root_msg1">可选择授予 Orbot “Superuser”访问权限,以便启用高级功能,例如透明代理。</string>
+ <string name="wizard_permissions_root_msg2">如果不愿授予 Orbot 该权限,请确保应用程序可使用 Orbot。</string>
+ <!--TipsAndTricks screen-->
+ <string name="wizard_tips_title">使用 Orbot 的应用程序</string>
+ <string name="wizard_tips_gibberbot">ChatSecure:具有 OTF 加密共的安全通讯应用</string>
+
+ <string name="wizard_tips_orweb">Orweb:使用 Tor 网络的隐私保护浏览器</string>
+
+ <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string>
+
+
+
+
+
+ <!--Transparent Proxy screen-->
+ <string name="wizard_transproxy_title">透明代理</string>
+ <string name="wizard_transproxy_msg">可使应用程序无需配置即可自动通过 Tor 连接网络。</string>
+ <string name="wizard_transproxy_hint">(如果不明白这里所说的问题,请选择该选项)</string>
+ <string name="wizard_transproxy_none">无</string>
+ <string name="pref_transparent_tethering_title">Tor 网络共享</string>
+ <string name="pref_transparent_tethering_summary">对 Wifi 和 USB 网络共享设备启用透明代理(需重新启动)</string>
+ <string name="button_grant_superuser">请求 Superuser 访问权限</string>
+ <string name="pref_select_apps">选择应用程序</string>
+ <string name="pref_select_apps_summary">选择通过 Tor 连接网络的应用程序</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="button_proxy_all">全部代理</string>
+ <string name="button_proxy_none">全不代理</string>
+ <string name="button_invert_selection">反选</string>
+ <string name="pref_proxy_title">出站网络代理(可选)</string>
+ <string name="pref_proxy_type_title">出站代理类型</string>
+ <string name="pref_proxy_type_summary">代理服务器使用的协议:HTTP、HTTPS、Socks4、Socks5</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>
+ <string name="pref_proxy_username_title">出站代理用户名</string>
+ <string name="pref_proxy_username_summary">代理用户名(可选)</string>
+ <string name="pref_proxy_username_dialog">请输入代理用户名</string>
+ <string name="pref_proxy_password_title">出站代理密码</string>
+ <string name="pref_proxy_password_summary">代理密码(可选)</string>
+ <string name="pref_proxy_password_dialog">请输入代理密码</string>
+ <string name="status">状态</string>
+ <string name="setting_up_full_transparent_proxying_">正在对所有应用程序进行透明代理设置…</string>
+ <string name="setting_up_app_based_transparent_proxying_">正在对所选应用程序进行透明代理设置…</string>
+ <string name="transparent_proxying_enabled">透明代理已启用</string>
+ <string name="transproxy_enabled_for_tethering_">已为网络共享激活 TransProxy !</string>
+ <string name="warning_error_starting_transparent_proxying_">警告:启动透明代理时发生错误!</string>
+ <string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
+ <string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
+ <string name="privoxy_is_running_on_port_">Polipo 正运行在端口:</string>
+ <string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置…</string>
+ <string name="bridge_error">网桥错误</string>
+ <string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
+ <string name="send_email_for_bridges">如需获取网桥地址,请使用 gmail 发送电子邮件至 bridges(a)torproject.org 并在正文内填上“ get bridges”。</string>
+ <string name="error">错误</string>
+ <string name="your_reachableaddresses_settings_caused_an_exception_">可访问地址设置导致异常!</string>
+ <string name="your_relay_settings_caused_an_exception_">中继设置导致异常!</string>
+ <string name="exit_nodes">出口节点</string>
+ <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最后跳转的密钥指纹、昵称、国家与地址</string>
+ <string name="enter_exit_nodes">输入出口节点</string>
+ <string name="exclude_nodes">排除节点</string>
+ <string name="fingerprints_nicks_countries_and_addresses_to_exclude">排除的密钥指纹、昵称、国家与地址</string>
+ <string name="enter_exclude_nodes">输入排除节点</string>
+ <string name="strict_nodes">限制节点</string>
+ <string name="use_only_these_specified_nodes">仅使用这些指定节点</string>
+ <string name="bridges">网桥</string>
+ <string name="use_bridges">使用网桥</string>
+ <string name="bridges_obfuscated">混淆网桥</string>
+ <string name="enable_alternate_entrance_nodes_into_the_tor_network">使用其他入口节点连接到 Tor 网络</string>
+ <string name="enable_if_configured_bridges_are_obfuscated_bridges">已配置的网桥为混淆网桥时启用</string>
+ <string name="ip_address_and_port_of_bridges">网桥的 IP 地址和端口</string>
+ <string name="enter_bridge_addresses">输入网桥地址</string>
+ <string name="relays">中继</string>
+ <string name="relaying">中继转发</string>
+ <string name="enable_your_device_to_be_a_non_exit_relay">仅设置被设置为非出口中继</string>
+ <string name="relay_port">中继端口</string>
+ <string name="listening_port_for_your_tor_relay">Tor 中继的侦听端口</string>
+ <string name="enter_or_port">输入 OR 端口</string>
+ <string name="relay_nickname">中继昵称</string>
+ <string name="the_nickname_for_your_tor_relay">Tor 中继昵称</string>
+ <string name="enter_a_custom_relay_nickname">输入自定义中继昵称</string>
+ <string name="reachable_addresses">可访问地址</string>
+ <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">在具有限制策略防火墙内,作为客户端运行</string>
+ <string name="reachable_ports">可访问端口</string>
+ <string name="ports_reachable_behind_a_restrictive_firewall">防火墙限定的可访问端口</string>
+ <string name="enter_ports">输入端口</string>
+ <string name="enable_hidden_services">隐藏服务主机</string>
+ <string name="run_servers_accessible_via_the_tor_network">允许设备上的服务器可通过 Tor 网络访问</string>
+ <string name="enter_localhost_ports_for_hidden_services">输入隐藏服务的本地主机端口</string>
+ <string name="hidden_service_ports">隐藏服务端口</string>
+ <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
+ <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">启用调试日志输出(必须使用 adb 或 aLongCat 查看)</string>
+ <string name="project_home">项目主页(s):</string>
+ <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
+ <string name="the_tor_license">Tor 许可证</string>
+ <string name="https_torproject_org">https://torproject.org</string>
+ <string name="third_party_software">第三方软件:</string>
+ <string name="tor_version">Tor: https://www.torproject.org</string>
+ <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
+ <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
+ <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
+ <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
+ <string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
+ <string name="found_existing_tor_process">发现当前已存在 Tor 进程…</string>
+ <string name="something_bad_happened">发生错误,请检查日志</string>
+ <string name="hidden_service_on">隐藏服务位于:</string>
+ <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
+ <string name="unable_to_start_tor">无法启动 Tor:</string>
+ <string name="pref_use_sys_iptables_title">使用默认 iptables </string>
+ <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 绑定的 iptables </string>
+ <string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
+ <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
+ <string name="pref_use_persistent_notifications_title">始终显示通知</string>
+ <string name="pref_use_expanded_notifications">显示扩展的通知,有关 Tor 出口的国家和 IP</string>
+ <string name="pref_use_expanded_notifications_title">扩展的通知</string>
+ <string name="notification_using_bridges">已启用网桥!</string>
+ <string name="default_bridges"></string>
+ <string name="set_locale_title">区域设置</string>
+ <string name="set_locale_summary">选择 Orbot 的区域设置与语言</string>
+ <string name="wizard_locale_title">选择语言</string>
+ <string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
+ <string name="powered_by">由 Tor 提供</string>
+ <string name="btn_save_settings">保存设置</string>
+ <string name="no_internet_connection_tor">无网络连接;Tor 正处于待机状态…</string>
+ <string name="bandwidth_">宽带速度:</string>
+ <string name="down">下行</string>
+ <string name="up">上行</string>
+ <string name="pref_disable_network_title">无网络自动休眠</string>
+ <string name="pref_disable_network_summary">没有网络连接时,暂时停用 Tor</string>
+ <string name="newnym">已切换为新的 Tor 标识!</string>
+ <string name="menu_verify_browser">浏览器检测</string>
+ <string name="menu_use_chatsecure">使用 ChatSecure</string>
+ <string name="permission_manage_tor_label">管理 Tor</string>
+ <string name="permission_manage_tor_description">启用该应用可对 Tor 服务进行控制</string>
+ <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">好像没有安装 Orweb。是否需要帮忙,还是直接打开浏览器?</string>
+ <string name="install_apps_">安装应用?</string>
+ <string name="no_network_connectivity_putting_tor_to_sleep_">没有网络连接。Tor 进入睡眠状态…</string>
+ <string name="network_connectivity_is_good_waking_tor_up_">网络连接良好。Tor 正在醒来…</string>
+ <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
+ <string name="pref_socks_title">Tor SOCKS</string>
+ <string name="pref_socks_summary">Tor 提供其 SOCKS 代理的端口 (默认: 9050, 0 禁用)</string>
+ <string name="pref_socks_dialog">SOCKS 端口配置</string>
+ <string name="pref_transport_title">Tor 透明代理端口</string>
+ <string name="pref_transport_summary">Tor 提供透明代理的端口 (默认: 9040, 0 禁用)</string>
+ <string name="pref_transport_dialog">透明代理配置</string>
+ <string name="pref_dnsport_title">Tor DNS 端口</string>
+ <string name="pref_dnsport_summary">Tor 提供 DNS 的端口 (默认: 5400, 0 禁用)</string>
+ <string name="pref_dnsport_dialog">DNS 端口配置</string>
+ <string name="pref_torrc_title">Torrc 自定义配置</string>
+ <string name="pref_torrc_summary">仅供专家:直接输入 torrc 配置行</string>
+ <string name="pref_torrc_dialog">自定义 Torrc</string>
+
+ <string name="your_tor_public_ips_">您的 Tor 公网 IP:</string>
+ <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">如果您使用 Orbot 遇到问题,请在 Android->设置->应用 中禁用本应用:</string>
+ <string name="app_conflict">应用冲突</string>
+ <string name="pref_transproxy_refresh_title">透明代理自动刷新</string>
+ <string name="pref_transproxy_refresh_summary">在网络状态改变时重新应用透明代理规则</string>
+ <string name="pref_transproxy_flush_title">透明代理强制移除</string>
+ <string name="pref_transproxy_flush_summary">点按这里立即刷新所有透明代理的网络规则</string>
+ <string name="transparent_proxy_rules_flushed_">透明代理规则已刷新!</string>
+ <string name="you_do_not_have_root_access_enabled">您还没有 ROOT 访问权限</string>
+ <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">您可能需要停止并重新启动 Orbot 才能使设置更改生效。</string>
+ <string name="menu_vpn">应用</string>
+ <string name="kbps">kbps</string>
+ <string name="mbps">mbps</string>
+ <string name="kb">KB</string>
+ <string name="mb">MB</string>
+ <string name="bridges_updated">网桥已更新</string>
+ <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string>
+ <string name="menu_qr">QR码</string>
+ <string name="bridge_mode">网桥模式</string>
+ <string name="get_bridges_email">电子邮件</string>
+ <string name="get_bridges_web">网页</string>
+ <string name="activate">激活</string>
+ <string name="apps_mode">应用模式</string>
+ <string name="send_email">发送电子邮件</string>
+ <string name="install_orweb">安装 Orweb</string>
+ <string name="standard_browser">标准版浏览器</string>
+</resources>
diff --git a/res/values-zh/strings.xml b/res/values-zh/strings.xml
deleted file mode 100644
index 8f1d1bb..0000000
--- a/res/values-zh/strings.xml
+++ /dev/null
@@ -1,286 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <string name="app_name">Orbot</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
- <string name="control_permission_label">启动和停止 Tor</string>
- <string name="tor_proxy_service_process">Tor 代理服务</string>
- <string name="status_starting_up">Orbot 正在启动…</string>
- <string name="status_activated">已连接到 Tor 网络</string>
- <string name="status_disabled">Orbot 已停用</string>
- <string name="status_shutting_down">Orbot 正在关闭</string>
- <string name="tor_process_starting">正在启动 Tor 客户端…</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>
- <string name="menu_settings">设置</string>
- <string name="menu_log">日志</string>
- <string name="menu_info">帮助</string>
- <string name="menu_apps">应用程序</string>
- <string name="menu_start">启动</string>
- <string name="menu_stop">停止</string>
- <string name="menu_about">关于</string>
- <string name="menu_wizard">向导</string>
- <string name="main_layout_download">下载</string>
- <string name="main_layout_upload">上传</string>
- <string name="button_help">帮助</string>
- <string name="button_close">关闭</string>
- <string name="button_about">关于</string>
- <string name="button_clear_log">清除日志</string>
- <string name="menu_verify">检查</string>
- <string name="menu_exit">退出</string>
- <string name="menu_scan">扫描网桥QR码</string>
- <string name="menu_share_bridge">分享网桥QR码</string>
- <string name="press_to_start">- 长按启动 -</string>
- <string name="pref_trans_proxy_group">透明代理(需要 Root 权限)</string>
- <string name="pref_trans_proxy_title">透明代理</string>
- <string name="pref_trans_proxy_summary">应用程序自动使用 Tor</string>
- <string name="pref_transparent_all_title">所有应用程序使用 Tor</string>
- <string name="pref_transparent_all_summary">所有应用程序都通过 Tor 连接网络</string>
- <string name="pref_transparent_port_fallback_title">备用代理端口</string>
- <string name="pref_transparent_port_fallback_summary">警告:避免使用常用端口(80、443 等)。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
- <string name="pref_transparent_port_title">端口列表</string>
- <string name="pref_transparent_port_summary">代理端口列表。仅在“应用程序”或“应用程序”模式无法工作时使用。</string>
- <string name="pref_transparent_port_dialog">输入代理端口</string>
- <string name="pref_has_root">请求 Root 访问权限</string>
- <string name="pref_has_root_summary">为透明代理请求获取 Root 访问权限</string>
- <string name="status_install_success">Tor 程序安装成功!</string>
- <string name="status_install_fail">Tor 程序无法安装。请查看日志并将其发送到 tor-assistants(a)torproject.org</string>
- <string name="title_error">应用程序错误</string>
- <string name="wizard_title">Orbot</string>
- <string name="wizard_btn_tell_me_more">关于 Orbot</string>
- <string name="btn_next">下一步</string>
- <string name="btn_back">上一步</string>
- <string name="btn_finish">完成</string>
- <string name="btn_okay">确定</string>
- <string name="btn_cancel">取消</string>
- <!--Welcome Wizard strings (DJH)-->
- <string name="wizard_details">更多 Orbot 信息</string>
- <string name="wizard_details_msg">Orbot 是一个包含 Tor、LibEvent 和 Polipo 的开源应用程序。它提供了一个本地 HTTP 代理 (8118) 和一个 SOCKS 代理 (9050) 前往 Tor 网络。Orbot 也有能力在 root 过的设备上将所有互联网流量通过 Tor 发送。</string>
- <string name="wizard_permissions_root">已获取权限</string>
- <string name="wizard_permissions_stock">Orbot 权限</string>
- <string name="wizard_premissions_msg_root">好极了!我们检测到 Orbot 已获取 Root 权限 。我们会谨慎地使用这一权限。</string>
- <string name="wizard_permissions_msg_stock">虽非必须,但是具有 Root 访问权限的设备可以让 Orbot 变得更强大。请使用下面的按钮授予 Orbot 这一强大的能力!</string>
- <string name="wizard_permissions_no_root">如果没有 Root 访问权限或不明白此处所说的内容,只需确保 Orbot 支持所用的应用即可。</string>
- <string name="wizard_permissions_consent">我明白并愿意在未获取 Root 权限的情况下继续操作</string>
- <string name="wizard_permission_enable_root">为 Orbot 获取 Root 权限</string>
- <string name="wizard_configure">配置 Tor 网络</string>
- <string name="wizard_configure_msg">Orbot 提供了选项,可指定所有应用程序使用 Tor 网络或指定某些应用通过 Tor 网络进行通讯。</string>
- <string name="wizard_configure_all">所有应用程序都使用 Tor</string>
- <string name="wizard_configure_select_apps">选择使用 Tor 的应用程序</string>
- <string name="wizard_tips_tricks">Orbot 支持的应用</string>
- <string name="wizard_tips_msg">以下应用可与 Orbot 一起使用。点击下面的按钮安装,也可以通过 Google Play 商店、GuardianProject.info 网站或 F-Droid.org 查找。</string>
- <string name="wizard_tips_otrchat">ChatSecure - Android 上的安全即时通讯客户端</string>
- <string name="wizard_tips_proxy">代理设置 - 学习如何配置应用程序使用 Orbot</string>
- <string name="wizard_tips_duckgo">DuckDuckGo 搜索引擎应用程序</string>
-
-
-
- <string name="wizard_tips_twitter">将 Twitter 代理的主机设置 localhost 并将端口设置为 8118</string>
-
- <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
- <string name="wizard_proxy_help_info">代理设置</string>
- <string name="wizard_final">Orbot 已就绪!</string>
- <string name="wizard_exit_at_first_screen_toast">请在您开始使用它前配置 Orbot!</string>
- <!--END Welcome Wizard strings (DJH)-->
- <string name="tor_check">浏览器将启动并访问:https://check.torproject.org,以便检查 Orbot 配置是否正确以及是否可连接 Tor 网络。</string>
- <string name="pref_hs_group">隐藏服务主机</string>
- <string name="pref_general_group">常规</string>
- <string name="pref_start_boot_title">开机时启动 Orbot</string>
- <string name="pref_start_boot_summary">Android 设备开机时自动启动 Orbot 并连接 Tor 网络</string>
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <string name="wizard_warning_title">警告</string>
- <!--Permissions screen-->
- <string name="wizard_permissions_title">权限</string>
- <string name="wizard_permissions_root_msg1">可选择授予 Orbot “Superuser”访问权限,以便启用高级功能,例如透明代理。</string>
- <string name="wizard_permissions_root_msg2">如果不愿授予 Orbot 该权限,请确保应用程序可使用 Orbot。</string>
- <!--TipsAndTricks screen-->
- <string name="wizard_tips_title">使用 Orbot 的应用程序</string>
- <string name="wizard_tips_gibberbot">ChatSecure:具有 OTF 加密共的安全通讯应用</string>
-
- <string name="wizard_tips_orweb">Orweb:使用 Tor 网络的隐私保护浏览器</string>
-
- <string name="wizard_tips_play">在 Google Play 商店查找所有 Guardian Project 的应用程序</string>
-
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="wizard_transproxy_title">透明代理</string>
- <string name="wizard_transproxy_msg">可使应用程序无需配置即可自动通过 Tor 连接网络。</string>
- <string name="wizard_transproxy_hint">(如果不明白这里所说的问题,请选择该选项)</string>
- <string name="wizard_transproxy_none">无</string>
- <string name="pref_transparent_tethering_title">Tor 网络共享</string>
- <string name="pref_transparent_tethering_summary">对 Wifi 和 USB 网络共享设备启用透明代理(需重新启动)</string>
- <string name="button_grant_superuser">请求 Superuser 访问权限</string>
- <string name="pref_select_apps">选择应用程序</string>
- <string name="pref_select_apps_summary">选择通过 Tor 连接网络的应用程序</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="button_proxy_all">全部代理</string>
- <string name="button_proxy_none">全不代理</string>
- <string name="button_invert_selection">反选</string>
- <string name="pref_proxy_title">出站网络代理(可选)</string>
- <string name="pref_proxy_type_title">出站代理类型</string>
- <string name="pref_proxy_type_summary">代理服务器使用的协议:HTTP、HTTPS、Socks4、Socks5</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>
- <string name="pref_proxy_username_title">出站代理用户名</string>
- <string name="pref_proxy_username_summary">代理用户名(可选)</string>
- <string name="pref_proxy_username_dialog">请输入代理用户名</string>
- <string name="pref_proxy_password_title">出站代理密码</string>
- <string name="pref_proxy_password_summary">代理密码(可选)</string>
- <string name="pref_proxy_password_dialog">请输入代理密码</string>
- <string name="status">状态</string>
- <string name="setting_up_full_transparent_proxying_">正在对所有应用程序进行透明代理设置…</string>
- <string name="setting_up_app_based_transparent_proxying_">正在对所选应用程序进行透明代理设置…</string>
- <string name="transparent_proxying_enabled">透明代理已启用</string>
- <string name="transproxy_enabled_for_tethering_">已为网络共享激活 TransProxy !</string>
- <string name="warning_error_starting_transparent_proxying_">警告:启动透明代理时发生错误!</string>
- <string name="transproxy_rules_cleared">已清除 TransProxy 规则</string>
- <string name="couldn_t_start_tor_process_">无法启动 Tor 进程:</string>
- <string name="privoxy_is_running_on_port_">Polipo 正运行在端口:</string>
- <string name="setting_up_port_based_transparent_proxying_">正在对基于端口的透明代理进行设置…</string>
- <string name="bridge_error">网桥错误</string>
- <string name="bridge_requires_ip">为了需使用网桥,必须至少输入一个网桥 IP 地址。</string>
- <string name="send_email_for_bridges">如需获取网桥地址,请使用 gmail 发送电子邮件至 bridges(a)torproject.org 并在正文内填上“ get bridges”。</string>
- <string name="error">错误</string>
- <string name="your_reachableaddresses_settings_caused_an_exception_">可访问地址设置导致异常!</string>
- <string name="your_relay_settings_caused_an_exception_">中继设置导致异常!</string>
- <string name="exit_nodes">出口节点</string>
- <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">最后跳转的密钥指纹、昵称、国家与地址</string>
- <string name="enter_exit_nodes">输入出口节点</string>
- <string name="exclude_nodes">排除节点</string>
- <string name="fingerprints_nicks_countries_and_addresses_to_exclude">排除的密钥指纹、昵称、国家与地址</string>
- <string name="enter_exclude_nodes">输入排除节点</string>
- <string name="strict_nodes">限制节点</string>
- <string name="use_only_these_specified_nodes">仅使用这些指定节点</string>
- <string name="bridges">网桥</string>
- <string name="use_bridges">使用网桥</string>
- <string name="bridges_obfuscated">混淆网桥</string>
- <string name="enable_alternate_entrance_nodes_into_the_tor_network">使用其他入口节点连接到 Tor 网络</string>
- <string name="enable_if_configured_bridges_are_obfuscated_bridges">已配置的网桥为混淆网桥时启用</string>
- <string name="ip_address_and_port_of_bridges">网桥的 IP 地址和端口</string>
- <string name="enter_bridge_addresses">输入网桥地址</string>
- <string name="relays">中继</string>
- <string name="relaying">中继转发</string>
- <string name="enable_your_device_to_be_a_non_exit_relay">仅设置被设置为非出口中继</string>
- <string name="relay_port">中继端口</string>
- <string name="listening_port_for_your_tor_relay">Tor 中继的侦听端口</string>
- <string name="enter_or_port">输入 OR 端口</string>
- <string name="relay_nickname">中继昵称</string>
- <string name="the_nickname_for_your_tor_relay">Tor 中继昵称</string>
- <string name="enter_a_custom_relay_nickname">输入自定义中继昵称</string>
- <string name="reachable_addresses">可访问地址</string>
- <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">在具有限制策略防火墙内,作为客户端运行</string>
- <string name="reachable_ports">可访问端口</string>
- <string name="ports_reachable_behind_a_restrictive_firewall">防火墙限定的可访问端口</string>
- <string name="enter_ports">输入端口</string>
- <string name="enable_hidden_services">隐藏服务主机</string>
- <string name="run_servers_accessible_via_the_tor_network">允许设备上的服务器可通过 Tor 网络访问</string>
- <string name="enter_localhost_ports_for_hidden_services">输入隐藏服务的本地主机端口</string>
- <string name="hidden_service_ports">隐藏服务端口</string>
- <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">隐藏服务的地址(自动生成)</string>
- <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">启用调试日志输出(必须使用 adb 或 aLongCat 查看)</string>
- <string name="project_home">项目主页(s):</string>
- <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string>
- <string name="the_tor_license">Tor 许可证</string>
- <string name="https_torproject_org">https://torproject.org</string>
- <string name="third_party_software">第三方软件:</string>
- <string name="tor_version">Tor: https://www.torproject.org</string>
- <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string>
- <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string>
- <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string>
- <string name="openssl_version">OpenSSL v1.0.1i: http://www.openssl.org</string>
- <string name="hidden_service_request">应用程序试图打开隐藏服务主机端口 %S 连接 Tor 网络。对于可信应用这是安全的。</string>
- <string name="found_existing_tor_process">发现当前已存在 Tor 进程…</string>
- <string name="something_bad_happened">发生错误,请检查日志</string>
- <string name="hidden_service_on">隐藏服务位于:</string>
- <string name="unable_to_read_hidden_service_name">无法读取隐藏服务名称</string>
- <string name="unable_to_start_tor">无法启动 Tor:</string>
- <string name="pref_use_sys_iptables_title">使用默认 iptables </string>
- <string name="pref_use_sys_iptables_summary">使用内置的 iptables 程序替代 Orbot 绑定的 iptables </string>
- <string name="error_installing_binares">无法安装或更新 Tor 程序。</string>
- <string name="pref_use_persistent_notifications">Orbot 连接后始终在通知栏显示图标</string>
- <string name="pref_use_persistent_notifications_title">始终显示通知</string>
- <string name="pref_use_expanded_notifications">显示扩展的通知,有关 Tor 出口的国家和 IP</string>
- <string name="pref_use_expanded_notifications_title">扩展的通知</string>
- <string name="notification_using_bridges">已启用网桥!</string>
- <string name="default_bridges"></string>
- <string name="set_locale_title">区域设置</string>
- <string name="set_locale_summary">选择 Orbot 的区域设置与语言</string>
- <string name="wizard_locale_title">选择语言</string>
- <string name="wizard_locale_msg">保持默认或切换为当前所用语言</string>
- <string name="powered_by">由 Tor 提供</string>
- <string name="btn_save_settings">保存设置</string>
- <string name="no_internet_connection_tor">无网络连接;Tor 正处于待机状态…</string>
- <string name="bandwidth_">宽带速度:</string>
- <string name="down">下行</string>
- <string name="up">上行</string>
- <string name="pref_disable_network_title">无网络自动休眠</string>
- <string name="pref_disable_network_summary">没有网络连接时,暂时停用 Tor</string>
- <string name="newnym">已切换为新的 Tor 标识!</string>
- <string name="menu_verify_browser">浏览器检测</string>
- <string name="menu_use_chatsecure">使用 ChatSecure</string>
- <string name="permission_manage_tor_label">管理 Tor</string>
- <string name="permission_manage_tor_description">启用该应用可对 Tor 服务进行控制</string>
- <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">好像没有安装 Orweb。是否需要帮忙,还是直接打开浏览器?</string>
- <string name="install_apps_">安装应用?</string>
- <string name="no_network_connectivity_putting_tor_to_sleep_">没有网络连接。Tor 进入睡眠状态…</string>
- <string name="network_connectivity_is_good_waking_tor_up_">网络连接良好。Tor 正在醒来…</string>
- <string name="updating_settings_in_tor_service">正在更新 Tor 服务中的设置</string>
- <string name="pref_socks_title">Tor SOCKS</string>
- <string name="pref_socks_summary">Tor 提供其 SOCKS 代理的端口 (默认: 9050, 0 禁用)</string>
- <string name="pref_socks_dialog">SOCKS 端口配置</string>
- <string name="pref_transport_title">Tor 透明代理端口</string>
- <string name="pref_transport_summary">Tor 提供透明代理的端口 (默认: 9040, 0 禁用)</string>
- <string name="pref_transport_dialog">透明代理配置</string>
- <string name="pref_dnsport_title">Tor DNS 端口</string>
- <string name="pref_dnsport_summary">Tor 提供 DNS 的端口 (默认: 5400, 0 禁用)</string>
- <string name="pref_dnsport_dialog">DNS 端口配置</string>
- <string name="pref_torrc_title">Torrc 自定义配置</string>
- <string name="pref_torrc_summary">仅供专家:直接输入 torrc 配置行</string>
- <string name="pref_torrc_dialog">自定义 Torrc</string>
-
- <string name="your_tor_public_ips_">您的 Tor 公网 IP:</string>
- <string name="please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_">如果您使用 Orbot 遇到问题,请在 Android->设置->应用 中禁用本应用:</string>
- <string name="app_conflict">应用冲突</string>
- <string name="pref_transproxy_refresh_title">透明代理自动刷新</string>
- <string name="pref_transproxy_refresh_summary">在网络状态改变时重新应用透明代理规则</string>
- <string name="pref_transproxy_flush_title">透明代理强制移除</string>
- <string name="pref_transproxy_flush_summary">点按这里立即刷新所有透明代理的网络规则</string>
- <string name="transparent_proxy_rules_flushed_">透明代理规则已刷新!</string>
- <string name="you_do_not_have_root_access_enabled">您还没有 ROOT 访问权限</string>
- <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">您可能需要停止并重新启动 Orbot 才能使设置更改生效。</string>
- <string name="menu_vpn">应用</string>
- <string name="kbps">kbps</string>
- <string name="mbps">mbps</string>
- <string name="kb">KB</string>
- <string name="mb">MB</string>
- <string name="bridges_updated">网桥已更新</string>
- <string name="restart_orbot_to_use_this_bridge_">请重启 Orbot 以使变更生效</string>
- <string name="menu_qr">QR码</string>
- <string name="bridge_mode">网桥模式</string>
- <string name="get_bridges_email">电子邮件</string>
- <string name="get_bridges_web">网页</string>
- <string name="activate">激活</string>
- <string name="apps_mode">应用模式</string>
- <string name="send_email">发送电子邮件</string>
- <string name="install_orweb">安装 Orweb</string>
- <string name="standard_browser">标准版浏览器</string>
-</resources>
1
0

[orbot/master] update SettingsActivity to use simpler findPreferences() method
by n8fr8@torproject.org 25 Jun '15
by n8fr8@torproject.org 25 Jun '15
25 Jun '15
commit fba09263b41c9ae2970d578801584302bc427a89
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Fri Jun 5 15:16:08 2015 -0400
update SettingsActivity to use simpler findPreferences() method
---
.../android/settings/SettingsPreferences.java | 116 ++++++++------------
1 file changed, 45 insertions(+), 71 deletions(-)
diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java
index 5a96c9b..5b21514 100644
--- a/src/org/torproject/android/settings/SettingsPreferences.java
+++ b/src/org/torproject/android/settings/SettingsPreferences.java
@@ -16,10 +16,11 @@ import android.content.SharedPreferences;
import android.content.res.Configuration;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
+import android.preference.EditTextPreference;
+import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity;
-import android.preference.PreferenceCategory;
import android.widget.Toast;
@@ -31,85 +32,60 @@ public class SettingsPreferences
private Preference prefTransProxyFlush = null;
private Preference prefTransProxyApps = null;
- private CheckBoxPreference prefHiddenServices = null;
+ private CheckBoxPreference prefHiddenServices = null;
+ private EditTextPreference prefHiddenServicesPorts;
+ private EditTextPreference prefHiddenServicesHostname;
private CheckBoxPreference prefRequestRoot = null;
- private Preference prefLocale = null;
+ private ListPreference prefLocale = null;
- private boolean hasRoot = false;
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
- private final static int HIDDEN_SERVICE_PREF_IDX = 6;
- private final static int TRANSPROXY_GROUP_IDX = 1;
- private final static int DEBUG_GROUP_IDX = 8;
-
-
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
-
- addPreferencesFromResource(R.xml.preferences);
- getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
- SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
-
- hasRoot = prefs.getBoolean("has_root",false);
-
- init();
- }
-
- private void init ()
- {
- int SET_LOCALE_IDX = 3;
+ addPreferencesFromResource(R.xml.preferences);
+ getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
+ SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext());
- int GENERAL_GROUP_IDX = 0;
-
- prefRequestRoot = ((CheckBoxPreference)((PreferenceCategory)getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(0));
- prefRequestRoot.setOnPreferenceClickListener(this);
+ prefRequestRoot = (CheckBoxPreference) findPreference("has_root");
+ prefRequestRoot.setOnPreferenceClickListener(this);
- prefLocale = (((PreferenceCategory)getPreferenceScreen().getPreference(GENERAL_GROUP_IDX)).getPreference(SET_LOCALE_IDX));
- prefLocale.setOnPreferenceClickListener(this);
-
- prefCBTransProxy = ((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(1));
- prefcBTransProxyAll = (CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(2);
-
- prefTransProxyFlush = (Preference)((PreferenceCategory)this.getPreferenceScreen().getPreference(DEBUG_GROUP_IDX)).getPreference(8);
- prefTransProxyFlush.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ prefLocale = (ListPreference) findPreference("pref_default_locale");
+ prefLocale.setOnPreferenceClickListener(this);
- @Override
- public boolean onPreferenceClick(Preference arg0) {
-
- Intent data = new Intent();
- data.putExtra("transproxywipe", true);
- setResult(RESULT_OK,data);
-
- finish();
- return false;
- }
-
- });
-
- prefTransProxyApps = ((PreferenceCategory)this.getPreferenceScreen().getPreference(TRANSPROXY_GROUP_IDX)).getPreference(3);
+ prefCBTransProxy = (CheckBoxPreference) findPreference("pref_transparent");
+ prefcBTransProxyAll = (CheckBoxPreference) findPreference("pref_transparent_all");
+ prefTransProxyFlush = (Preference) findPreference("pref_transproxy_flush");
+ prefTransProxyFlush.setOnPreferenceClickListener(new OnPreferenceClickListener() {
- prefCBTransProxy.setOnPreferenceClickListener(this);
- prefcBTransProxyAll.setOnPreferenceClickListener(this);
- prefTransProxyApps.setOnPreferenceClickListener(this);
-
- prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked());
- prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked()));
-
-
- prefHiddenServices = ((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(0));
- prefHiddenServices.setOnPreferenceClickListener(this);
- ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(1).setEnabled(prefHiddenServices.isChecked());
- ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(2).setEnabled(prefHiddenServices.isChecked());
-
-
- };
-
+ @Override
+ public boolean onPreferenceClick(Preference arg0) {
+ Intent data = new Intent();
+ data.putExtra("transproxywipe", true);
+ setResult(RESULT_OK, data);
+ finish();
+ return false;
+ }
+ });
+ prefTransProxyApps = findPreference("pref_transparent_app_list");
+ prefTransProxyApps.setOnPreferenceClickListener(this);
+ prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked()
+ && (!prefcBTransProxyAll.isChecked()));
+ prefCBTransProxy.setOnPreferenceClickListener(this);
+ prefcBTransProxyAll.setOnPreferenceClickListener(this);
+ prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked());
+
+ prefHiddenServices = (CheckBoxPreference) findPreference("pref_hs_enable");
+ prefHiddenServices.setOnPreferenceClickListener(this);
+ prefHiddenServicesPorts = (EditTextPreference) findPreference("pref_hs_ports");
+ prefHiddenServicesPorts.setEnabled(prefHiddenServices.isChecked());
+ prefHiddenServicesHostname = (EditTextPreference) findPreference("pref_hs_hostname");
+ prefHiddenServicesHostname.setEnabled(prefHiddenServices.isChecked());
+ }
public boolean onPreferenceClick(Preference preference) {
@@ -147,10 +123,8 @@ public class SettingsPreferences
}
else if (preference == prefHiddenServices)
{
-
- ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(1).setEnabled(prefHiddenServices.isChecked());
- ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(2).setEnabled(prefHiddenServices.isChecked());
-
+ prefHiddenServicesPorts.setEnabled(prefHiddenServices.isChecked());
+ prefHiddenServicesHostname.setEnabled(prefHiddenServices.isChecked());
}
else if (preference == prefLocale)
{
1
0

[orbot/master] Merge pull request #10 from eighthave/fix-translations
by n8fr8@torproject.org 25 Jun '15
by n8fr8@torproject.org 25 Jun '15
25 Jun '15
commit 9a786d4aca93f1a39a95ce1e571fdfad0c3a90af
Merge: 5414104 96b5d90
Author: n8fr8 <nathan(a)freitas.net>
Date: Mon Jun 8 21:53:30 2015 -0400
Merge pull request #10 from eighthave/fix-translations
Fix translations
.tx/config | 10 +
res/values-bn-rBD/strings.xml | 16 --
res/values-de-rAT/strings.xml | 16 --
res/values-he/strings.xml | 192 -------------
res/values-hi/strings.xml | 27 --
res/values-hy-rAM/strings.xml | 16 --
res/values-id-rID/strings.xml | 224 ---------------
res/values-id/strings.xml | 52 ----
res/values-in-rID/strings.xml | 224 +++++++++++++++
res/values-iw/strings.xml | 192 +++++++++++++
res/values-kn-rIN/strings.xml | 16 --
res/values-kn/strings.xml | 18 --
res/values-ml/strings.xml | 16 --
res/values-mn-rMN/strings.xml | 16 --
res/values-sn/strings.xml | 26 --
res/values-ta/strings.xml | 16 --
res/values-zh-rCN/strings.xml | 286 ++++++++++++++++++++
res/values-zh/strings.xml | 286 --------------------
res/values/arrays.xml | 38 +--
res/values/strings.xml | 2 +-
res/xml/preferences.xml | 2 -
src/info/guardianproject/util/Languages.java | 157 +++++++++++
src/org/torproject/android/OrbotApp.java | 122 +++++----
src/org/torproject/android/OrbotMainActivity.java | 131 ++++-----
.../android/settings/SettingsPreferences.java | 232 +++++++---------
.../ui/wizard/ChooseLocaleWizardActivity.java | 65 ++---
26 files changed, 1099 insertions(+), 1299 deletions(-)
1
0
commit 5c7171bc8737b7618109f83fb8314cb34b7535fa
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Fri Jun 5 17:37:07 2015 -0400
add config for transifex-client aka tx
---
.tx/config | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.tx/config b/.tx/config
new file mode 100644
index 0000000..44d0e0a
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT:
es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil: tl, fil_PH: tl-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he: iw, he_IL: iw-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id: in, id_ID: in-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-
rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr: sr, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rM
O, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA
+
+[orbot.stringsxml]
+file_filter = res/values-<lang>/strings.xml
+host = https://www.transifex.com
+source_file = res/values/strings.xml
+source_lang = en
+
1
0

[orbot/master] include proxy config info when returning from START_TOR Intent
by n8fr8@torproject.org 25 Jun '15
by n8fr8@torproject.org 25 Jun '15
25 Jun '15
commit 807b51fb4396fd81daf135bc2f8550561a14547d
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Fri Jun 5 15:24:23 2015 -0400
include proxy config info when returning from START_TOR Intent
The recommended way to send a START_TOR Intent is using
startActivityWithResult() so that the sender knows when Tor is actually
started. The return includes an Intent that can also include the config
info for the proxies that Orbot runs. Right now, this is based on the
app defaults, but ultimately, it should dynamically get the port numbers
for cases like Samsung devices where there is a port conflict.
---
src/org/torproject/android/OrbotMainActivity.java | 33 +++++++++++----------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index a595e8b..3e577ad 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -615,21 +615,24 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
else if (action.equals("org.torproject.android.START_TOR"))
{
autoStartFromIntent = true;
-
- try {
- startTor();
+ try {
+ Log.i(TAG, "action equals org.torproject.android.START_TOR");
+ startTor();
+
+ Intent resultIntent = new Intent(intent);
+ resultIntent.putExtra("socks_proxy", "socks://127.0.0.1:" + TorServiceConstants.PORT_SOCKS_DEFAULT);
+ resultIntent.putExtra("socks_proxy_host", "127.0.0.1");
+ resultIntent.putExtra("socks_proxy_port", TorServiceConstants.PORT_SOCKS_DEFAULT);
+ resultIntent.putExtra("http_proxy", "http://127.0.0.1" + TorServiceConstants.PORT_HTTP);
+ resultIntent.putExtra("http_proxy_host", "127.0.0.1");
+ resultIntent.putExtra("http_proxy_port", TorServiceConstants.PORT_HTTP);
+ setResult(RESULT_OK, resultIntent);
+ finish();
+ } catch (RemoteException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- Intent nResult = new Intent();
-
- //nResult.putExtra("socks", ); //TODO respond with socks, transport, dns, etc
-
- setResult(RESULT_OK,nResult);
-
- } catch (RemoteException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
}
else if (action.equals(Intent.ACTION_VIEW))
{
@@ -1251,7 +1254,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
if (autoStartFromIntent)
{
- setResult(RESULT_OK);
+ autoStartFromIntent = false;
finish();
}
1
0

25 Jun '15
commit 356e79a163bee025aecefdf34decaff7a6cc5761
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Mon Jun 8 14:28:13 2015 -0400
remove unused IntentFilter from TorService
---
AndroidManifest.xml | 16 ++++++----------
src/org/torproject/android/OrbotConstants.java | 2 --
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 3024979..f95ec15 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -88,16 +88,12 @@
<activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/>
<activity android:name=".settings.AppManager" android:label="@string/app_name"/>
- <service android:enabled="true"
- android:name=".service.TorService"
- android:permission="org.torproject.android.MANAGE_TOR"
- android:stopWithTask="false"
- >
- <intent-filter>
- <action android:name="org.torproject.android.service.ITorService" />
- <action android:name="org.torproject.android.service.TOR_SERVICE" />
- </intent-filter>
- </service>
+ <service
+ android:name=".service.TorService"
+ android:enabled="true"
+ android:permission="org.torproject.android.MANAGE_TOR"
+ android:stopWithTask="false" >
+ </service>
<receiver android:name="org.torproject.android.service.OnBootReceiver"
android:enabled="true" android:exported="true"
diff --git a/src/org/torproject/android/OrbotConstants.java b/src/org/torproject/android/OrbotConstants.java
index fa67d92..f1521e8 100644
--- a/src/org/torproject/android/OrbotConstants.java
+++ b/src/org/torproject/android/OrbotConstants.java
@@ -19,8 +19,6 @@ public interface OrbotConstants {
public final static String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport=";
public final static String NEWLINE = "\n";
-
- // public final static String INTENT_TOR_SERVICE = "org.torproject.android.service.TOR_SERVICE";
public final static String HANDLER_TOR_MSG = "torServiceMsg";
1
0

25 Jun '15
commit aebf3b07604db77f25dc0d7e2e1e9747cbe8bd52
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Fri Jun 5 17:44:05 2015 -0400
fixed directory names for Indonesian and Hebrew
https://stackoverflow.com/questions/13291578/how-to-localize-an-android-app…
Note that Java uses several deprecated two-letter codes. The Hebrew ("he")
language code is rewritten as "iw", Indonesian ("id") as "in", and Yiddish
("yi") as "ji". This rewriting happens even if you construct your own
Locale object, not just for instances returned by the various lookup
methods.
---
res/values-he/strings.xml | 192 ------------------
res/values-id-rID/strings.xml | 224 ---------------------
res/values-id/strings.xml | 52 -----
res/values-in-rID/strings.xml | 224 +++++++++++++++++++++
res/values-iw/strings.xml | 192 ++++++++++++++++++
src/org/torproject/android/OrbotMainActivity.java | 5 +-
6 files changed, 419 insertions(+), 470 deletions(-)
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
deleted file mode 100644
index 0db3188..0000000
--- a/res/values-he/strings.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <string name="app_name">Orbot</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
- <string name="control_permission_label">התחל ועצור את Tor</string>
- <string name="tor_proxy_service_process">שירות פרוקסי Tor</string>
- <string name="status_starting_up">Orbot מתחיל…</string>
- <string name="status_activated">מחובר לרשת Tor</string>
- <string name="status_disabled">Orbot כבוי</string>
- <string name="status_shutting_down">Orbot בתהליך כיבוי</string>
- <string name="tor_process_starting">מתחיל לקוח Tor…</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>
- <string name="menu_settings">הגדרות</string>
- <string name="menu_log">רישום</string>
- <string name="menu_info">עזרה</string>
- <string name="menu_apps">אפליקציות</string>
- <string name="menu_start">התחל</string>
- <string name="menu_stop">עצור</string>
- <string name="menu_about">אודות</string>
- <string name="menu_wizard">אשף</string>
- <string name="main_layout_download">הורדה</string>
- <string name="main_layout_upload">העלאה</string>
- <string name="button_help">עזרה</string>
- <string name="button_close">סגור</string>
- <string name="button_about">אודות</string>
- <string name="button_clear_log">נקה רישום</string>
- <string name="menu_verify">בדוק</string>
- <string name="menu_exit">יציאה</string>
- <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
- <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
- <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
- <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
- <string name="pref_transparent_all_title">הכל דרך Tor</string>
- <string name="pref_transparent_all_summary">תעבור דרך פרוקסי עבור כל האפליקציות דרך Tor</string>
- <string name="pref_transparent_port_fallback_title">מפלט פורט פרוקסי</string>
- <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\' לא עובדים.</string>
- <string name="pref_transparent_port_title">רשימת פורטים</string>
- <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\' לא עובדים.</string>
- <string name="pref_transparent_port_dialog">הזן פורטים לפרוקסי</string>
- <string name="pref_has_root">דרושה גישת שורש</string>
- <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
- <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
- <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל
-tor-assistants(a)torproject.org</string>
- <string name="title_error">שגיאת אפליקציה</string>
- <string name="wizard_title">Orbot</string>
- <string name="wizard_btn_tell_me_more">אודות Orbot</string>
- <string name="btn_next">הבא</string>
- <string name="btn_back">הקודם</string>
- <string name="btn_finish">סיים</string>
- <string name="btn_okay">אישור</string>
- <string name="btn_cancel">ביטול</string>
- <!--Welcome Wizard strings (DJH)-->
- <string name="wizard_details">פרטים מסוימים של Orbot </string>
- <string name="wizard_permissions_root">ניתנה הרשאה</string>
- <string name="wizard_permissions_stock">הרשאות Orbot</string>
- <string name="wizard_premissions_msg_root">מצוין! גילינו כי יש לך הרשאות שורש מאופשרות בשביל Orbot. אנחנו נשתמש בכוח הזה בחוכמה.</string>
- <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
- <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
- <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
- <string name="wizard_permission_enable_root">אפשר גישת שורש עבור Orbot</string>
- <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
- <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
- <string name="wizard_configure_all">השתמש בפרוקסי בכל האפליקציות דרך Tor</string>
- <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
- <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
- <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או
-דרך F-Droid.org</string>
- <string name="wizard_tips_proxy">הגדרות פרוקסי - למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
- <string name="wizard_tips_duckgo">DuckDuckGo אפליקציית מנוע חיפוש</string>
-
- <string name="wizard_tips_twitter">קבע פרוקסי Twitter למארח \"localhost\" ולפורט 8118</string>
- <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
- <string name="wizard_proxy_help_info">הגדרות פרוקסי</string>
- <string name="wizard_final">Orbot מוכן!</string>
- <!--END Welcome Wizard strings (DJH)-->
- <string name="tor_check">דבר זה יוביל את דפדפן הרשת שלך למוד https://check.torproject.org כדי לראות אם Orbot הוגדרה כראוי וכן כי אתה מחובר לרשת Tor.</string>
- <string name="pref_hs_group">איחסון שירותים נסתרים</string>
- <string name="pref_general_group">כללי</string>
- <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
- <string name="pref_start_boot_summary">התחל את Orbot והתחבר לרשת Tor אוטומטית כאשר המכשיר נדלק</string>
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <string name="wizard_warning_title">אזהרה</string>
- <!--Permissions screen-->
- <string name="wizard_permissions_title">הרשאות</string>
- <string name="wizard_permissions_root_msg1">אתה יכול להעניק לאפליקציה Orbot גישת \'Superuser\' כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
- <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש באפליקציות שיועדו לעבוד עם Orbot</string>
- <!--TipsAndTricks screen-->
- <string name="wizard_tips_title">Orbot-יישומים מופעלים</string>
- <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string>
- <string name="wizard_tips_orweb">Orweb- דפדפן עם פרטיות רבה שעובד דרך Tor</string>
- <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string>
-
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="wizard_transproxy_title">פרוקסי שקוף</string>
- <string name="wizard_transproxy_msg">זה מאפשר לאפליקציות שלך לרוץ באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
- <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
- <string name="wizard_transproxy_none">כלום</string>
- <string name="pref_transparent_tethering_title">Tor Tethering</string>
- <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי USB Tethered (דורש אתחול מחדש)</string>
- <string name="button_grant_superuser">דרוש אישור Superuser</string>
- <string name="pref_select_apps">בחר אפלקציות</string>
- <string name="pref_select_apps_summary">בחר אפלקציות</string>
- <string name="pref_node_configuration">הגדרות Node</string>
- <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
- <string name="pref_entrance_node">Entrance Nodes</string>
- <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
- <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
- <string name="pref_proxy_type_title">Outbound Proxy Type</string>
- <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי: HTTP, HTTPS, Socks4,Socks5</string>
- <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
- <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
- <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string>
- <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
- <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
- <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string>
- <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
- <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string>
- <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string>
- <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string>
- <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string>
- <string name="status">סטטוס</string>
- <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף…</string>
- <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות…</string>
- <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
- <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
- <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
- <string name="transproxy_rules_cleared">כללי TransProxy טוהרו</string>
- <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
- <string name="bridge_error">שגיאת גשר</string>
- <string name="error">שגיאה</string>
- <string name="exit_nodes">צמתי יציאה</string>
- <string name="enter_exit_nodes">הזן צמתי יציאה</string>
- <string name="exclude_nodes">צמתים מוצאים</string>
- <string name="enter_exclude_nodes">הזן צמתים מוצאים</string>
- <string name="strict_nodes">צמתים קפדנים</string>
- <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string>
- <string name="bridges">גשרים</string>
- <string name="use_bridges">השתמש בגשרים</string>
- <string name="bridges_obfuscated">גשרים מעורפלים</string>
- <string name="ip_address_and_port_of_bridges">כתובת ה-IP ויציאה של הגשרים</string>
- <string name="enter_bridge_addresses">הכנס כתובות גשר</string>
- <string name="relays">ממסרים</string>
- <string name="relaying">ממסור</string>
- <string name="enter_or_port"> הכנס יציאת OR</string>
- <string name="relay_nickname">כינוי הממסר</string>
- <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string>
- <string name="reachable_addresses">כתובות בהישג יד</string>
- <string name="reachable_ports">פורטים בהישג יד</string>
- <string name="enter_ports">הזן פורטים</string>
- <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
- <string name="enter_localhost_ports_for_hidden_services">הזן פורטים של localhost עבור שירותים נסתרים</string>
- <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
- <string name="the_tor_license">הרשיון של Tor</string>
- <string name="https_torproject_org">https://torproject.org/</string>
- <string name="third_party_software">תוכנה-צד-ג׳: </string>
- <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
- <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
- <string name="hidden_service_on">שירות נסתר ב:</string>
- <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
- <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
- <string name="pref_use_sys_iptables_title">השתמש בברירות המחדל של iptables</string>
- <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
- <string name="notification_using_bridges">גשרים מאופשרים!</string>
- <string name="default_bridges"></string>
- <string name="set_locale_title">קבע מקומיות</string>
- <string name="set_locale_summary">בחר את המקומיות והשפה של Orbot</string>
- <string name="wizard_locale_title">בחר שפה</string>
- <string name="wizard_locale_msg">השאר ברירת מחדל או החלף לשפה הנוכחית</string>
- <string name="btn_save_settings">שמירת הגדרות</string>
- <string name="no_internet_connection_tor">אין חיבור אינטרנט; Tor מצוי בכוננות…</string>
- <string name="bandwidth_">רוחב פס:</string>
- <string name="newnym">החלפת אל זהות Tor חדשה!</string>
- <string name="menu_verify_browser">בדוק דפדפן</string>
- <string name="menu_use_chatsecure">הפעל את ChatSecure</string>
- <string name="permission_manage_tor_label">נהל Tor</string>
- <string name="permission_manage_tor_description">אפשר את אפליקציה זו כדי לשלוט בשירות Tor</string>
- <string name="install_apps_">להתקין אפליקציה?</string>
-</resources>
diff --git a/res/values-id-rID/strings.xml b/res/values-id-rID/strings.xml
deleted file mode 100644
index 5d98438..0000000
--- a/res/values-id-rID/strings.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <string name="app_name">Orbot</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
- <string name="control_permission_label">mulai dan akhiri Tor</string>
- <string name="tor_proxy_service_process">torproxyservice</string>
- <string name="status_starting_up">Orbot sedang dimulai…</string>
- <string name="status_activated">Tersambung ke Jaringan Tor</string>
- <string name="status_disabled">Orbot telah dibatalkan</string>
- <string name="status_shutting_down">Orbot sedang dimatikan</string>
- <string name="tor_process_starting">Memulai klien Tor…</string>
- <string name="tor_process_complete">selesai.</string>
- <string name="tor_process_waiting">menunggu.</string>
- <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
- <string name="menu_home">Beranda</string>
- <string name="menu_browse">Jelajah</string>
- <string name="menu_settings">Pengaturan</string>
- <string name="menu_log">Log</string>
- <string name="menu_info">Bantuan</string>
- <string name="menu_apps">Aplikasi</string>
- <string name="menu_start">Mulai</string>
- <string name="menu_stop">Berhenti</string>
- <string name="menu_about">Tentang</string>
- <string name="menu_wizard">Wizard</string>
- <string name="main_layout_download">Unduh</string>
- <string name="main_layout_upload">Unggah</string>
- <string name="button_help">Bantuan</string>
- <string name="button_close">Tutup</string>
- <string name="button_about">Tentang</string>
- <string name="button_clear_log">Hapus Log</string>
- <string name="menu_verify">Periksa</string>
- <string name="menu_exit">Keluar</string>
- <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
- <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
- <string name="pref_trans_proxy_title">Proxy Transparan</string>
- <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
- <string name="pref_transparent_all_title">Tor Semuanya</string>
- <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
- <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
- <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
- <string name="pref_transparent_port_title">Daftar Port</string>
- <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
- <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
- <string name="pref_has_root">Minta Akses Root</string>
- <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
- <string name="status_install_success">Binary Tor berhasil dipasang!</string>
- <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants(a)torprojects.org</string>
- <string name="title_error">Kesalahan Pada Aplikasi</string>
- <string name="wizard_title">Orbot</string>
- <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
- <string name="btn_next">Berikutnya</string>
- <string name="btn_back">Kembali</string>
- <string name="btn_finish">Selesai</string>
- <string name="btn_okay">Oke</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
- <string name="wizard_details">Beberapa Rincian Orbot</string>
- <string name="wizard_permissions_root">Izin Diberikan</string>
- <string name="wizard_permissions_stock">Perizinan Orbot</string>
- <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
- <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
- <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
- <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
- <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
- <string name="wizard_configure">Konfigurasi Torifikasi</string>
- <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
- <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
- <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
- <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
- <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
- <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string>
- <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string>
- <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string>
-
- <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
- <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
- <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
- <string name="wizard_final">Orbot sudah siap!</string>
- <!--END Welcome Wizard strings (DJH)-->
- <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
- <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
- <string name="pref_general_group">Umum</string>
- <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
- <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <string name="wizard_warning_title">Peringatan</string>
- <!--Permissions screen-->
- <string name="wizard_permissions_title">Perizinan</string>
- <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
- <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
- <!--TipsAndTricks screen-->
- <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string>
- <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string>
-
- <string name="wizard_tips_orweb">Orweb: Peramban dengan Peningkatan-privasi yang bekerja melalui Tor</string>
-
- <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
-
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="wizard_transproxy_title">Transparan Proxying</string>
- <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
- <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
- <string name="wizard_transproxy_none">Tidak ada</string>
- <string name="pref_transparent_tethering_title">Tor Tethering</string>
- <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
- <string name="button_grant_superuser">Meminta Akses Superuser</string>
- <string name="pref_select_apps">Pilih Aplikasi</string>
- <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
- <string name="pref_node_configuration">Konfigurasi Simpul</string>
- <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
- <string name="pref_entrance_node">Simpul Masuk</string>
- <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
- <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
- <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
- <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
- <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
- <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
- <string name="pref_proxy_host_title">Outbound Host Proxy</string>
- <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
- <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
- <string name="pref_proxy_port_title">Outbound Port Proxy</string>
- <string name="pref_proxy_port_summary">Port Server Proxy</string>
- <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
- <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
- <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
- <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
- <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
- <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
- <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
- <string name="status">Status</string>
- <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh…</string>
- <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan…</string>
- <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
- <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
- <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
- <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
- <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
- <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port…</string>
- <string name="bridge_error">Kesalahan pada Bridge</string>
- <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
- <string name="send_email_for_bridges">Kirimkan email ke bridges(a)torproject.org dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
- <string name="error">Kesalahan</string>
- <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
- <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
- <string name="exit_nodes">Node Keluar</string>
- <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
- <string name="enter_exit_nodes">Memasuki Node Keluar</string>
- <string name="exclude_nodes">Node pengecualian</string>
- <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
- <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
- <string name="strict_nodes">Node Terlarang</string>
- <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
- <string name="bridges">Bridges</string>
- <string name="use_bridges">Pakai Bridges</string>
- <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
- <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
- <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
- <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
- <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
- <string name="relays">Relays</string>
- <string name="relaying">Sedang me-Relay</string>
- <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
- <string name="relay_port">Port Relay</string>
- <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
- <string name="enter_or_port">Memasuki OR port</string>
- <string name="relay_nickname">Nama Relay</string>
- <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
- <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
- <string name="reachable_addresses">Addresses Terjangkau</string>
- <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
- <string name="reachable_ports">Ports terjangkau</string>
- <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
- <string name="enter_ports">Memasuki ports</string>
- <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
- <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
- <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
- <string name="hidden_service_ports">Ports Layanan Rahasia</string>
- <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
- <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
- <string name="project_home">Beranda Projek:</string>
- <string name="the_tor_license">Lisensi Tor</string>
- <string name="https_torproject_org">https://torproject.org</string>
- <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
- <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
- <string name="found_existing_tor_process">menemukan proses Tor yang ada…</string>
- <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
- <string name="hidden_service_on">layanan tersembunyi pada:</string>
- <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
- <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
- <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
- <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
- <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
- <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
- <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
- <string name="notification_using_bridges">Bridge diaktifkan!</string>
- <string name="default_bridges"></string>
- <string name="set_locale_title">Setel Lokal</string>
- <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
- <string name="wizard_locale_title">Pilih Bahasa</string>
- <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
- <string name="btn_save_settings">Simpan Pengaturan</string>
- <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby…</string>
- <string name="bandwidth_">Bandwidth:</string>
- <string name="down">unduh</string>
- <string name="up">unggah</string>
- <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
- <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
- <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
- <string name="menu_verify_browser">Periksa Peramban</string>
- <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
- <string name="permission_manage_tor_label">Kelola Tor</string>
- <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
- <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Sepertinya anda belum memasang Orweb. Perlu bantuan dengan itu, atau sebaiknya kami buka peramban?</string>
- <string name="install_apps_">Pasang aplikasi?</string>
-</resources>
diff --git a/res/values-id/strings.xml b/res/values-id/strings.xml
deleted file mode 100644
index 914f6f2..0000000
--- a/res/values-id/strings.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <string name="app_name">Orbot</string>
- <string name="internal_web_url">http://orbot/</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
- <string name="control_permission_label">mulai dan akhiri Tor</string>
- <string name="tor_proxy_service_process">torproxyservice</string>
- <string name="status_starting_up">Orbot sedang dimulai…</string>
- <string name="status_activated">Tersambung ke Jaringan Tor</string>
- <string name="status_disabled">Orbot telah dibatalkan</string>
- <string name="status_shutting_down">Orbot sedang dimatikan</string>
- <string name="not_anonymous_yet">PERINGATAN: </string>
- <string name="menu_home">Home</string>
- <string name="menu_browse">Jelajahi</string>
- <string name="menu_settings">Pengaturan</string>
- <string name="menu_log">Log</string>
- <string name="menu_info">Bantuan</string>
- <string name="menu_about">Mengenai</string>
- <string name="button_help">Bantuan</string>
- <string name="button_close">Dekat</string>
- <string name="button_about">Mengenai</string>
- <string name="button_clear_log">Hapus Log</string>
- <string name="menu_verify">Periksa</string>
- <string name="menu_exit">Keluar</string>
- <string name="pref_transparent_all_title">Tor Semuanya</string>
- <string name="pref_transparent_port_title">Daftar Port</string>
- <string name="pref_has_root">Minta Akses Dasar</string>
- <string name="btn_back">Kembali</string>
- <string name="btn_cancel">Batal</string>
- <!--Welcome Wizard strings (DJH)-->
- <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
- <!--END Welcome Wizard strings (DJH)-->
- <string name="pref_general_group">Umum</string>
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <string name="wizard_warning_title">Peringatan</string>
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="wizard_transproxy_none">Tidak ada</string>
- <string name="status">Status</string>
- <string name="error">Kesalahan</string>
- <string name="default_bridges"></string>
- <string name="btn_save_settings">Simpan Pengaturan</string>
-</resources>
diff --git a/res/values-in-rID/strings.xml b/res/values-in-rID/strings.xml
new file mode 100644
index 0000000..5d98438
--- /dev/null
+++ b/res/values-in-rID/strings.xml
@@ -0,0 +1,224 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">Orbot</string>
+ <string name="internal_web_url">http://orbot/</string>
+ <string name="default_web_url">http://check.torproject.org</string>
+ <string name="secure_default_web_url">https://check.torproject.org</string>
+ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+ <string name="control_permission_label">mulai dan akhiri Tor</string>
+ <string name="tor_proxy_service_process">torproxyservice</string>
+ <string name="status_starting_up">Orbot sedang dimulai…</string>
+ <string name="status_activated">Tersambung ke Jaringan Tor</string>
+ <string name="status_disabled">Orbot telah dibatalkan</string>
+ <string name="status_shutting_down">Orbot sedang dimatikan</string>
+ <string name="tor_process_starting">Memulai klien Tor…</string>
+ <string name="tor_process_complete">selesai.</string>
+ <string name="tor_process_waiting">menunggu.</string>
+ <string name="not_anonymous_yet">PERINGATAN: Trafik anda belum anonim! Silahkan konfigurasikan aplikasi anda untuk dapat menggunakan proxy HTTP 127.0.0.1:8118 atau SOCKS4A atau proxy SOCKS5 127.0.0.1:9050</string>
+ <string name="menu_home">Beranda</string>
+ <string name="menu_browse">Jelajah</string>
+ <string name="menu_settings">Pengaturan</string>
+ <string name="menu_log">Log</string>
+ <string name="menu_info">Bantuan</string>
+ <string name="menu_apps">Aplikasi</string>
+ <string name="menu_start">Mulai</string>
+ <string name="menu_stop">Berhenti</string>
+ <string name="menu_about">Tentang</string>
+ <string name="menu_wizard">Wizard</string>
+ <string name="main_layout_download">Unduh</string>
+ <string name="main_layout_upload">Unggah</string>
+ <string name="button_help">Bantuan</string>
+ <string name="button_close">Tutup</string>
+ <string name="button_about">Tentang</string>
+ <string name="button_clear_log">Hapus Log</string>
+ <string name="menu_verify">Periksa</string>
+ <string name="menu_exit">Keluar</string>
+ <string name="press_to_start">- sentuh dan tahan untuk memulai -</string>
+ <string name="pref_trans_proxy_group">Proxy Transparan (Dibutuhkan Root)</string>
+ <string name="pref_trans_proxy_title">Proxy Transparan</string>
+ <string name="pref_trans_proxy_summary">Otomatis Torfying Aplikasi</string>
+ <string name="pref_transparent_all_title">Tor Semuanya</string>
+ <string name="pref_transparent_all_summary">Trafik proxy untuk semua aplikasi melalui Tor</string>
+ <string name="pref_transparent_port_fallback_title">Alternatif Port Proxy</string>
+ <string name="pref_transparent_port_fallback_summary">PERINGATAN: Temukan port umum (80, 443, dll). *Gunakan Hanya* jika \'Semua\' atau \'Aplikasi\' mode tidak bekerja.</string>
+ <string name="pref_transparent_port_title">Daftar Port</string>
+ <string name="pref_transparent_port_summary">Daftar port untuk proxy. *GUNAKAN HANYA* jika modus \'Semua\' atau \'Apl\' tidak bekerja</string>
+ <string name="pref_transparent_port_dialog">Masukkan port untuk proxy</string>
+ <string name="pref_has_root">Minta Akses Root</string>
+ <string name="pref_has_root_summary">Meminta akses root untuk proxy transparan</string>
+ <string name="status_install_success">Binary Tor berhasil dipasang!</string>
+ <string name="status_install_fail">File binary Tor tidak dapat dipasang. Silahkan periksa log dan beritahukan ke tor-assistants(a)torprojects.org</string>
+ <string name="title_error">Kesalahan Pada Aplikasi</string>
+ <string name="wizard_title">Orbot</string>
+ <string name="wizard_btn_tell_me_more">Tentang Orbot</string>
+ <string name="btn_next">Berikutnya</string>
+ <string name="btn_back">Kembali</string>
+ <string name="btn_finish">Selesai</string>
+ <string name="btn_okay">Oke</string>
+ <string name="btn_cancel">Batal</string>
+ <!--Welcome Wizard strings (DJH)-->
+ <string name="wizard_details">Beberapa Rincian Orbot</string>
+ <string name="wizard_permissions_root">Izin Diberikan</string>
+ <string name="wizard_permissions_stock">Perizinan Orbot</string>
+ <string name="wizard_premissions_msg_root">Baik sekali! Kami telah mendeteksi bahwa anda telah mengaktifkan perizinan root untuk Orbot. Kami akan menggunakan kekuatan ini secara bijak.</string>
+ <string name="wizard_permissions_msg_stock">Sementara itu tidak diperlukan, Orbot dapat menjadi tool yang lebih kuat jika perangkat anda memiliki akses root. Gunakan tombol dibawah untuk memberikan kekuatan super kepada Orbot!</string>
+ <string name="wizard_permissions_no_root">Jika anda tidak memiliki akses root atau tidak tahu tentang apa yang kita bicarakan, pastikan untuk menggunakan aplikasi yang dibuat untuk bekerja dengan Orbot.</string>
+ <string name="wizard_permissions_consent">Saya mengerti dan ingin melanjutkan tanpa Superuser</string>
+ <string name="wizard_permission_enable_root">Berikan Akses Root untuk Orbot</string>
+ <string name="wizard_configure">Konfigurasi Torifikasi</string>
+ <string name="wizard_configure_msg">Orbot memberikan pilihan kepada anda untuk mengerahkan semua trafik aplikasi melalui Tor ATAU untuk memilih aplikasi anda secara individu.</string>
+ <string name="wizard_configure_all">Proxy Semua Aplikasi Melalui Tor</string>
+ <string name="wizard_configure_select_apps">Pilih Individu Aplikasi untuk Tor</string>
+ <string name="wizard_tips_tricks">Orbot- Aplikasi teraktifkan</string>
+ <string name="wizard_tips_msg">Aplikasi dibawah ini dikembangkan untuk bekerja dengan Orbot. Klik pada setiap tombol untuk memasangnya sekarang, atau anda dapat menemukan mereka di lain waktu pada Google Play, website GuardianProject.info atau melalui F-Droid.org</string>
+ <string name="wizard_tips_otrchat">ChatSecure - Client instant messaging aman untuk Android</string>
+ <string name="wizard_tips_proxy">Pengaturan Proxy - Pelajari bagaimana mengkonfigurasikan aplikasi untuk bekerja dengan Orbot</string>
+ <string name="wizard_tips_duckgo">Aplikasi Mesin Pencari DuckDuckGo</string>
+
+ <string name="wizard_tips_twitter">Setel proxy Twitter ke host \"localhost\" dan port 8118</string>
+ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+ <string name="wizard_proxy_help_info">Pengaturan Proxy</string>
+ <string name="wizard_final">Orbot sudah siap!</string>
+ <!--END Welcome Wizard strings (DJH)-->
+ <string name="tor_check">Hal ini akan membuka peramban web anda ke https://check.torproject.org agar dapat melihat jika Orbot kemungkinan sudah dikonfigurasikan dan anda telah terhubung dengan Tor.</string>
+ <string name="pref_hs_group">Jasa Penyimpanan Rahasia</string>
+ <string name="pref_general_group">Umum</string>
+ <string name="pref_start_boot_title">Mulai Orbot saat Boot</string>
+ <string name="pref_start_boot_summary">Secara otomatis memulai Orbot dan menghubungkan dengan Tor ketika perangkat Android anda boot</string>
+ <!--New Wizard Strings-->
+ <!--Title Screen-->
+ <!--Warning screen-->
+ <string name="wizard_warning_title">Peringatan</string>
+ <!--Permissions screen-->
+ <string name="wizard_permissions_title">Perizinan</string>
+ <string name="wizard_permissions_root_msg1">Anda dapat secara opsional memberikan Orbot akses \'Superuser\' untuk mengaktifkan fitur lanjutan, seperti Transparan Proxying.</string>
+ <string name="wizard_permissions_root_msg2">Jika anda tidak ingin melakukan ini, mohon pastikan bahwa anda menggunakan aplikasi yang dibuat untuk dapat bekerja dengan Orbot.</string>
+ <!--TipsAndTricks screen-->
+ <string name="wizard_tips_title">Orbot-Aplikasi Teraktifkan</string>
+ <string name="wizard_tips_gibberbot">ChatSecure: Aplikasi obrolan aman dengan Enkripsi Off-the-Record</string>
+
+ <string name="wizard_tips_orweb">Orweb: Peramban dengan Peningkatan-privasi yang bekerja melalui Tor</string>
+
+ <string name="wizard_tips_play">Temukan semua aplikasi Guardian Project di Google Play</string>
+
+
+
+
+
+ <!--Transparent Proxy screen-->
+ <string name="wizard_transproxy_title">Transparan Proxying</string>
+ <string name="wizard_transproxy_msg">Hal ini akan memungkinkan aplikasi anda untuk secara otomatis berjalan melalui jaringan Tor tanpa konfigurasi apapun.</string>
+ <string name="wizard_transproxy_hint">(Tandai box ini jika anda tidak tahu apa yang kita bicarakan)</string>
+ <string name="wizard_transproxy_none">Tidak ada</string>
+ <string name="pref_transparent_tethering_title">Tor Tethering</string>
+ <string name="pref_transparent_tethering_summary">Mengaktifkan Transparan Proxying Tor untuk Wifi dan Perangkat Tether USB (diperlukan restart)</string>
+ <string name="button_grant_superuser">Meminta Akses Superuser</string>
+ <string name="pref_select_apps">Pilih Aplikasi</string>
+ <string name="pref_select_apps_summary">Pilih Aplikasi untuk Mengerahkan Melalui Tor</string>
+ <string name="pref_node_configuration">Konfigurasi Simpul</string>
+ <string name="pref_node_configuration_summary">Itu adalah pengaturan lanjutan yang dapat mengurangi anonimitas anda</string>
+ <string name="pref_entrance_node">Simpul Masuk</string>
+ <string name="pref_entrance_node_summary">Sidik jari, alias, negara dan alamat untuk loncatan pertama</string>
+ <string name="pref_entrance_node_dialog">Masukkan Simpul Masuk</string>
+ <string name="pref_proxy_title">Outbound Proxy Jaringan (Opsional)</string>
+ <string name="pref_proxy_type_title">Outbound Jenis Proxy</string>
+ <string name="pref_proxy_type_summary">Protokol yang digunakan untuk server proxy: HTTP, HTTPS, Socks4, Socks5</string>
+ <string name="pref_proxy_type_dialog">Masukkan Jenis Proxy</string>
+ <string name="pref_proxy_host_title">Outbound Host Proxy</string>
+ <string name="pref_proxy_host_summary">Nama host Server Proxy</string>
+ <string name="pref_proxy_host_dialog">Masukkan Host Proxy</string>
+ <string name="pref_proxy_port_title">Outbound Port Proxy</string>
+ <string name="pref_proxy_port_summary">Port Server Proxy</string>
+ <string name="pref_proxy_port_dialog">Masukkan port Proxy</string>
+ <string name="pref_proxy_username_title">Outbound Nama Pengguna Proxy</string>
+ <string name="pref_proxy_username_summary">Nama Pengguna Proxy (Opsional)</string>
+ <string name="pref_proxy_username_dialog">Masukkan Nama Pengguna Proxy</string>
+ <string name="pref_proxy_password_title">Outbound Sandi Proxy</string>
+ <string name="pref_proxy_password_summary">Sandi Proxy (Opsional)</string>
+ <string name="pref_proxy_password_dialog">Masukkan Sandi Proxy</string>
+ <string name="status">Status</string>
+ <string name="setting_up_full_transparent_proxying_">Menyetel transparan proxying penuh…</string>
+ <string name="setting_up_app_based_transparent_proxying_">Menyetel apl-berbasis proxying transparan…</string>
+ <string name="transparent_proxying_enabled">Proxying transparan DIAKTIFKAN</string>
+ <string name="transproxy_enabled_for_tethering_">TransProxy diaktifkan untuk Tethering!</string>
+ <string name="warning_error_starting_transparent_proxying_">PERINGATAN: kesalahan dalam memulai proxying transparan!</string>
+ <string name="transproxy_rules_cleared">Aturan TransProxy dibersihkan</string>
+ <string name="couldn_t_start_tor_process_">Tidak dapat memulai proses Tor:</string>
+ <string name="setting_up_port_based_transparent_proxying_">Menyetel proxying transparan berbasis-port…</string>
+ <string name="bridge_error">Kesalahan pada Bridge</string>
+ <string name="bridge_requires_ip">Agar dapat menggunakan fitur bridge, anda perlu memasukkan minimal satu alamat IP bridge.</string>
+ <string name="send_email_for_bridges">Kirimkan email ke bridges(a)torproject.org dengan baris \"get bridges\" dengan sendirinya dalam tubuh surat dari akun gmail.</string>
+ <string name="error">Kesalahan</string>
+ <string name="your_reachableaddresses_settings_caused_an_exception_">Pengaturan ReachableAddresses anda menyebabkan kesalahan!</string>
+ <string name="your_relay_settings_caused_an_exception_">Pengaturan relay anda menyebabkan kesalahan!</string>
+ <string name="exit_nodes">Node Keluar</string>
+ <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">fingerprints, nama, negara dan alamat untuk hop terakhir</string>
+ <string name="enter_exit_nodes">Memasuki Node Keluar</string>
+ <string name="exclude_nodes">Node pengecualian</string>
+ <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Pengecualian fingerprints,nama, negara dan alamat</string>
+ <string name="enter_exclude_nodes">Memasuki Node Pengecualian</string>
+ <string name="strict_nodes">Node Terlarang</string>
+ <string name="use_only_these_specified_nodes">Pakai *hanya* spesifik node</string>
+ <string name="bridges">Bridges</string>
+ <string name="use_bridges">Pakai Bridges</string>
+ <string name="bridges_obfuscated">Bridges Terobfuskasi</string>
+ <string name="enable_alternate_entrance_nodes_into_the_tor_network">Nyalakan alternatif node masuk ke dalam Tor Network</string>
+ <string name="enable_if_configured_bridges_are_obfuscated_bridges">Nyalakan jika pengaturan bridges adalah bridges terobfuskasi</string>
+ <string name="ip_address_and_port_of_bridges">Alamat IP dan port bridges</string>
+ <string name="enter_bridge_addresses">Memasuki Alamat Bridge</string>
+ <string name="relays">Relays</string>
+ <string name="relaying">Sedang me-Relay</string>
+ <string name="enable_your_device_to_be_a_non_exit_relay">Nyalakan perangkat anda menjadi non-exit relay</string>
+ <string name="relay_port">Port Relay</string>
+ <string name="listening_port_for_your_tor_relay">Port mendengarkan untuk TOR relay anda</string>
+ <string name="enter_or_port">Memasuki OR port</string>
+ <string name="relay_nickname">Nama Relay</string>
+ <string name="the_nickname_for_your_tor_relay">sebuah nama untuk Tor Relay anda</string>
+ <string name="enter_a_custom_relay_nickname">Masukkan nama relay</string>
+ <string name="reachable_addresses">Addresses Terjangkau</string>
+ <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Jalankan sebagai client dibalik firewall dengan ketentuan ketat</string>
+ <string name="reachable_ports">Ports terjangkau</string>
+ <string name="ports_reachable_behind_a_restrictive_firewall">Port terjangkau dibalik firewall ketat</string>
+ <string name="enter_ports">Memasuki ports</string>
+ <string name="enable_hidden_services">Layanan Penyimpanan Rahasia</string>
+ <string name="run_servers_accessible_via_the_tor_network">Membolehkan perangkat-nyala untuk diakses lewat Tor Network</string>
+ <string name="enter_localhost_ports_for_hidden_services">memasuki localhost port untuk layanan rahasia</string>
+ <string name="hidden_service_ports">Ports Layanan Rahasia</string>
+ <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">nama teralamatkan untuk layanan rahasia anda (otomatis dibuat)</string>
+ <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">nyalakan debug log untuk output (harus menggunakan adb atau aLogCat untuk menampilkan)</string>
+ <string name="project_home">Beranda Projek:</string>
+ <string name="the_tor_license">Lisensi Tor</string>
+ <string name="https_torproject_org">https://torproject.org</string>
+ <string name="third_party_software">Perangkat Lunak Pihak Ke-3:</string>
+ <string name="hidden_service_request">Sebuah aplikasi ingin membuka port %S server tersembunyi ke jaringan Tor. Hal ini aman jika anda mempercayai aplikasi tersebut.</string>
+ <string name="found_existing_tor_process">menemukan proses Tor yang ada…</string>
+ <string name="something_bad_happened">Sesuatu yang buruk terjadi. Periksa log</string>
+ <string name="hidden_service_on">layanan tersembunyi pada:</string>
+ <string name="unable_to_read_hidden_service_name">tidak dapat membaca nama layanan tersembunyi</string>
+ <string name="unable_to_start_tor">Tidak dapat memulai Tor:</string>
+ <string name="pref_use_sys_iptables_title">Gunakan Iptables Default</string>
+ <string name="pref_use_sys_iptables_summary">menggunakan binary iptables built-in daripada yang disertakan dengan Orbot</string>
+ <string name="error_installing_binares">Binary Tor tidak dapat dipasang atau ditingkatkan</string>
+ <string name="pref_use_persistent_notifications">Selalu pelihara icon dalam toolbar ketika Orbot terhubung</string>
+ <string name="pref_use_persistent_notifications_title">Pemberitahuan Selalu-Hidup</string>
+ <string name="notification_using_bridges">Bridge diaktifkan!</string>
+ <string name="default_bridges"></string>
+ <string name="set_locale_title">Setel Lokal</string>
+ <string name="set_locale_summary">Pilih lokal dan bahasa untuk Orbot</string>
+ <string name="wizard_locale_title">Pilih Bahasa</string>
+ <string name="wizard_locale_msg">Biarkan default atau berlaih ke bahasa saat ini</string>
+ <string name="btn_save_settings">Simpan Pengaturan</string>
+ <string name="no_internet_connection_tor">Tidak ada koneksi internet; Tor sedang standby…</string>
+ <string name="bandwidth_">Bandwidth:</string>
+ <string name="down">unduh</string>
+ <string name="up">unggah</string>
+ <string name="pref_disable_network_title">Auto-Tidur Tidak Ada Jaringan</string>
+ <string name="pref_disable_network_summary">Menempatkan Tor untuk tidur ketika tidak ada internet yang tersedia</string>
+ <string name="newnym">Anda telah beralih ke identitas Tor baru!</string>
+ <string name="menu_verify_browser">Periksa Peramban</string>
+ <string name="menu_use_chatsecure">Gunakan ChatSecure</string>
+ <string name="permission_manage_tor_label">Kelola Tor</string>
+ <string name="permission_manage_tor_description">Aktifkan aplikasi ini untuk mengontrol layanan Tor</string>
+ <string name="it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_">Sepertinya anda belum memasang Orweb. Perlu bantuan dengan itu, atau sebaiknya kami buka peramban?</string>
+ <string name="install_apps_">Pasang aplikasi?</string>
+</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
new file mode 100644
index 0000000..0db3188
--- /dev/null
+++ b/res/values-iw/strings.xml
@@ -0,0 +1,192 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+ <string name="app_name">Orbot</string>
+ <string name="internal_web_url">http://orbot/</string>
+ <string name="default_web_url">http://check.torproject.org</string>
+ <string name="secure_default_web_url">https://check.torproject.org</string>
+ <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
+ <string name="control_permission_label">התחל ועצור את Tor</string>
+ <string name="tor_proxy_service_process">שירות פרוקסי Tor</string>
+ <string name="status_starting_up">Orbot מתחיל…</string>
+ <string name="status_activated">מחובר לרשת Tor</string>
+ <string name="status_disabled">Orbot כבוי</string>
+ <string name="status_shutting_down">Orbot בתהליך כיבוי</string>
+ <string name="tor_process_starting">מתחיל לקוח Tor…</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>
+ <string name="menu_settings">הגדרות</string>
+ <string name="menu_log">רישום</string>
+ <string name="menu_info">עזרה</string>
+ <string name="menu_apps">אפליקציות</string>
+ <string name="menu_start">התחל</string>
+ <string name="menu_stop">עצור</string>
+ <string name="menu_about">אודות</string>
+ <string name="menu_wizard">אשף</string>
+ <string name="main_layout_download">הורדה</string>
+ <string name="main_layout_upload">העלאה</string>
+ <string name="button_help">עזרה</string>
+ <string name="button_close">סגור</string>
+ <string name="button_about">אודות</string>
+ <string name="button_clear_log">נקה רישום</string>
+ <string name="menu_verify">בדוק</string>
+ <string name="menu_exit">יציאה</string>
+ <string name="press_to_start">-נגיעה ארוכה להתחלה-</string>
+ <string name="pref_trans_proxy_group">פרוקסי שקוף (שורש נדרש)</string>
+ <string name="pref_trans_proxy_title">פרוקסי שקוף</string>
+ <string name="pref_trans_proxy_summary">עבודה אוטומטית עם אפליקציות דרך Tor</string>
+ <string name="pref_transparent_all_title">הכל דרך Tor</string>
+ <string name="pref_transparent_all_summary">תעבור דרך פרוקסי עבור כל האפליקציות דרך Tor</string>
+ <string name="pref_transparent_port_fallback_title">מפלט פורט פרוקסי</string>
+ <string name="pref_transparent_port_fallback_summary">אזהרה: עקוף פורטים נפוצים (80,443 וכו\'). *השתמש רק* אם האופנים \'All\' או \'App\' לא עובדים.</string>
+ <string name="pref_transparent_port_title">רשימת פורטים</string>
+ <string name="pref_transparent_port_summary">רשימת פורטים לפרוקסי. *השתמש רק* אם האופנים \'All\' או \'App\' לא עובדים.</string>
+ <string name="pref_transparent_port_dialog">הזן פורטים לפרוקסי</string>
+ <string name="pref_has_root">דרושה גישת שורש</string>
+ <string name="pref_has_root_summary">בקש גישה עליונה עבור שימוש בפרוקסי שקוף</string>
+ <string name="status_install_success">קבצים ברי הרצה של Tor הותקנו בהצלחה!</string>
+ <string name="status_install_fail">הקבצים ברי ההרצה של Tor לא ניתנו להתקנה. בבקשה בדוק את הלוג והודע ל
+tor-assistants(a)torproject.org</string>
+ <string name="title_error">שגיאת אפליקציה</string>
+ <string name="wizard_title">Orbot</string>
+ <string name="wizard_btn_tell_me_more">אודות Orbot</string>
+ <string name="btn_next">הבא</string>
+ <string name="btn_back">הקודם</string>
+ <string name="btn_finish">סיים</string>
+ <string name="btn_okay">אישור</string>
+ <string name="btn_cancel">ביטול</string>
+ <!--Welcome Wizard strings (DJH)-->
+ <string name="wizard_details">פרטים מסוימים של Orbot </string>
+ <string name="wizard_permissions_root">ניתנה הרשאה</string>
+ <string name="wizard_permissions_stock">הרשאות Orbot</string>
+ <string name="wizard_premissions_msg_root">מצוין! גילינו כי יש לך הרשאות שורש מאופשרות בשביל Orbot. אנחנו נשתמש בכוח הזה בחוכמה.</string>
+ <string name="wizard_permissions_msg_stock">בזמן שזה לא נדרש, Orbot יכולה להפוך להיות כלי חזק יותר אם למכשיר שלך יש גישה עליונה. תשתמש בכפתור למטה כדי לקבל כוחות על של Orbot !</string>
+ <string name="wizard_permissions_no_root">אם אין לך גישה עליונה או אין לך מושג על מה אנחנו מדברים, רק תוודא שתשתמש באפליקציות שנועדו לעבוד עם Orbot.</string>
+ <string name="wizard_permissions_consent">הבנתי ואני מעדיף להמשיך בלי Superuser</string>
+ <string name="wizard_permission_enable_root">אפשר גישת שורש עבור Orbot</string>
+ <string name="wizard_configure">הגדר עבודה באמצעות Tor</string>
+ <string name="wizard_configure_msg">Orbot נותנת לך אפשרות לכוון את כל תעבורת האפליקציות דרך Tor או לבחור את האפליקציות שלך בנפרד.</string>
+ <string name="wizard_configure_all">השתמש בפרוקסי בכל האפליקציות דרך Tor</string>
+ <string name="wizard_configure_select_apps">בחר אפליקציות מסוימות עבור Tor</string>
+ <string name="wizard_tips_tricks">Orbot מתאפשר על ידי אפליקציות</string>
+ <string name="wizard_tips_msg">האפליקציות מתחת פותחו לעבודה עם Orbot. לחץ על כל כפתור להתקנה מיידית, או שאתה יכול למצוא אותם אחר כך ב Google Play, באתר GuardianProject.info או
+דרך F-Droid.org</string>
+ <string name="wizard_tips_proxy">הגדרות פרוקסי - למד איך להגדיר אפליקציות לעבוד עם Orbot</string>
+ <string name="wizard_tips_duckgo">DuckDuckGo אפליקציית מנוע חיפוש</string>
+
+ <string name="wizard_tips_twitter">קבע פרוקסי Twitter למארח \"localhost\" ולפורט 8118</string>
+ <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
+ <string name="wizard_proxy_help_info">הגדרות פרוקסי</string>
+ <string name="wizard_final">Orbot מוכן!</string>
+ <!--END Welcome Wizard strings (DJH)-->
+ <string name="tor_check">דבר זה יוביל את דפדפן הרשת שלך למוד https://check.torproject.org כדי לראות אם Orbot הוגדרה כראוי וכן כי אתה מחובר לרשת Tor.</string>
+ <string name="pref_hs_group">איחסון שירותים נסתרים</string>
+ <string name="pref_general_group">כללי</string>
+ <string name="pref_start_boot_title">התחל את Orbot בהדלקת המכשיר</string>
+ <string name="pref_start_boot_summary">התחל את Orbot והתחבר לרשת Tor אוטומטית כאשר המכשיר נדלק</string>
+ <!--New Wizard Strings-->
+ <!--Title Screen-->
+ <!--Warning screen-->
+ <string name="wizard_warning_title">אזהרה</string>
+ <!--Permissions screen-->
+ <string name="wizard_permissions_title">הרשאות</string>
+ <string name="wizard_permissions_root_msg1">אתה יכול להעניק לאפליקציה Orbot גישת \'Superuser\' כדי לאפשר מאפיינים מתקדמים כמו למשל, פרוקסי שקוף.</string>
+ <string name="wizard_permissions_root_msg2">אם אתה לא רוצה לעשות את זה, אנא הקפד להשתמש באפליקציות שיועדו לעבוד עם Orbot</string>
+ <!--TipsAndTricks screen-->
+ <string name="wizard_tips_title">Orbot-יישומים מופעלים</string>
+ <string name="wizard_tips_gibberbot">ChatSecure: אפליקציית מסרים עם הצפנת Off-the-Record</string>
+ <string name="wizard_tips_orweb">Orweb- דפדפן עם פרטיות רבה שעובד דרך Tor</string>
+ <string name="wizard_tips_play">מצא את כל אפליציות Guardian Project אצל Google Play</string>
+
+
+
+
+
+ <!--Transparent Proxy screen-->
+ <string name="wizard_transproxy_title">פרוקסי שקוף</string>
+ <string name="wizard_transproxy_msg">זה מאפשר לאפליקציות שלך לרוץ באופן אוטומטי דרך רשת Tor ללא כל תצורה.</string>
+ <string name="wizard_transproxy_hint">(סמן תיבה זו אם אין לך מושג על מה אנחנו מדברים)</string>
+ <string name="wizard_transproxy_none">כלום</string>
+ <string name="pref_transparent_tethering_title">Tor Tethering</string>
+ <string name="pref_transparent_tethering_summary">מאפשר עבודה עם פרוקסי שקוף עבור רשת אלחוטית ומכשירי USB Tethered (דורש אתחול מחדש)</string>
+ <string name="button_grant_superuser">דרוש אישור Superuser</string>
+ <string name="pref_select_apps">בחר אפלקציות</string>
+ <string name="pref_select_apps_summary">בחר אפלקציות</string>
+ <string name="pref_node_configuration">הגדרות Node</string>
+ <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string>
+ <string name="pref_entrance_node">Entrance Nodes</string>
+ <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string>
+ <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string>
+ <string name="pref_proxy_type_title">Outbound Proxy Type</string>
+ <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי: HTTP, HTTPS, Socks4,Socks5</string>
+ <string name="pref_proxy_type_dialog">סוג הפרוקסי</string>
+ <string name="pref_proxy_host_title">מארח של Outbound Proxy</string>
+ <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string>
+ <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string>
+ <string name="pref_proxy_port_title">פורט של Outbound Proxy</string>
+ <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string>
+ <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string>
+ <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string>
+ <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string>
+ <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string>
+ <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string>
+ <string name="status">סטטוס</string>
+ <string name="setting_up_full_transparent_proxying_">הכנה של הפרוקסי השקוף…</string>
+ <string name="setting_up_app_based_transparent_proxying_">הכנה של הפרוקסי השקוף מבוסס אפליקציות…</string>
+ <string name="transparent_proxying_enabled">פרוקסי שקוף מאופשר</string>
+ <string name="transproxy_enabled_for_tethering_">פרוקסי שקוף מאופשר ל Tathering!</string>
+ <string name="warning_error_starting_transparent_proxying_">אזהרה: שגיאה התחילה את הפרוקסי השקוף!</string>
+ <string name="transproxy_rules_cleared">כללי TransProxy טוהרו</string>
+ <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string>
+ <string name="bridge_error">שגיאת גשר</string>
+ <string name="error">שגיאה</string>
+ <string name="exit_nodes">צמתי יציאה</string>
+ <string name="enter_exit_nodes">הזן צמתי יציאה</string>
+ <string name="exclude_nodes">צמתים מוצאים</string>
+ <string name="enter_exclude_nodes">הזן צמתים מוצאים</string>
+ <string name="strict_nodes">צמתים קפדנים</string>
+ <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string>
+ <string name="bridges">גשרים</string>
+ <string name="use_bridges">השתמש בגשרים</string>
+ <string name="bridges_obfuscated">גשרים מעורפלים</string>
+ <string name="ip_address_and_port_of_bridges">כתובת ה-IP ויציאה של הגשרים</string>
+ <string name="enter_bridge_addresses">הכנס כתובות גשר</string>
+ <string name="relays">ממסרים</string>
+ <string name="relaying">ממסור</string>
+ <string name="enter_or_port"> הכנס יציאת OR</string>
+ <string name="relay_nickname">כינוי הממסר</string>
+ <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string>
+ <string name="reachable_addresses">כתובות בהישג יד</string>
+ <string name="reachable_ports">פורטים בהישג יד</string>
+ <string name="enter_ports">הזן פורטים</string>
+ <string name="enable_hidden_services">אחסון שירותים נסתרים</string>
+ <string name="enter_localhost_ports_for_hidden_services">הזן פורטים של localhost עבור שירותים נסתרים</string>
+ <string name="hidden_service_ports">פורט השירותים הנסתרים</string>
+ <string name="the_tor_license">הרשיון של Tor</string>
+ <string name="https_torproject_org">https://torproject.org/</string>
+ <string name="third_party_software">תוכנה-צד-ג׳: </string>
+ <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string>
+ <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string>
+ <string name="hidden_service_on">שירות נסתר ב:</string>
+ <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string>
+ <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string>
+ <string name="pref_use_sys_iptables_title">השתמש בברירות המחדל של iptables</string>
+ <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string>
+ <string name="notification_using_bridges">גשרים מאופשרים!</string>
+ <string name="default_bridges"></string>
+ <string name="set_locale_title">קבע מקומיות</string>
+ <string name="set_locale_summary">בחר את המקומיות והשפה של Orbot</string>
+ <string name="wizard_locale_title">בחר שפה</string>
+ <string name="wizard_locale_msg">השאר ברירת מחדל או החלף לשפה הנוכחית</string>
+ <string name="btn_save_settings">שמירת הגדרות</string>
+ <string name="no_internet_connection_tor">אין חיבור אינטרנט; Tor מצוי בכוננות…</string>
+ <string name="bandwidth_">רוחב פס:</string>
+ <string name="newnym">החלפת אל זהות Tor חדשה!</string>
+ <string name="menu_verify_browser">בדוק דפדפן</string>
+ <string name="menu_use_chatsecure">הפעל את ChatSecure</string>
+ <string name="permission_manage_tor_label">נהל Tor</string>
+ <string name="permission_manage_tor_description">אפשר את אפליקציה זו כדי לשלוט בשירות Tor</string>
+ <string name="install_apps_">להתקין אפליקציה?</string>
+</resources>
diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java
index a721a45..786849a 100644
--- a/src/org/torproject/android/OrbotMainActivity.java
+++ b/src/org/torproject/android/OrbotMainActivity.java
@@ -567,6 +567,8 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
// Get intent, action and MIME type
Intent intent = getIntent();
String action = intent.getAction();
+ Log.e(TAG, "handleIntents " + action);
+
String type = intent.getType();
if (action == null)
@@ -1239,13 +1241,12 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon
}
-
if (autoStartFromIntent)
{
autoStartFromIntent = false;
finish();
+ Log.e(TAG, "autoStartFromIntent finish");
}
-
}
else if (torStatus == TorServiceConstants.STATUS_CONNECTING)
{
1
0

[orbot/master] convert app description to XLIFF to make translation management easier
by n8fr8@torproject.org 25 Jun '15
by n8fr8@torproject.org 25 Jun '15
25 Jun '15
commit 6352bd4753c1d32334a237b0f3718480a87843fe
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Tue Jun 9 21:31:46 2015 -0400
convert app description to XLIFF to make translation management easier
---
.tx/config | 13 ++++++++
description/source.xlf | 86 ++++++++++++++++++++++++++++++++++++++++++++++++
external/.tx/config | 15 ---------
3 files changed, 99 insertions(+), 15 deletions(-)
diff --git a/.tx/config b/.tx/config
index 44d0e0a..e5c960f 100644
--- a/.tx/config
+++ b/.tx/config
@@ -7,4 +7,17 @@ file_filter = res/values-<lang>/strings.xml
host = https://www.transifex.com
source_file = res/values/strings.xml
source_lang = en
+type = ANDROID
+[orbot.description]
+file_filter = description/<lang>.xlf
+host = https://www.transifex.com
+source_file = description/source.xlf
+source_lang = en
+type = XLIFF
+
+[orbot.olddescription]
+file_filter = releases/assets/<lang>-description.txt
+host = https://www.transifex.com
+source_file = releases/assets/description.txt
+source_lang = en
diff --git a/description/source.xlf b/description/source.xlf
new file mode 100644
index 0000000..86693ef
--- /dev/null
+++ b/description/source.xlf
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xliff version="1.2">
+ <file datatype="plaintext" original="source.xlf" source-language="en">
+ <header>
+ <note from="developer">Google places strick character limits on the various text fields in Google Play. The title is 30 characters, the short description is 80 characters, and the rest of the strings, which all go together in the description, are limited to 4000 characters.</note>
+ </header>
+ <body>
+ <trans-unit id="title" size-unit="char" maxwidth="30">
+ <source>Orbot</source>
+ <note from="developer">This is limited by Google to 30 characters</note>
+ </trans-unit>
+ <trans-unit id="shortdescription" size-unit="char" maxwidth="80">
+ <source>Protect your privacy with this proxy with Tor</source>
+ <note from="developer">This is limited by Google to 80 characters</note>
+ </trans-unit>
+ <trans-unit id="intro">
+ <source>Orbot is a free proxy app that empowers other apps to use the internet more securely. Orbot uses Tor to encrypt your Internet traffic and then hides it by bouncing through a series of computers around the world. Tor is free software and an open network that helps you defend against a form of network surveillance that threatens personal freedom and privacy, confidential business activities and relationships, and state security known as traffic analysis.</source>
+ </trans-unit>
+ <trans-unit id="intro2">
+ <source>Orbot is the only app that creates a truly private internet connection. As the New York Times writes, “when a communication arrives from Tor, you can never know where or whom it’s from.” Tor won the 2012 Electronic Frontier Foundation (EFF) Pioneer Award.</source>
+ </trans-unit>
+ <trans-unit id="intro2">
+ <source>ACCEPT NO SUBSTITUTES: Orbot is the safest way to use the Internet on Android. Period. Orbot bounces your encrypted traffic several times through computers around the world, instead of connecting you directly like VPNs and proxies. This process takes a little longer, but the strongest privacy and identity protection available is worth the wait.</source>
+ </trans-unit>
+ <trans-unit id="intro2">
+ <source>PRIVATE WEB SURFING: Use with Orweb, the most anonymous way to access any website, even if it’s normally blocked, monitored, or on the hidden web. Get Orweb: https://goo.gl/s3mLa</source>
+ </trans-unit>
+ <trans-unit id="intro2">
+ <source>PRIVATE CHAT MESSAGING: Use Gibberbot with Orbot to chat confidentially with anyone, anywhere for free. Get Gibberbot: https://goo.gl/O3FfS</source>
+ </trans-unit>
+ <trans-unit id="intro2">
+ <source>PRIVACY FOR APPS: Any installed app can use Tor if it has a proxy feature, using the settings found here: https://goo.gl/2OA1y Use Orbot with Twitter, or try private web searching with DuckDuckGo: https://goo.gl/lgh1p</source>
+ </trans-unit>
+ <trans-unit id="intro2">
+ <source>PRIVACY FOR EVERYONE: Tor can help you confidentially research a competitor, get around the Facebook block at school, or circumvent a firewall to watch sports at work.
+PRIVACY MADE EASY: Check out our fun, interactive walkthrough: https://guardianproject.info/howto/browsefreely
+IT’S OFFICIAL: This is the official version of the Tor onion routing service for Android.</source>
+ </trans-unit>
+ <trans-unit id="expertrootmode">
+ <source>***Expert Root Mode***</source>
+ </trans-unit>
+ <trans-unit id="universalmode">
+ <source>UNIVERSAL MODE: Orbot can be configured to transparently proxy all of your Internet traffic through Tor. You can also choose which specific apps you want to use through Tor.</source>
+ </trans-unit>
+ <trans-unit id="wespeakyourlanguage">
+ <source>★ WE SPEAK YOUR LANGUAGE: Orbot is available for friends who speak:</source>
+ </trans-unit>
+ <trans-unit id="languagelist" translate="no">
+ <source>العربية, azərbaycanca, български, català, Čeština, dansk, Deutsch, Ελληνικά, English, español, eesti, euskara, فارسی, suomi, français, galego, hrvatski, magyar, עברית, íslenska, italiano, 日本語, 한국어, lietuvių, latviešu, Македонци, Bahasa Melayu, Nederlands, norsk, polski, português, Русский, slovenčina, slovenščina, српски, svenska, Türkçe, українська, Tagalog, Tiếng Việt, 中文(简体), 中文(台灣)</source>
+ <note from="developer">Do not translate the names of the languages, leave them just like this.</note>
+ </trans-unit>
+ <trans-unit id="helptranslate">
+ <source>Don’t see your language? Join us and help translate the app:</source>
+ </trans-unit>
+ <trans-unit id="helptranslateurl" translate="no">
+ <source>https://www.transifex.com/projects/p/orbot</source>
+ <note from="developer">Do not translate this.</note>
+ </trans-unit>
+ <trans-unit id="learnmore">
+ <source>***Learn More***</source>
+ </trans-unit>
+ <trans-unit id="aboutus">
+ <source>★ ABOUT US: Guardian Project is a group of developers that make secure mobile apps and open-source code for a better tomorrow</source>
+ </trans-unit>
+ <trans-unit id="ourwebsite">
+ <source>★ OUR WEBSITE: https://GuardianProject.info</source>
+ </trans-unit>
+ <trans-unit id="abouttor">
+ <source>★ ABOUT TOR: https://TorProject.org</source>
+ </trans-unit>
+ <trans-unit id="ontwitter">
+ <source>★ ON TWITTER: https://twitter.com/guardianproject</source>
+ </trans-unit>
+ <trans-unit id="freesoftware">
+ <source>★ FREE SOFTWARE: Orbot is free software. Take a look at our source code, or join the community to make it better:</source>
+ </trans-unit>
+ <trans-unit id="gitrepo" translate="no">
+ <source>https://gitweb.torproject.org/orbot.git</source>
+ <note from="developer">Do not translate this.</note>
+ </trans-unit>
+ <trans-unit id="messageus">
+ <source>★ MESSAGE US: Are we missing your favorite feature? Found an annoying bug? Please tell us! We’d love to hear from you. Send us an email: support(a)guardianproject.info or find us in our chat room https://guardianproject.info/contact</source>
+ </trans-unit>
+ </body>
+ </file>
+</xliff>
\ No newline at end of file
diff --git a/external/.tx/config b/external/.tx/config
deleted file mode 100644
index 8f5c518..0000000
--- a/external/.tx/config
+++ /dev/null
@@ -1,15 +0,0 @@
-[main]
-host = https://www.transifex.com
-lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT:
es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: tl-rPH, fil: tl, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, he_IL: he-rIL, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-r
BN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_
CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA
-
-[orbot.stringsxml]
-file_filter = ../res/values-<lang>/strings.xml
-host = https://www.transifex.com
-source_file = ../res/values/strings.xml
-source_lang = en
-
-[orbot.description]
-file_filter = ../releases/assets/<lang>-description.txt
-host = https://www.transifex.com
-source_file = ../releases/assets/description.txt
-source_lang = en
1
0
commit 96b5d90ed11a52ceb6b78dec7d467fb0b888f88f
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Mon Jun 8 12:24:21 2015 -0400
remove empty translations
---
res/values-bn-rBD/strings.xml | 16 ----------------
res/values-de-rAT/strings.xml | 16 ----------------
res/values-hi/strings.xml | 27 ---------------------------
res/values-hy-rAM/strings.xml | 16 ----------------
res/values-kn-rIN/strings.xml | 16 ----------------
res/values-kn/strings.xml | 18 ------------------
res/values-ml/strings.xml | 16 ----------------
res/values-mn-rMN/strings.xml | 16 ----------------
res/values-sn/strings.xml | 26 --------------------------
res/values-ta/strings.xml | 16 ----------------
10 files changed, 183 deletions(-)
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-bn-rBD/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-de-rAT/strings.xml b/res/values-de-rAT/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-de-rAT/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
deleted file mode 100644
index 67d29c1..0000000
--- a/res/values-hi/strings.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <string name="menu_browse">ब्राउज़</string>
- <string name="menu_settings">सेटिंग्स</string>
- <string name="menu_info">मदद</string>
- <string name="button_help">मदद</string>
- <string name="button_close">बंद करें </string>
- <string name="btn_back">वापस</string>
- <string name="btn_cancel">रद्द करें </string>
- <!--Welcome Wizard strings (DJH)-->
- <string name="wizard_proxy_help_info">प्रोक्सी सेटींग</string>
- <!--END Welcome Wizard strings (DJH)-->
- <string name="pref_general_group">समन्य </string>
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="wizard_transproxy_none">कोई नहीं</string>
- <string name="status">स्थिति</string>
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-hy-rAM/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
deleted file mode 100644
index f7b900f..0000000
--- a/res/values-kn/strings.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <!--<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="default_bridges"></string>
-</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-ml/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-mn-rMN/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-sn/strings.xml b/res/values-sn/strings.xml
deleted file mode 100644
index 39b2be8..0000000
--- a/res/values-sn/strings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <string name="app_name">Orbot</string>
- <string name="default_web_url">http://check.torproject.org</string>
- <string name="secure_default_web_url">https://check.torproject.org</string>
- <string name="tor_check_api_url">https://check.torproject.org/?TorButton=true</string>
- <string name="menu_settings">Zvamada</string>
- <string name="menu_about">Maererano</string>
- <string name="button_about">Maererano</string>
- <string name="menu_exit">Buda</string>
- <string name="wizard_btn_tell_me_more">Maererano Orbot</string>
- <!--Welcome Wizard strings (DJH)-->
- <string name="wizard_proxy_help_info">Proxy Zvamada</string>
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
deleted file mode 100644
index 47b2a08..0000000
--- a/res/values-ta/strings.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<resources>
- <!--Welcome Wizard strings (DJH)-->
- <!--END Welcome Wizard strings (DJH)-->
- <!--New Wizard Strings-->
- <!--Title Screen-->
- <!--Warning screen-->
- <!--Permissions screen-->
- <!--TipsAndTricks screen-->
-
-
-
-
- <!--Transparent Proxy screen-->
- <string name="default_bridges"></string>
-</resources>
1
0

25 Jun '15
commit 6e13a7e369a8a33ed14602672872e5445a3bd01c
Author: Hans-Christoph Steiner <hans(a)eds.org>
Date: Mon Jun 8 20:43:02 2015 -0400
purge dead and unused code from TorService
---
src/org/torproject/android/service/TorService.java | 94 +-------------------
1 file changed, 2 insertions(+), 92 deletions(-)
diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java
index 23801f3..38b4bd3 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -146,7 +146,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private boolean mUseVPN = false;
boolean mIsLollipop = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
-
private ExecutorService mExecutor = Executors.newFixedThreadPool(1);
private NumberFormat mNumberFormat = null;
@@ -210,7 +209,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
else
return false;
}
-
/* (non-Javadoc)
* @see android.app.Service#onLowMemory()
@@ -223,10 +221,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
}
- public String getTorStatus() {
- return mCurrentStatus;
- }
-
private void clearNotifications ()
{
if (mNotificationManager != null)
@@ -235,7 +229,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
hmBuiltNodes.clear();
mNotificationShowing = false;
-
}
@SuppressLint("NewApi")
@@ -280,27 +273,21 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
mNotification = mNotifyBuilder.build();
if (Build.VERSION.SDK_INT >= 16 && mShowExpandedNotifications) {
-
-
// Create remote view that needs to be set as bigContentView for the notification.
RemoteViews expandedView = new RemoteViews(this.getPackageName(),
R.layout.layout_notification_expanded);
StringBuffer sbInfo = new StringBuffer();
-
if (notifyType == NOTIFY_ID)
expandedView.setTextViewText(R.id.text, notifyMsg);
else
{
expandedView.setTextViewText(R.id.info, notifyMsg);
-
}
if (hmBuiltNodes.size() > 0)
{
- //sbInfo.append(getString(R.string.your_tor_public_ips_) + '\n ');
-
Set<String> itBuiltNodes = hmBuiltNodes.keySet();
for (String key : itBuiltNodes)
{
@@ -626,7 +613,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
}
-
initBinariesAndDirectories();
updateSettings();
@@ -1107,11 +1093,8 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
private int initControlConnection (int maxTries, boolean isReconnect) throws Exception, RuntimeException
{
- int i = 0;
int controlPort = -1;
-
int attempt = 0;
-
logNotice( "Waiting for control port...");
@@ -1148,9 +1131,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
// logNotice("waiting...");
Thread.sleep(1000); }
catch (Exception e){}
-
-
-
}
if (conn != null)
@@ -1332,45 +1312,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
return result;
}
-
- /*
- private void getTorStatus () throws IOException
- {
- try
- {
-
- if (conn != null)
- {
- // get a single value.
-
- // get several values
-
- if (mCurrentStatus == STATUS_CONNECTING)
- {
- //Map vals = conn.getInfo(Arrays.asList(new String[]{
- // "status/bootstrap-phase", "status","version"}));
-
- String bsPhase = conn.getInfo("status/bootstrap-phase");
- Log.d(TAG, "bootstrap-phase: " + bsPhase);
-
-
- }
- else
- {
- // String status = conn.getInfo("status/circuit-established");
- // Log.d(TAG, "status/circuit-established=" + status);
- }
- }
- }
- catch (Exception e)
- {
- Log.d(TAG, "Unable to get Tor status from control port");
- mCurrentStatus = STATUS_UNAVAILABLE;
- }
-
- }*/
-
-
+
public void addEventHandler () throws Exception
{
// We extend NullEventHandler so that we don't need to provide empty
@@ -1386,9 +1328,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
// "DEBUG", "INFO", "NOTICE", "WARN", "ERR"}));
logNotice( "SUCCESS added control port event handler");
-
-
-
}
/**
@@ -1406,7 +1345,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
return mPortSOCKS;
}
-
public void setTorProfile(String newState) {
if (newState == STATUS_ON)
@@ -2473,7 +2411,6 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
}
-
if (mUseVPN)
{
extraLines.append("DNSListenAddress" + ' ' + "10.0.0.1:" + TorServiceConstants.TOR_DNS_PORT_DEFAULT).append('\n');
@@ -2492,34 +2429,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
}
return new String(out);
}
-
- /*
- private void enableSocks (String socks, boolean safeSocks) throws RemoteException
- {
- updateConfiguration("SOCKSPort", socks, false);
- updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false);
- updateConfiguration("TestSocks", "1", false);
- updateConfiguration("WarnUnsafeSocks", "1", false);
- saveConfiguration();
-
- }
-
- private void enableTransProxyAndDNSPorts (String transPort, String dnsPort) throws RemoteException
- {
- logMessage ("Transparent Proxying: enabling port...");
-
- updateConfiguration("TransPort",transPort,false);
- updateConfiguration("DNSPort",dnsPort,false);
- updateConfiguration("VirtualAddrNetwork","10.192.0.0/10",false);
- updateConfiguration("AutomapHostsOnResolve","1",false);
- saveConfiguration();
- }*/
-
- private void blockPlaintextPorts (String portList) throws RemoteException
- {
- updateConfiguration("RejectPlaintextPorts",portList,false);
- }
-
+
//using Google DNS for now as the public DNS server
private String writeDNSFile () throws IOException
{
1
0