June 2014 - tor-commits - lists.torproject.org

[orbot/master] fixes #12411 and #12412 enables DNS and transport by default
by n8fr8＠torproject.org 17 Jun '14

17 Jun '14

commit b6715b4d3c3e84caab6108e3702010066f2b36db Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Jun 17 15:42:54 2014 -0400 fixes #12411 and #12412 enables DNS and transport by default with new Orbot settings to enable user to easily change/disable --- res/values/strings.xml | 14 ++++++- res/xml/preferences.xml | 14 +++++++ src/org/torproject/android/service/TorService.java | 42 +++++++++++++++----- .../android/service/TorServiceConstants.java | 4 +- .../torproject/android/service/TorTransProxy.java | 32 ++++++++++----- 5 files changed, 84 insertions(+), 22 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 4456aff..d380579 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -258,8 +258,18 @@ <string name="updating_settings_in_tor_service">updating settings in Tor service</string> <string name="pref_socks_title">Tor SOCKS</string> - <string name="pref_socks_summary">IP and Port that Tor offers its SOCKS proxy on (default: 9050)</string> - <string name="pref_socks_dialog">SOCKS Config (ip:port)</string> + <string name="pref_socks_summary">Port that Tor offers its SOCKS proxy on (default: 9050 or 0 to disable)</string> + <string name="pref_socks_dialog">SOCKS Port Config</string> + + <string name="pref_transport_title">Tor TransProxy Port</string> + <string name="pref_transport_summary">Port that Tor offers its Transparent Proxy on (default: 9040 or 0 to disable)</string> + <string name="pref_transport_dialog">TransProxy Port Config</string> + + + <string name="pref_dnsport_title">Tor DNS Port</string> + <string name="pref_dnsport_summary">Port that Tor offers its DNS on (default: 5400 or 0 to disable)</string> + <string name="pref_dnsport_dialog">DNS Port Config</string> + <string name="pref_torrc_title">Torrc Custom Config</string> <string name="pref_torrc_summary">EXPERTS ONLY: enter direct torrc config lines</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 0277343..22502b6 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -204,6 +204,20 @@ android:dialogTitle="@string/pref_socks_dialog" android:defaultValue="9050" /> + <EditTextPreference android:key="pref_transport" +android:title="@string/pref_transport_title" +android:summary="@string/pref_transport_summary" +android:dialogTitle="@string/pref_transport_dialog" +android:defaultValue="9040" +/> + + <EditTextPreference android:key="pref_dnsport" +android:title="@string/pref_dnsport_title" +android:summary="@string/pref_dnsport_summary" +android:dialogTitle="@string/pref_dnsport_dialog" +android:defaultValue="5400" +/> + <EditTextPreference android:key="pref_custom_torrc" android:title="@string/pref_torrc_title" android:summary="@string/pref_torrc_summary" diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5f9e178..5acb900 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -659,19 +659,24 @@ public class TorService extends Service implements TorServiceConstants, TorConst { mTransProxy = new TorTransProxy(this, fileXtables); - } - logMessage ("Transparent Proxying: updating Tor settings..."); - - mBinder.updateConfiguration("TransPort","9040",false); - mBinder.updateConfiguration("DNSPort","5400",false); - mBinder.updateConfiguration("VirtualAddrNetwork","10.192.0.0/10",false); - mBinder.updateConfiguration("AutomapHostsOnResolve","1",false); - mBinder.saveConfiguration(); - + SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + String transProxy = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); + String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); + + if (transProxy.indexOf(':')!=-1) //we just want the port for this + transProxy = transProxy.split(":")[1]; + + if (dnsPort.indexOf(':')!=-1) //we just want the port for this + dnsPort = dnsPort.split(":")[1]; + + mTransProxy.setTransProxyPort(Integer.parseInt(transProxy)); + mTransProxy.setDNSPort(Integer.parseInt(dnsPort)); + + //TODO: Find a nice place for the next (commented) line //TorTransProxy.setDNSProxying(); @@ -1781,6 +1786,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst enableSocks (socksConfig,false); + String transPort = prefs.getString("pref_transport", TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT+""); + String dnsPort = prefs.getString("pref_dnsport", TorServiceConstants.TOR_DNS_PORT_DEFAULT+""); + + enableTransProxyAndDNSPorts(transPort, dnsPort); + + boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); @@ -2041,6 +2052,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + private void enableTransProxyAndDNSPorts (String transPort, String dnsPort) throws RemoteException + { + logMessage ("Transparent Proxying: enabling port..."); + + mBinder.updateConfiguration("TransPort",transPort,false); + mBinder.updateConfiguration("DNSPort",dnsPort,false); + mBinder.updateConfiguration("VirtualAddrNetwork","10.192.0.0/10",false); + mBinder.updateConfiguration("AutomapHostsOnResolve","1",false); + mBinder.saveConfiguration(); + + + } + private void blockPlaintextPorts (String portList) throws RemoteException { diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 0890f9e..8c53779 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -54,9 +54,9 @@ public interface TorServiceConstants { //what is says! public final static String IP_LOCALHOST = "127.0.0.1"; public final static int UPDATE_TIMEOUT = 1000; - public final static int TOR_TRANSPROXY_PORT = 9040; + public final static int TOR_TRANSPROXY_PORT_DEFAULT = 9040; public final static int STANDARD_DNS_PORT = 53; - public final static int TOR_DNS_PORT = 5400; + public final static int TOR_DNS_PORT_DEFAULT = 5400; //path to check Tor against public final static String URL_TOR_CHECK = "https://check.torproject.org"; diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 4999777..400b1db 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -23,10 +23,24 @@ public class TorTransProxy implements TorServiceConstants { private final static String ALLOW_LOCAL = " ! -o lo ! -d 127.0.0.1 ! -s 127.0.0.1 "; + private int mTransProxyPort = TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT; + private int mDNSPort = TorServiceConstants.TOR_DNS_PORT_DEFAULT; + public TorTransProxy (TorService torService, File fileXTables) { mTorService = torService; mFileXtables = fileXTables; + + } + + public void setTransProxyPort (int transProxyPort) + { + mTransProxyPort = transProxyPort; + } + + public void setDNSPort (int dnsPort) + { + mDNSPort = dnsPort; } public String getIpTablesPath (Context context) @@ -383,7 +397,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(tApp.getUid()); script.append(" -m tcp --syn"); script.append(" -j REDIRECT --to-ports "); - script.append(TOR_TRANSPROXY_PORT); + script.append(mTransProxyPort); executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -398,7 +412,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); - script.append(TOR_DNS_PORT); + script.append(mDNSPort); executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -454,7 +468,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat -A PREROUTING -i "); script.append(hwinterfaces[i]); script.append(" -p udp --dport 53 -j REDIRECT --to-ports "); - script.append(TOR_DNS_PORT); + script.append(mDNSPort); executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -465,7 +479,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -t nat -A PREROUTING -i "); script.append(hwinterfaces[i]); script.append(" -p tcp -j REDIRECT --to-ports "); - script.append(TOR_TRANSPROXY_PORT); + script.append(mTransProxyPort); lastExit = executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -642,7 +656,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(torUid); script.append(" -m tcp --syn"); script.append(" -j REDIRECT --to-ports "); - script.append(TOR_TRANSPROXY_PORT); + script.append(mTransProxyPort); executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -658,7 +672,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); script.append(" -j REDIRECT --to-ports "); - script.append(TOR_DNS_PORT); + script.append(mDNSPort); executeCommand (shell, script.toString()); script = new StringBuilder(); @@ -699,7 +713,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -A ").append(srcChainName); script.append(" -p tcp"); script.append(" -m tcp"); - script.append(" --dport ").append(TOR_TRANSPROXY_PORT); + script.append(" --dport ").append(mTransProxyPort); script.append(" -j ACCEPT"); executeCommand (shell, script.toString()); @@ -735,7 +749,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -A ").append(srcChainName); script.append(" -p udp"); script.append(" -m udp"); - script.append(" --dport ").append(TOR_DNS_PORT); + script.append(" --dport ").append(mDNSPort); script.append(" -j ACCEPT"); executeCommand (shell, script.toString()); @@ -747,7 +761,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -A ").append(srcChainName); script.append(" -p udp"); script.append(" -m udp"); - script.append(" --dport ").append(TOR_DNS_PORT); + script.append(" --dport ").append(mDNSPort); script.append(" -j ACCEPT"); executeCommand (shell, script.toString());

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit e8ccf60b1c25c95d63280048f275cca43739a151 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 14:15:03 2014 +0000 Update translations for bridgedb --- ru/LC_MESSAGES/bridgedb.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po index 75ccb0b..822ce69 100644 --- a/ru/LC_MESSAGES/bridgedb.po +++ b/ru/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Denis <stereodenis(a)gmail.com>, 2014 # Eugene, 2013 # liquixis <liquixis(a)gmail.com>, 2012 # Sergey Briskin <sergey.briskin(a)gmail.com>, 2014 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-13 13:50+0000\n" -"Last-Translator: Valid Olov\n" +"PO-Revision-Date: 2014-06-17 14:00+0000\n" +"Last-Translator: Denis <stereodenis(a)gmail.com>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -70,11 +71,11 @@ msgstr "" #: lib/bridgedb/strings.py:31 #, python-format msgid "Hey, %s!" -msgstr "" +msgstr "Эй, %s!" #: lib/bridgedb/strings.py:32 msgid "Hello, friend!" -msgstr "" +msgstr "Привет, друг!" #: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 msgid "Public Keys" @@ -155,7 +156,7 @@ msgstr "Мои мосты не работают! Помогите!" #: lib/bridgedb/strings.py:92 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Если ваш Tor не работает, напишите нам %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -186,11 +187,11 @@ msgstr "" #: lib/bridgedb/strings.py:110 #, python-format msgid "Do you need a %s?" -msgstr "" +msgstr "Вам нужен %s?" #: lib/bridgedb/strings.py:114 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "Ваш браузер не показывает изображения должным образом." #: lib/bridgedb/strings.py:115 msgid "Enter the characters from the image above..." @@ -263,15 +264,15 @@ msgstr "Сообщить об ошибке" #: lib/bridgedb/templates/base.html:93 msgid "Source Code" -msgstr "" +msgstr "Исходный код" #: lib/bridgedb/templates/base.html:96 msgid "Changelog" -msgstr "" +msgstr "Лог изменений" #: lib/bridgedb/templates/base.html:98 msgid "Contact" -msgstr "" +msgstr "Контакт" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -295,7 +296,7 @@ msgstr "" #: lib/bridgedb/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "Шаг %s1%s" #: lib/bridgedb/templates/index.html:13 #, python-format @@ -315,7 +316,7 @@ msgstr "Получите %s мосты %s" #: lib/bridgedb/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "Шаг %s3%s" #: lib/bridgedb/templates/index.html:38 #, python-format @@ -333,7 +334,7 @@ msgstr "" #: lib/bridgedb/templates/options.html:52 msgid "Advanced Options" -msgstr "" +msgstr "Расширенные настройки" #: lib/bridgedb/templates/options.html:88 msgid "No"

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit 01f95bae45cc42ceda94494d9e24986ff2b07b8b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 10:15:54 2014 +0000 Update translations for tor-and-https_completed --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index 52c550b..79d3087 100644 --- a/sv.po +++ b/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-06-17 09:45+0000\n" +"PO-Revision-Date: 2014-06-17 09:50+0000\n" "Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ msgstr "Tor relay" #: C/tor-and-https.svg:346 #, no-wrap msgid "Key" -msgstr "Nyckel" +msgstr "Förklaring" #. (itstool) path: defs/text #: C/tor-and-https.svg:346 @@ -128,10 +128,10 @@ msgstr "Internetanslutning" #: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" -msgstr "Avlyssna" +msgstr "Avlyssning" #. (itstool) path: defs/text #: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" -msgstr "Data delning" +msgstr "Data delas"

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit 7ce648c7e2493d965401763d405db1b5d990b17b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 10:15:51 2014 +0000 Update translations for tor-and-https --- sv.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sv.po b/sv.po index 52c550b..79d3087 100644 --- a/sv.po +++ b/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-06-17 09:45+0000\n" +"PO-Revision-Date: 2014-06-17 09:50+0000\n" "Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -116,7 +116,7 @@ msgstr "Tor relay" #: C/tor-and-https.svg:346 #, no-wrap msgid "Key" -msgstr "Nyckel" +msgstr "Förklaring" #. (itstool) path: defs/text #: C/tor-and-https.svg:346 @@ -128,10 +128,10 @@ msgstr "Internetanslutning" #: C/tor-and-https.svg:346 #, no-wrap msgid "Eavesdropping" -msgstr "Avlyssna" +msgstr "Avlyssning" #. (itstool) path: defs/text #: C/tor-and-https.svg:346 #, no-wrap msgid "Data sharing" -msgstr "Data delning" +msgstr "Data delas"

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit 18ecee40ce14e51719ed96bd1e5b49446aa0ada2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 10:15:05 2014 +0000 Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 300a2cb..62c7622 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-17 09:41+0000\n" +"PO-Revision-Date: 2014-06-17 09:50+0000\n" "Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit 56957c5f99cf36b22aac41316d527542eea2a6f4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 10:15:02 2014 +0000 Update translations for bridgedb --- sv/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 300a2cb..62c7622 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2014-06-06 21:46+0000\n" -"PO-Revision-Date: 2014-06-17 09:41+0000\n" +"PO-Revision-Date: 2014-06-17 09:50+0000\n" "Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[onionoo/master] Add OnionPy to list of related projects.
by karsten＠torproject.org 17 Jun '14

