[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [orbot/master] Merge branch 'weblate-guardianproject-orbot' of https://github.com/weblate/orbot into weblate-weblate-guardianproject-orbot



commit cadeee4b3330acc956b8114dff45f5205ad3a36d
Merge: 589df2a9 c3ff9b75
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Thu Jun 17 17:19:12 2021 -0400

    Merge branch 'weblate-guardianproject-orbot' of https://github.com/weblate/orbot into weblate-weblate-guardianproject-orbot

 app/src/main/res/values-de/strings.xml     |  50 +++++--
 app/src/main/res/values-fr-rFR/strings.xml |   2 +-
 app/src/main/res/values-in/strings.xml     | 211 ++++++++++++++++-------------
 app/src/main/res/values-iw/strings.xml     | 150 ++++++++++----------
 app/src/main/res/values-ms-rMY/strings.xml | 151 +++++++++++----------
 app/src/main/res/values-pt-rBR/strings.xml |   2 +-
 app/src/main/res/values-tr/strings.xml     |   2 +-
 app/src/main/res/values-uk/strings.xml     |   2 +-
 app/src/main/res/values-zh-rCN/strings.xml |   2 +-
 fastlane/metadata/android/id/video.txt     |   2 +-
 10 files changed, 316 insertions(+), 258 deletions(-)

diff --cc app/src/main/res/values-iw/strings.xml
index 89a9abdd,4b884160..e5b6b509
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@@ -30,66 -30,72 +30,72 @@@
      <!--TipsAndTricks screen-->
      <!--Transparent Proxy screen-->
      <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_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_title">ש×? ×?שת×?ש ש×? Outbound Proxy</string>
-   <string name="pref_proxy_username_summary">ש×? ×?שת×?ש פר×?קס×? (רש×?ת)</string>
-   <string name="pref_proxy_username_dialog">×?×?×? ש×? ×?שת×?ש פר×?קס×?</string>
-   <string name="pref_proxy_password_title">ס×?ס×?×? ש×? Outbound Proxy</string>
-   <string name="pref_proxy_password_summary">ס×?ס×?ת פר×?קס×? (רש×?ת)</string>
-   <string name="pref_proxy_password_dialog">×?×?×? ס×?ס×?ת פר×?קס×?</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_title">ש×? ×?שת×?ש ש×? Outbound Proxy</string>
+     <string name="pref_proxy_username_summary">ש×? ×?שת×?ש פר×?קס×? (רש×?ת)</string>
+     <string name="pref_proxy_username_dialog">×?×?×? ש×? ×?שת×?ש פר×?קס×?</string>
+     <string name="pref_proxy_password_title">ס×?ס×?×? ש×? Outbound Proxy</string>
+     <string name="pref_proxy_password_summary">ס×?ס×?ת פר×?קס×? (רש×?ת)</string>
+     <string name="pref_proxy_password_dialog">×?×?×? ס×?ס×?ת פר×?קס×?</string>
      <string name="couldn_t_start_tor_process_">×?×?×? ×?פשר×?ת ×?×?ת×?×?×? ת×?×?×?×? Tor:</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="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 relay</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="reachable_ports">פ×?ר×?×?×? ×?×?×?ש×? ×?×?</string>
-   <string name="enter_ports">×?×?×? פ×?ר×?×?×?</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="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 relay</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="reachable_ports">פ×?ר×?×?×? ×?×?×?ש×? ×?×?</string>
+     <string name="enter_ports">×?×?×? פ×?ר×?×?×?</string>
      <string name="project_home">×?תר×? ×?פר×?×?ק×?:</string>
-   <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</string>
+     <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/orbot/</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="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="found_existing_tor_process">× ×?צ×? ת×?×?×?×? Tor ק×?×?×?â?¦</string>
-   <string name="something_bad_happened">×?ש×?×? רע ×?תר×?ש. ×?×?×?ק ×?ת ×?×?×?×?×?</string>
+     <string name="something_bad_happened">×?ש×?×? רע ×?תר×?ש. ×?×?×?ק ×?ת ×?×?×?×?×?</string>
      <string name="unable_to_read_hidden_service_name">×?×? ×?ס×?×?×? ×?קר×?×? ש×? ש×?ר×?ת נסתר</string>
-   <string name="unable_to_start_tor">×?×? ×?ס×?×?×? ×?×?ת×?×?×? ×?ת Tor:</string>
+     <string name="unable_to_start_tor">×?×? ×?ס×?×?×? ×?×?ת×?×?×? ×?ת Tor:</string>
      <string name="pref_use_persistent_notifications">×?ש×?×?ר ת×?×?×? ×?ת ×?×?×?ק×?×? ×?סר×?×? ×?×?×?×? ×?ש×?×?ר×?×?×? ×?×?×?×?ר</string>
      <string name="set_locale_title">שפ×?</string>
-   <string name="pref_disable_network_summary">×?×?×? ×?ת Tor ×?×?שר ×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?</string>
-   <string name="newnym">×?×?×?פת ×?×? ×?×?×?ת Tor ×?×?ש×?!</string>
-   <string name="updating_settings_in_tor_service">×?×¢×?×?×? ×?×?×?ר×?ת Tor ×?×?×?ש×?ר</string>
-   <string name="pref_socks_title">Tor SOCKS</string>
-   <string name="pref_socks_dialog">×?×?×?ר×?ת SOCKS Port </string>
-   <string name="pref_transport_title">Tor TransProxy Port</string>
-   <string name="pref_transport_dialog">×?×?×?רת ×?פ×?ר×? ש×? TransProxy</string>
-   <string name="pref_dnsport_title">Tor DNS Port</string>
+     <string name="pref_disable_network_summary">×?×?×? ×?ת Tor ×?×?שר ×?×?×? ×?×?×?×?ר ×?×?×?× ×?רנ×?</string>
+     <string name="newnym">×?×?×?פת ×?×? ×?×?×?ת Tor ×?×?ש×?!</string>
+     <string name="updating_settings_in_tor_service">×?×¢×?×?×? ×?×?×?ר×?ת Tor ×?×?×?ש×?ר</string>
+     <string name="pref_socks_title">Tor SOCKS</string>
+     <string name="pref_socks_dialog">×?×?×?ר×?ת SOCKS Port </string>
+     <string name="pref_transport_title">Tor TransProxy Port</string>
+     <string name="pref_transport_dialog">×?×?×?רת ×?פ×?ר×? ש×? TransProxy</string>
+     <string name="pref_dnsport_title">Tor DNS Port</string>
      <string name="get_bridges_email">×?×?×?\"×?</string>
-   <string name="send_email">ש×?×? ×?×?×?\"×?</string>
+     <string name="send_email">ש×?×? ×?×?×?\"×?</string>
+     <string name="your_relay_settings_caused_an_exception_">×?×?×?ר×?ת ×?×?×?סר ש×?×? ×?ר×?×? ×?תק×?×?!</string>
+     <string name="your_reachableaddresses_settings_caused_an_exception_">×?×?×?ר×?ת ×?×?ת×?×?ת ×?× ×?×?ש×? ש×?×? ×?ר×?×? ×?תק×?×?!</string>
+     <string name="pref_proxy_title">×?ת×?×?×? רשת ×?×?צ×?×?×? (רש×?ת)</string>
+     <string name="pref_allow_background_starts_summary">×?×?פשר ×?×?×? ×?×?ש×?×?×?×? ×?×?פע×?×? ×?ת Tor ×?×?ת ×?ש×?ר×?ת×?×? ×?קש×?ר×?×?</string>
+     <string name="pref_allow_background_starts_title">×?×?פשר ×?פע×?×?ת ×?רקע</string>
+     <string name="status_shutting_down">ש×?ר×?ת Tor × ×?×?×?</string>
 -</resources>
 +</resources>



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits