- tor-commits - lists.torproject.org

[orbot/master] this should be kbps in fact
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit ba835599f7cfafae78663878217a1696d32b2500 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 15:45:29 2016 -0500 this should be kbps in fact --- src/org/torproject/android/service/TorService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 73f3f95..47add0e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1333,13 +1333,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon private String formatCount(long count) { // Converts the supplied argument into a string. + // Under 2Mb, returns "xxx.xKb" // Over 2Mb, returns "xxx.xxMb" if (mNumberFormat != null) if (count < 1e6) - return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "Kbps"; + return mNumberFormat.format(Math.round((float)((int)(count*10/1024))/10)) + "kbps"; else - return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "Mbps"; + return mNumberFormat.format(Math.round((float)((int)(count*100/1024/1024))/100)) + "mbps"; else return "";

1 0

[orbot/master] tweak the string about bridges a little bit
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit c235e3ed6bcb7737839523cd75ec7a25acb1b53d Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 22:12:31 2016 -0500 tweak the string about bridges a little bit --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 7f1d349..9f6431d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -312,7 +312,7 @@ <string name="menu_qr">QR Codes</string> - <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Tor Bridge to access the network.\n\nPlease select one of the bridge types above to enable this feature.</string> + <string name="if_your_mobile_network_actively_blocks_tor_you_can_use_a_tor_bridge_to_access_the_network_another_way_to_get_bridges_is_to_send_an_email_to_bridges_torproject_org_please_note_that_you_must_send_the_email_using_an_address_from_one_of_the_following_email_providers_riseup_gmail_or_yahoo_">If your mobile network actively blocks Tor, you can use a Bridge to access the network. SELECT one of the bridge types above to enable bridges.</string> <string name="bridge_mode">Bridge Mode</string>

1 0

[orbot/master] choose up to 2 bridges from default list randomly
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 2a728140b43bdf5ca8a19e6236f585741700d5bc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 22:09:26 2016 -0500 choose up to 2 bridges from default list randomly --- assets/bridges.txt | 2 +- src/org/torproject/android/OrbotMainActivity.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/assets/bridges.txt b/assets/bridges.txt index 06472cf..693c3be 100644 --- a/assets/bridges.txt +++ b/assets/bridges.txt @@ -11,4 +11,4 @@ obfs4 104.131.108.182:56880 EF577C30B9F788B0E1801CF7E433B3B77792B77A cert=0SFhfD obfs4 109.105.109.147:13764 BBB28DF0F201E706BE564EFE690FE9577DD8386D cert=KfMQN/tNMFdda61hMgpiMI7pbwU1T+wxjTulYnfw+4sgvG0zSH7N7fwT10BI8MUdAD7iJA iat-mode=0 meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com +meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com \ No newline at end of file diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index ae9a8dc..4165a21 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -1410,15 +1410,26 @@ public class OrbotMainActivity extends AppCompatActivity long seed = System.nanoTime(); Collections.shuffle(alBridges, new Random(seed)); + //let's just pull up to 2 bridges from the defaults at time + int maxBridges = 2; + int bridgeCount = 0; + //now go through the list to find the bridges we want for (Bridge b : alBridges) { if (b.type.equals(type)) { + sbConfig.append(b.type); sbConfig.append(' '); - sbConfig.append(b.config); - sbConfig.append('\n'); + sbConfig.append(b.config); + + bridgeCount++; + + if (bridgeCount == maxBridges) + break; + else + sbConfig.append("\n"); } }

1 0

[orbot/master] make bridge allocation shuffle randomly to distribute load
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 1dbe5eac55f79d48ed3a69c6d19d1962f5a764b3 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 15:45:36 2016 -0500 make bridge allocation shuffle randomly to distribute load inspired by this work: https://trac.torproject.org/projects/tor/ticket/18113 we don't want all users to start with the same bridges in the same order --- src/org/torproject/android/OrbotMainActivity.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e020dc2..ae9a8dc 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -10,7 +10,9 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.Locale; +import java.util.Random; import java.util.StringTokenizer; import org.json.JSONArray; @@ -1384,7 +1386,7 @@ public class OrbotMainActivity extends AppCompatActivity while(st.hasMoreTokens()) sbConfig.append(st.nextToken()).append(' '); - b.config = sbConfig.toString(); + b.config = sbConfig.toString().trim(); alBridges.add(b); @@ -1404,6 +1406,11 @@ public class OrbotMainActivity extends AppCompatActivity { StringBuffer sbConfig = new StringBuffer (); + //we should randomly sort alBridges so we don't have the same bridge order each time + long seed = System.nanoTime(); + Collections.shuffle(alBridges, new Random(seed)); + + //now go through the list to find the bridges we want for (Bridge b : alBridges) { if (b.type.equals(type))

1 0

[orbot/master] 15.1.0-RC-4
by n8fr8＠torproject.org 26 Jan '16

26 Jan '16

commit 80491ea95bd62346bf3f3a579d3302dbd84f4ca9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 25 22:13:12 2016 -0500 15.1.0-RC-4 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 125af0d..d31c227 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="15.1.0-RC-3" - android:versionCode="15100023" + android:versionName="15.1.0-RC-4" + android:versionCode="15100024" android:installLocation="auto" >

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 09ba0cdb2c77556ffaeea289ac3af44f1a660bb2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 21:45:42 2016 +0000 Update translations for tor-launcher-network-settings_completed --- nb/network-settings.dtd | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 567ca39..9876485 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -13,26 +13,32 @@ <!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> <!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy."> -<!ENTITY torSettings.configurePrompt2 "Jeg trenger å konfigurere en bro eller lokale mellomtjener innstillinger."> +<!ENTITY torSettings.configurePrompt2 "Jeg trenger å konfigurere bro eller lokal proxy-innstillinger før jeg kobler til Tor nettverket."> <!ENTITY torSettings.configure "Konfigurer"> -<!ENTITY torSettings.connectPrompt2 "Jeg vil koble direkte til Tor-nettverket."> +<!ENTITY torSettings.connectPrompt2 "Jeg ønsker å gjøre en direkte forbindelse til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner."> <!ENTITY torSettings.connect "Koble til"> <!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfigurasjon"> <!ENTITY torSettings.proxyQuestion "Trenger denne maskinen å bruke en lokal mellomtjener for å nå Internett?">  -<!ENTITY torSettings.proxyHelp "Dersom du er usikker på hvordan du skal svare på dette spørsmålet, sjekk Internett innstillingene i en annen nettleser for å se om den er konfigurert til å bruke en lokal mellomtjener."> +<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfeller en lokal proxy ikke er nødvendig, men det kan være nødvendig når du kobler gjennom et firma, skole eller universitet nettverk."> +<!ENTITY torSettings.proxyExplanation2 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, se på Internett-innstillingene i en annen nettleser eller sjekk nettverksinnstillingene systemets å se om en lokal proxy er nødvendig."> <!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene."> <!ENTITY torSettings.bridgePageTitle "Oppsett av Tor-broer."> <!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandøren (ISP) din tilkoblinger til Tor-nettverket?"> -<!ENTITY torSettings.bridgeHelp "Hvis du er usikker på hva du skal svare på dette spørsmålet, velg Nei.  Hvis du velger Ja, vil du bli bedt om å konfigurere Tor-broer, som er ulistede reléer som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> +<!ENTITY torSettings.bridgeExplanation1 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, velg Nei (hvis du ikke klarer å koble til Tor nettverket uten en bro, kan du legge til en senere)."> +<!ENTITY torSettings.bridgeExplanation2 "Hvis du velger Ja, vil du bli bedt om å konfigurere Tor Bridges, som er unoterte releer som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">  <!ENTITY torsettings.startingTor "Venter på at Tor skal starte..."> <!ENTITY torsettings.restartTor "Omstart av Tor"> +<!ENTITY torsettings.reconfigTor "Rekonfigurer"> + +<!ENTITY torsettings.discardSettings.prompt "Du har konfigurert Tor broer eller du har angitt lokale proxy-innstillinger.   For å gjøre en direkte forbindelse til Tor-nettverket, må disse innstillingene fjernes."> +<!ENTITY torsettings.discardSettings.proceed "Fjern Innstillinger og koble"> <!ENTITY torsettings.optional "Valgfritt"> @@ -50,6 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Tillatte Porter:"> <!ENTITY torsettings.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket"> <!ENTITY torsettings.useBridges.default "Koble til med angitte broer"> +<!ENTITY torsettings.useBridges.note "Hver type bro bruker en annen metode for å unngå sensur.  Hvis en bro ikke virker, prøv på nytt med en annen."> <!ENTITY torsettings.useBridges.type "Tilkoblingstype:"> <!ENTITY torsettings.useBridges.custom "Angi egendefinerte broer"> <!ENTITY torsettings.useBridges.label "Angi én eller flere bro-reléer (én per linje).">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit b1812188cec0c66d923b91b18c84d06cc3d1f07f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 21:45:38 2016 +0000 Update translations for tor-launcher-network-settings --- nb/network-settings.dtd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd index 802253c..9876485 100644 --- a/nb/network-settings.dtd +++ b/nb/network-settings.dtd @@ -13,32 +13,32 @@ <!ENTITY torSettings.firstQuestion "Hvilket av følgende beskriver best din situasjon?"> <!ENTITY torSettings.configurePrompt1 "Computeren's internett tilkobling er sensurert eller under proxy."> -<!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> +<!ENTITY torSettings.configurePrompt2 "Jeg trenger å konfigurere bro eller lokal proxy-innstillinger før jeg kobler til Tor nettverket."> <!ENTITY torSettings.configure "Konfigurer"> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Jeg ønsker å gjøre en direkte forbindelse til Tor-nettverket."> <!ENTITY torSettings.connectPrompt3 "Dette vil fungere i de fleste situasjoner."> <!ENTITY torSettings.connect "Koble til"> <!ENTITY torSettings.proxyPageTitle "Lokal proxy-konfigurasjon"> <!ENTITY torSettings.proxyQuestion "Trenger denne maskinen å bruke en lokal mellomtjener for å nå Internett?">  -<!ENTITY torSettings.proxyExplanation1 "In most cases a local proxy is not needed, but it may be required when connecting through a company, school, or university network."> -<!ENTITY torSettings.proxyExplanation2 "If you are not sure how to answer this question, look at the Internet settings in another browser or check your system's network settings to see whether a local proxy is needed."> +<!ENTITY torSettings.proxyExplanation1 "I de fleste tilfeller en lokal proxy ikke er nødvendig, men det kan være nødvendig når du kobler gjennom et firma, skole eller universitet nettverk."> +<!ENTITY torSettings.proxyExplanation2 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, se på Internett-innstillingene i en annen nettleser eller sjekk nettverksinnstillingene systemets å se om en lokal proxy er nødvendig."> <!ENTITY torSettings.enterProxy "Skriv inn proxy-innstillingene."> <!ENTITY torSettings.bridgePageTitle "Oppsett av Tor-broer."> <!ENTITY torSettings.bridgeQuestion "Blokkerer eller sensurerer internettleverandøren (ISP) din tilkoblinger til Tor-nettverket?"> -<!ENTITY torSettings.bridgeExplanation1 "If you are not sure how to answer this question, choose No (if you are unable to connect to the Tor network without a bridge, you can add one later)."> -<!ENTITY torSettings.bridgeExplanation2 "If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> +<!ENTITY torSettings.bridgeExplanation1 "Hvis du er usikker på hvordan du skal svare på dette spørsmålet, velg Nei (hvis du ikke klarer å koble til Tor nettverket uten en bro, kan du legge til en senere)."> +<!ENTITY torSettings.bridgeExplanation2 "Hvis du velger Ja, vil du bli bedt om å konfigurere Tor Bridges, som er unoterte releer som gjør det vanskeligere å blokkere tilkoblinger til Tor-nettverket."> <!ENTITY torSettings.bridgeSettingsPrompt "Du kan bruke de angitte broene eller du kan skaffe og oppgi egendefinerte broer.">  <!ENTITY torsettings.startingTor "Venter på at Tor skal starte..."> <!ENTITY torsettings.restartTor "Omstart av Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "Rekonfigurer"> -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.prompt "Du har konfigurert Tor broer eller du har angitt lokale proxy-innstillinger.   For å gjøre en direkte forbindelse til Tor-nettverket, må disse innstillingene fjernes."> +<!ENTITY torsettings.discardSettings.proceed "Fjern Innstillinger og koble"> <!ENTITY torsettings.optional "Valgfritt"> @@ -56,7 +56,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Tillatte Porter:"> <!ENTITY torsettings.useBridges.checkbox "Min Internettleverandør (ISP) blokkerer tilkoblinger til Tor-nettverket"> <!ENTITY torsettings.useBridges.default "Koble til med angitte broer"> -<!ENTITY torsettings.useBridges.note "Each type of bridge uses a different method to avoid censorship.  If one bridge does not work, try again using a different one."> +<!ENTITY torsettings.useBridges.note "Hver type bro bruker en annen metode for å unngå sensur.  Hvis en bro ikke virker, prøv på nytt med en annen."> <!ENTITY torsettings.useBridges.type "Tilkoblingstype:"> <!ENTITY torsettings.useBridges.custom "Angi egendefinerte broer"> <!ENTITY torsettings.useBridges.label "Angi én eller flere bro-reléer (én per linje).">

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 812f6361cc6964bf36c4ab3e59d05d672ee4a8fc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 18:46:16 2016 +0000 Update translations for tails-perl5lib --- fa.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fa.po b/fa.po index 0b47a72..08beea0 100644 --- a/fa.po +++ b/fa.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Gilberto, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2016-01-11 15:40+0100\n" -"PO-Revision-Date: 2016-01-12 08:13+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-01-25 18:22+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +20,7 @@ msgstr "" #: ../lib/Tails/RunningSystem.pm:159 msgid "Error" -msgstr "" +msgstr "خطا" #: ../lib/Tails/RunningSystem.pm:161 msgid ""

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit 859bd48678a2fe61c686af9dec162fca51701873 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 18:45:58 2016 +0000 Update translations for tails-misc --- fa.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fa.po b/fa.po index 28b0baa..a9f47fc 100644 --- a/fa.po +++ b/fa.po @@ -10,7 +10,7 @@ # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Ehsan Ab <a.ehsan70(a)gmail.com>, 2015 # Farshad Gh <farshad73(a)gmail.com>, 2015 -# Gilberto, 2014-2015 +# Gilberto, 2014-2016 # johnholzer <johnholtzer123(a)gmail.com>, 2014 # jonothan hipkey <j.hipkey4502(a)gmail.com>, 2014 # M. Heydar Elahi <m.heydar.elahi(a)gmail.com>, 2014 @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-04 11:56+0100\n" -"PO-Revision-Date: 2016-01-06 09:25+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-11 21:00+0100\n" +"PO-Revision-Date: 2016-01-25 18:23+0000\n" +"Last-Translator: Gilberto\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -248,7 +248,7 @@ msgstr "" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" -msgstr "" +msgstr "شروع دوباره" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:74 #: ../config/chroot_local-includes/usr/share/applications/tails-shutdown.desktop.in.h:1 @@ -318,7 +318,7 @@ msgstr "این نسخه از Tails این مشکلات امنیت شناخته #: config/chroot_local-includes/usr/local/bin/tails-security-check:156 msgid "Known security issues" -msgstr "" +msgstr "مسائل امنیتی شناخته شده" #: config/chroot_local-includes/usr/local/lib/tails-spoof-mac:51 #, sh-format

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 26 Jan '16

26 Jan '16

commit fe94a36958bfe9bf24e01b39c30d238aabdf0bff Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jan 25 18:45:53 2016 +0000 Update translations for tor-launcher-network-settings --- fa/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/network-settings.dtd b/fa/network-settings.dtd index 3a95731..1180719 100644 --- a/fa/network-settings.dtd +++ b/fa/network-settings.dtd @@ -35,10 +35,10 @@ <!ENTITY torsettings.startingTor "در انتظار آغاز به کار تور..."> <!ENTITY torsettings.restartTor "تور را دوباره شوروع کنید."> -<!ENTITY torsettings.reconfigTor "Reconfigure"> +<!ENTITY torsettings.reconfigTor "پیکربندی مجدد"> <!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> +<!ENTITY torsettings.discardSettings.proceed "حذف تنظیمات و اتصال"> <!ENTITY torsettings.optional "اختیاری">

1 0