17 Jun '14

commit 1b4bd77704433cac644966331a55a408487f973c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 17 11:47:18 2014 +0200 Add OnionPy to list of related projects. --- web/index.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/index.html b/web/index.html index b6b0519..fce4894 100644 --- a/web/index.html +++ b/web/index.html @@ -45,7 +45,7 @@ website</a> visualizes diversity of the Tor network using bubble graphs.</li> </ul> -<p>The following Onionoo clients are currently unmaintained, but are +<p>The following Onionoo client is currently unmaintained, but is still a good idea:</p> <ul> <li><a href="https://code.google.com/p/moniono/">mOnionO</a> is an @@ -54,6 +54,13 @@ list and keeps you always informed whether they are running or not.</li> </ul> +<p>The following library facilitates development of Onionoo clients:</p> +<ul> +<li><a href="https://github.com/duk3luk3/onion-py">OnionPy</a> is a +comprehensive pure-Python (2.7+) Onionoo wrapper with caching +support.</li> +</ul> + <h2>Developing Onionoo applications</h2> <p>The project pages of the Onionoo clients listed above have further

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit b83c5cd735b234f9ad717a7a48e731c0b66abc43 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 09:45:55 2014 +0000 Update translations for tor-and-https_completed --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index d6004fb..52c550b 100644 --- a/sv.po +++ b/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-06-09 13:20+0000\n" +"PO-Revision-Date: 2014-06-17 09:45+0000\n" "Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgstr "Jurist" #: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" -msgstr "System admin" +msgstr "Sysadmin" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max.

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit bb250e478fab4c9c8e289602268e6ffc303eb6d7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 09:45:52 2014 +0000 Update translations for tor-and-https --- sv.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sv.po b/sv.po index d6004fb..52c550b 100644 --- a/sv.po +++ b/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2014-05-24 18:11+0000\n" -"PO-Revision-Date: 2014-06-09 13:20+0000\n" +"PO-Revision-Date: 2014-06-17 09:45+0000\n" "Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" @@ -90,7 +90,7 @@ msgstr "Jurist" #: C/tor-and-https.svg:346 #, no-wrap msgid "Sysadmin" -msgstr "System admin" +msgstr "Sysadmin" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max.

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 17 Jun '14

17 Jun '14

commit 25b1315c1b19c93736fbc109c156390f02232b8c Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jun 17 09:45:05 2014 +0000 Update translations for bridgedb_completed --- sv/LC_MESSAGES/bridgedb.po | 363 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 311 insertions(+), 52 deletions(-) diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po index 8d4bb80..300a2cb 100644 --- a/sv/LC_MESSAGES/bridgedb.po +++ b/sv/LC_MESSAGES/bridgedb.po @@ -1,18 +1,20 @@ # Translations template for BridgeDB. -# Copyright (C) 2013 ORGANIZATION +# Copyright (C) 2014 'The Tor Project, Inc.' # This file is distributed under the same license as the BridgeDB project. # # Translators: -# Translators: +# Anders Jensen-Urstad <anders(a)unix.se>, 2014 +# GabSeb, 2014 # Petomatick <petomatick(a)hotmail.com>, 2011 +# phst <transifex(a)sturman.se>, 2014 # WinterFairy <winterfairy(a)riseup.net>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-06-25 14:00+0000\n" -"Last-Translator: WinterFairy <winterfairy(a)riseup.net>\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2014-06-06 21:46+0000\n" +"PO-Revision-Date: 2014-06-17 09:41+0000\n" +"Last-Translator: phst <transifex(a)sturman.se>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/torproject/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,82 +23,339 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/bridgedb/templates/base.html:33 +#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in +#. any string (regardless of capitalization and/or punctuation): +#. "BridgeDB" +#. "pluggable transport" +#. "pluggable transports" +#. "obfs2" +#. "obfs3" +#. "scramblesuit" +#. "fteproxy" +#. "Tor" +#. "Tor Browser" +#: lib/bridgedb/HTTPServer.py:121 +msgid "Sorry! Something went wrong with your request." +msgstr "Något gick tyvärr fel med din förfrågan." + +#: lib/bridgedb/strings.py:18 +msgid "[This is an automated message; please do not reply.]" +msgstr "[Detta är ett automatiskt meddelande; Var god svara ej]" + +#: lib/bridgedb/strings.py:20 +msgid "Here are your bridges:" +msgstr "Här är dina bryggor:" + +#: lib/bridgedb/strings.py:22 +#, python-format +msgid "" +"You have exceeded the rate limit. Please slow down! The minimum time between\n" +"emails is %s hours. All further emails during this time period will be ignored." +msgstr "Du har överskridit din nivå. Ta det lugnt! Minsta tillåtna tiden mellan epost är %s timmar. Epost utöver detta kommer att ignoreras." + +#: lib/bridgedb/strings.py:25 +msgid "" +"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" +msgstr "KOMMANDOn: (kombinera KOMMANDOn för att ange flera val på en gång)" + +#. TRANSLATORS: Please DO NOT translate the word "BridgeDB". +#: lib/bridgedb/strings.py:28 +msgid "Welcome to BridgeDB!" +msgstr "Välkommen till BridgeDB!" + +#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". +#: lib/bridgedb/strings.py:30 +msgid "Currently supported transport TYPEs:" +msgstr "För närvarande stöds följande transport TYPEs:" + +#: lib/bridgedb/strings.py:31 +#, python-format +msgid "Hey, %s!" +msgstr "Hej, %s!" + +#: lib/bridgedb/strings.py:32 +msgid "Hello, friend!" +msgstr "Hej, kompis!" + +#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +msgid "Public Keys" +msgstr "Publika nycklar" + +#. TRANSLATORS: This string will end up saying something like: +#. "This email was generated with rainbows, unicorns, and sparkles +#. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." +#: lib/bridgedb/strings.py:37 +#, python-format +msgid "" +"This email was generated with rainbows, unicorns, and sparkles\n" +"for %s on %s at %s." +msgstr "Det här mailet skapades med hjälp av regnbågar, enhörningar och \nett regn av gnistor för %s den %s kl %s." + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor". +#. TRANSLATORS: Please DO NOT translate "Tor Network". +#: lib/bridgedb/strings.py:47 +#, python-format +msgid "" +"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" +"which can help obfuscate your connections to the Tor Network, making it more\n" +"difficult for anyone watching your internet traffic to determine that you are\n" +"using Tor.\n" +"\n" +msgstr "BridgeDB kan tillhandahålla bryggor med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n" + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#: lib/bridgedb/strings.py:54 +msgid "" +"Some bridges with IPv6 addresses are also available, though some Pluggable\n" +"Transports aren't IPv6 compatible.\n" +"\n" +msgstr "Det finns några bryggor med IPv6-adresser tillgängliga, men vissa Pluggable\nTransports är inte IPv6-kompatibla.\n" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, +#. regular, or unexciting". Like vanilla ice cream. It refers to bridges +#. which do not have Pluggable Transports, and only speak the regular, +#. boring Tor protocol. Translate it as you see fit. Have fun with it. +#: lib/bridgedb/strings.py:63 +#, python-format +msgid "" +"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" +"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" +"help to circumvent internet censorship in many cases.\n" +"\n" +msgstr "Dessutom har BridgeDB några alldeles vanliga bryggor %s utan Pluggable\nTransports %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n" + +#: lib/bridgedb/strings.py:76 msgid "What are bridges?" msgstr "Vad är bryggor?" -#: lib/bridgedb/templates/base.html:34 +#: lib/bridgedb/strings.py:77 #, python-format -msgid "" -"%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s Bryggreläer %s är Tor reläer som hjälper dig kringå censurering." +msgid "%s Bridges %s are Tor relays that help you circumvent censorship." +msgstr "%s Bryggor %s är Tor-reläer som hjälper dig kringgå censur." -#: lib/bridgedb/templates/base.html:39 +#: lib/bridgedb/strings.py:82 msgid "I need an alternative way of getting bridges!" msgstr "Jag behöver ett alternativt sätt att skaffa bryggor på!" -#: lib/bridgedb/templates/base.html:40 +#: lib/bridgedb/strings.py:83 #, python-format msgid "" -"Another way to find public bridge addresses is to send an email (from a %s " -"or a %s address) to %s with the line 'get bridges' by itself in the body of " -"the mail." -msgstr "Ett annat sätt att hitta publika bryggadresser är genom att skicka ett mail (från en %s eller en %s adress) till %s med raden 'get bridges' ensamt i meddelandetexten." +"Another way to get bridges is to send an email to %s. Please note that you must\n" +"send the email using an address from one of the following email providers:\n" +"%s or %s." +msgstr "Ett annat sätt att få nya bryggor är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande epostleverantörer:\n%s eller %s." -#: lib/bridgedb/templates/base.html:48 +#: lib/bridgedb/strings.py:90 msgid "My bridges don't work! I need help!" msgstr "Mina bryggor fungerar inte! Jag behöver hjälp!" -#: lib/bridgedb/templates/base.html:49 +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:92 #, python-format +msgid "If your Tor doesn't work, you should email %s." +msgstr "Om Tor inte fungerar hos dig så kan du maila till %s." + +#. TRANSLATORS: Please DO NOT translate "Pluggable Transports". +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:96 msgid "" -"If your Tor doesn't work, you should email %s. Try including as much info " -"about your case as you can, including the list of bridges you used, the " -"bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Om Tor inte fungerar för dig, maila på engelska till %s. Försök att inkludera så mycket information om ditt fall som möjligt, inklusive listan över bryggor du använde, Tor-paketets filnamn/version, meddelandet Tor gav dig, osv." +"Try including as much info about your case as you can, including the list of\n" +"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" +"and any messages which Tor gave out, etc." +msgstr "Försök att berätta så mycket om problemet som du kan, bland annat vilka\nbryggor och Pluggable Transports som du försökt använda, vilken version av Tor Browser du använder, vilka felmeddelanden som Tor visat, etc." + +#: lib/bridgedb/strings.py:103 +msgid "Here are your bridge lines:" +msgstr "Här är dina rader med bryggor:" + +#: lib/bridgedb/strings.py:104 +msgid "Get Bridges!" +msgstr "Skaffa Bryggor!" + +#: lib/bridgedb/strings.py:108 +msgid "Please select options for bridge type:" +msgstr "Välj alternativ för typ av brygga:" + +#: lib/bridgedb/strings.py:109 +msgid "Do you need IPv6 addresses?" +msgstr "Behöver du en IPv6-adress?" + +#: lib/bridgedb/strings.py:110 +#, python-format +msgid "Do you need a %s?" +msgstr "Behöver du %s?" -#: lib/bridgedb/templates/bridges.html:10 +#: lib/bridgedb/strings.py:114 +msgid "Your browser is not displaying images properly." +msgstr "Din webbläsare visar inte bilder korrekt." + +#: lib/bridgedb/strings.py:115 +msgid "Enter the characters from the image above..." +msgstr "Skriv in tecknen från bilden ovan..." + +#: lib/bridgedb/strings.py:119 +msgid "How to start using your bridges" +msgstr "Hur du börjar använda dina bryggor" + +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#: lib/bridgedb/strings.py:121 +#, python-format msgid "" -"To use the above lines, go to Vidalia's Network settings page, and click " -"\"My ISP blocks connections to the Tor network\". Then add each bridge " -"address one at a time." -msgstr "För att använda ovanstående rader, gå in i Vidalias nätverksinställningar, och välj \"Min internetleverantör blockerar anslutningar till Tor-nätverket\". Lägg sedan till varje bryggadress en åt gången." +"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n" +"Browser download page %s to start Tor Browser." +msgstr "För att ange bryggor i Tor Borwser, följ instruktionerna på nedladdningssidan %s Tor Browser %s för att starta Tor Browser." + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:125 +msgid "" +"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" +"the wizard until it asks:" +msgstr "När dialogen \"Tor Network\" Inställningar visas, välj \"Konfigurera\" och följ\nstegen tills du kommer till frågan:" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:129 +msgid "" +"Does your Internet Service Provider (ISP) block or otherwise censor connections\n" +"to the Tor network?" +msgstr "Blockerar eller filtrerar din Internetleverantör (ISP) anslutningar till Tor network?" + +#. TRANSLATORS: Please DO NOT translate "Tor". +#: lib/bridgedb/strings.py:133 +msgid "" +"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" +"paste the bridge lines into the text input box. Finally, click 'Connect', and\n" +"you should be good to go! If you experience trouble, try clicking the 'Help'\n" +"button in the 'Tor Network Settings' wizard for further assistance." +msgstr "Välj 'Ja' och klicka sedan på 'Nästa'. För att konfigurera nya bryggor, kopiera och klistra in bryggraderna i textrutan. Klicka slutligen på 'Anslut' och det borde vara klart för användning! Om du får problem, prova att klicka på 'Hjälp'-knappen i 'Tor Network Settings' för vidare hjälp." + +#: lib/bridgedb/strings.py:141 +msgid "Displays this message." +msgstr "Visa detta meddelande." + +#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the +#. same non-Pluggable Transport bridges described above as being +#. "plain-ol'-vanilla" bridges. +#: lib/bridgedb/strings.py:145 +msgid "Request vanilla bridges." +msgstr "Leta efter vanliga bryggor." + +#: lib/bridgedb/strings.py:146 +msgid "Request IPv6 bridges." +msgstr "Begär IPv6-bryggor" + +#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". +#: lib/bridgedb/strings.py:148 +msgid "Request a Pluggable Transport by TYPE." +msgstr "Leta efter en Pluggable Transport av en viss TYPE" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB". +#. TRANSLATORS: Please DO NOT translate "GnuPG". +#: lib/bridgedb/strings.py:151 +msgid "Get a copy of BridgeDB's public GnuPG key." +msgstr "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel." + +#: lib/bridgedb/templates/base.html:91 +msgid "Report a Bug" +msgstr "Rapportera en bugg" + +#: lib/bridgedb/templates/base.html:93 +msgid "Source Code" +msgstr "Källkod" -#: lib/bridgedb/templates/bridges.html:13 -msgid "No bridges currently available" -msgstr "Inga bryggor tillgängliga för närvarande" +#: lib/bridgedb/templates/base.html:96 +msgid "Changelog" +msgstr "Ändringslogg" -#: lib/bridgedb/templates/captcha.html:6 -msgid "Upgrade your browser to Firefox" -msgstr "Uppgradera din webbläsare till Firefox" +#: lib/bridgedb/templates/base.html:98 +msgid "Contact" +msgstr "Kontakt" -#: lib/bridgedb/templates/captcha.html:8 -msgid "Type the two words" -msgstr "Skriv in de två orden" +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: lib/bridgedb/templates/bridges.html:66 +msgid "Uh oh, spaghettios!" +msgstr "Bomber och granater, nåt gick snett!" -#: lib/bridgedb/templates/index.html:6 -msgid "Step 1" -msgstr "Steg 1" +#: lib/bridgedb/templates/bridges.html:72 +msgid "There currently aren't any bridges available..." +msgstr "För närvarande finns inga bryggor tillgängliga..." -#: lib/bridgedb/templates/index.html:8 +#: lib/bridgedb/templates/bridges.html:73 #, python-format -msgid "Get %s Tor Browser Bundle %s" -msgstr "Skaffa %s Tor Browser Bundle %s" +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Prova att %s gå tillbaka %s för att välja en annan typ av brygga!" + +#: lib/bridgedb/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Steg %s1%s" #: lib/bridgedb/templates/index.html:13 -msgid "Step 2" -msgstr "Steg 2" +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Ladda ner %s Tor Browser %s" -#: lib/bridgedb/templates/index.html:15 +#: lib/bridgedb/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Steg %s2%s" + +#: lib/bridgedb/templates/index.html:27 #, python-format msgid "Get %s bridges %s" msgstr "Skaffa %s bryggor %s" -#: lib/bridgedb/templates/index.html:19 -msgid "Step 3" -msgstr "Steg 3" +#: lib/bridgedb/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Steg %s3%s" + +#: lib/bridgedb/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Nu kan du %s lägga till bryggor i Tor Browser %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: lib/bridgedb/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "%sG%se mig bryggor!" + +#: lib/bridgedb/templates/options.html:52 +msgid "Advanced Options" +msgstr "Avancerade inställningar" + +#: lib/bridgedb/templates/options.html:88 +msgid "No" +msgstr "Nej" + +#: lib/bridgedb/templates/options.html:89 +msgid "none" +msgstr "inget" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: lib/bridgedb/templates/options.html:130 +#, python-format +msgid "%sY%ses!" +msgstr "%sJ%sa!" -#: lib/bridgedb/templates/index.html:21 +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: lib/bridgedb/templates/options.html:154 #, python-format -msgid "Now %s add the bridges to Tor %s" -msgstr "Lägg nu till %s bryggorna till Tor %s" +msgid "%sG%set Bridges" +msgstr "%sH%sämta Bridges"

1 0