date:20140608

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2014-06-08 Thread translation

commit 1fa0fae44f8dfc8790676b2fd8c47ad598b65dbb
Author: Translation commit bot translat...@torproject.org
Date:   Sun Jun 8 18:45:37 2014 +

Update translations for tor-launcher-network-settings
---
 lt/network-settings.dtd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/network-settings.dtd b/lt/network-settings.dtd
index a619211..54a2fe0 100644
--- a/lt/network-settings.dtd
+++ b/lt/network-settings.dtd
@@ -13,7 +13,7 @@
 !ENTITY torSettings.configure Configure
 !ENTITY torSettings.connectPrompt2 I would like to connect directly to the 
Tor network.
 !ENTITY torSettings.connectPrompt3 This will work in most situations.
-!ENTITY torSettings.connect Connect
+!ENTITY torSettings.connect Prisijungti
 
 !ENTITY torSettings.proxyQuestion Does this computer need to use a proxy to 
access the Internet?
 !-- see https://www.torproject.org/docs/proxychain.html.en --

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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2014-06-08 Thread translation

commit 83e8fdab306199a3013f48b7fefd893b096310ab
Author: Translation commit bot translat...@torproject.org
Date:   Sun Jun 8 18:45:31 2014 +

Update translations for tor-launcher-properties
---
 lt/torlauncher.properties |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lt/torlauncher.properties b/lt/torlauncher.properties
index 1f6e8d6..26a0223 100644
--- a/lt/torlauncher.properties
+++ b/lt/torlauncher.properties
@@ -6,12 +6,12 @@ torlauncher.error_title=Tor Launcher
 torlauncher.tor_exited=Tor unexpectedly exited.
 torlauncher.please_restart_app=Please restart this application.
 torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
+torlauncher.tor_failed_to_start=Tor nepavyko paleisti.
 torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network 
connection.
+torlauncher.tor_bootstrap_failed=Tor nepavyko uÅ¾megzti ryÅ¡io su Tor tinklu.
 torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+torlauncher.unable_to_start_tor=Nepavyksta paleisti Tor.\n\n%S
 torlauncher.tor_missing=The Tor executable is missing.
 torlauncher.torrc_missing=The torrc file is missing.
 torlauncher.datadir_missing=The Tor data directory does not exist.
@@ -27,10 +27,10 @@ torlauncher.error_bridges_missing=You must specify one or 
more bridges.
 torlauncher.error_default_bridges_type_missing=You must select a transport 
type for the provided bridges.
 torlauncher.error_bridge_bad_default_type=No provided bridges that have the 
transport type %S are available. Please adjust your settings.
 
-torlauncher.recommended_bridge=(recommended)
+torlauncher.recommended_bridge=(rekomenduojama)
 
-torlauncher.connect=Connect
-torlauncher.quit=Quit
+torlauncher.connect=Prisijungti
+torlauncher.quit=Nutraukti
 torlauncher.quit_win=IÅ¡eiti
 torlauncher.done=Atlikta
 

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

[tor-commits] [tor-browser-bundle/maint-3.6] Bug 11630: Backing out the proposed fix.

2014-06-08 Thread gk

commit f8973785b36d15d19c4feedcbec52625894f6292
Author: Georg Koppen g...@torproject.org
Date:   Sun Jun 8 21:03:43 2014 +

Bug 11630: Backing out the proposed fix.

It turns out that the VACUUM call does not solve the problem in our
Gitian setup. At least not in the way it was implemented.
---
 Bundle-Data/Docs/ChangeLog.txt   |3 +--
 gitian/descriptors/linux/gitian-bundle.yml   |   13 ++---
 gitian/descriptors/mac/gitian-bundle.yml |   13 ++---
 gitian/descriptors/windows/gitian-bundle.yml |   13 ++---
 gitian/fetch-inputs.sh   |6 --
 gitian/verify-tags.sh|2 +-
 gitian/versions  |6 +-
 gitian/versions.alpha|5 -
 gitian/versions.beta |6 +-
 gitian/versions.nightly  |6 +-
 10 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 41f44ce..3ea5232 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser Bundle 3.6.2 -- Jun 6 2014
+Tor Browser Bundle 3.6.2 -- Jun 9 2014
  * All Platforms
* Update Firefox to 24.6.0esr
* Update OpenSSL to 1.0.1h
@@ -26,7 +26,6 @@ Tor Browser Bundle 3.6.2 -- Jun 6 2014
* Bug 12212: Disable deprecated webaudio API
* Bug 11253: Turn on TLS 1.1 and 1.2.
* Bug 11817: Don't send startup time information to Mozilla.
-   * Bug 11630: Make HTTPS-Everywhere 3.5's rules.sqlite deterministic.
 
 Tor Browser Bundle 3.6.1 -- May 6 2014
  * All Platforms
diff --git a/gitian/descriptors/linux/gitian-bundle.yml 
b/gitian/descriptors/linux/gitian-bundle.yml
index 214b9a2..006883c 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -41,6 +41,7 @@ files:
 - linux-skeleton.zip
 - linux-langpacks.zip
 - noscr...@noscript.net.xpi
+- https-everywh...@eff.org.xpi
 - dzip.sh
 - dtar.sh
 - bare-version
@@ -88,15 +89,13 @@ script: |
   ~/build/dzip.sh 
../../../tor-browser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
 .
   cd ../../../
   #
-  cd https-everywhere
+  #cd https-everywhere
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
-  rm -f .git/refs/heads/master
-  # Backport the fix for #11630 from HTTPS-Everywhere trunk.
-  sed 's/conn.commit()/\nconn.execute(VACUUM)/' -i utils/make-sqlite.py
-  ./makexpi.sh
-  cp pkg/*.xpi 
../tor-browser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
-  cd ..
+  #rm -f .git/refs/heads/master
+  #./makexpi.sh
+  #cp pkg/*.xpi 
../tor-browser/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+  #cd ..
   #
   cp *.xpi tor-browser/Data/Browser/profile.default/extensions/
   cd tor-browser/Data/Browser/profile.default/extensions
diff --git a/gitian/descriptors/mac/gitian-bundle.yml 
b/gitian/descriptors/mac/gitian-bundle.yml
index d5da018..32975a6 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -41,6 +41,7 @@ files:
 - dmg-desktop.tar.xz
 - mac-langpacks.zip
 - noscr...@noscript.net.xpi
+- https-everywh...@eff.org.xpi
 - dzip.sh
 - ddmg.sh
 - libdmg.patch
@@ -95,15 +96,13 @@ script: |
   ~/build/dzip.sh 
../../../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi
 .
   cd ../../../
   #
-  cd https-everywhere
+  #cd https-everywhere
   # XXX: Bloody hack to workaround a bug in HTTPS_E's git hash extraction in
   # makexpi.sh. See https://trac.torproject.org/projects/tor/ticket/10066
-  rm -f .git/refs/heads/master
-  # Backport the fix for #11630 from HTTPS-Everywhere trunk.
-  sed 's/conn.commit()/\nconn.execute(VACUUM)/' -i utils/make-sqlite.py
-  ./makexpi.sh
-  cp pkg/*.xpi 
../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
-  cd ..
+  #rm -f .git/refs/heads/master
+  #./makexpi.sh
+  #cp pkg/*.xpi 
../$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/https-everywh...@eff.org.xpi
+  #cd ..
   #
   cp *.xpi ./$TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/
   cd $TORBROWSER_NAME.app/Data/Browser/profile.default/extensions/
diff --git a/gitian/descriptors/windows/gitian-bundle.yml 
b/gitian/descriptors/windows/gitian-bundle.yml
index ec128be..ebde49b 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -37,6 +37,7 @@ files:
 - windows-skeleton.zip
 - win32-langpacks.zip
 - noscr...@noscript.net.xpi
+- https-everywh...@eff.org.xpi
 - dzip.sh
 - bare-version
 - bundle.inputs
@@ -78,15 +79,13 @@ script: |
   ~/build/dzip.sh ../../../tbb-windows-installer/Tor 
Browser/Data/Browser/profile.default/extensions/torbut...@torproject.org.xpi .

[tor-commits] [tor-browser-bundle/maint-3.6] Space does matter, really.

2014-06-08 Thread gk

commit a8d74208460ed509341276ba810b9aa3bea17f66
Author: Georg Koppen g...@torproject.org
Date:   Sun Jun 8 21:08:38 2014 +

Space does matter, really.
---
 gitian/versions |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitian/versions b/gitian/versions
index 10710ba..b8155a7 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2
 TOR_TAG=tor-0.2.4.22
 TORLAUNCHER_TAG=0.2.5.5
 TORBUTTON_TAG=1.6.10.0
-HTTPSE_TAG=3.5.1# XXX: HTTPSE_VER is used instead, pending #11630
+HTTPSE_TAG=3.5.1 # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.21-stable

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

[tor-commits] [translation/tor-launcher-network-settings] Removing si

2014-06-08 Thread translation

commit 6cff031c90edf87c2f1ed6df182cba524bb7112d
Author: Translation commit bot translat...@torproject.org
Date:   Mon Jun 9 01:09:31 2014 +

Removing si
---
 si/network-settings.dtd |   64 ---
 1 file changed, 64 deletions(-)

diff --git a/si/network-settings.dtd b/si/network-settings.dtd
deleted file mode 100644
index 4cedae6..000
--- a/si/network-settings.dtd
+++ /dev/null
@@ -1,64 +0,0 @@
-!ENTITY torsettings.dialog.title Tor Network Settings
-
-!-- For first run wizard: --
-
-!ENTITY torsettings.prompt Before you connect to the Tor network, you need 
to provide information about this computer's Internet connection.
-
-!ENTITY torSettings.yes Yes
-!ENTITY torSettings.no No
-
-!ENTITY torSettings.firstQuestion Which of the following best describes your 
situation?
-!ENTITY torSettings.configurePrompt1 This computer's Internet connection is 
censored, filtered, or proxied.
-!ENTITY torSettings.configurePrompt2 I need to configure bridge, firewall, 
or proxy settings.
-!ENTITY torSettings.configure Configure
-!ENTITY torSettings.connectPrompt2 I would like to connect directly to the 
Tor network.
-!ENTITY torSettings.connectPrompt3 This will work in most situations.
-!ENTITY torSettings.connect Connect
-
-!ENTITY torSettings.proxyQuestion Does this computer need to use a proxy to 
access the Internet?
-!-- see https://www.torproject.org/docs/proxychain.html.en --
-!ENTITY torSettings.proxyHelp If you are not sure how to answer this 
question, look at the Internet settings in another browser to see whether it is 
configured to use a proxy.
-!ENTITY torSettings.enterProxy Enter the proxy settings.
-!ENTITY torSettings.firewallQuestion Does this computer's Internet 
connection go through a firewall that only allows connections to certain 
ports?
-!ENTITY torSettings.firewallHelp If you are not sure how to answer this 
question, choose No. If you encounter problems connecting to the Tor network, 
change this setting.
-!ENTITY torSettings.enterFirewall Enter a comma-separated list of ports that 
are allowed by the firewall.
-!ENTITY torSettings.bridgeQuestion Does your Internet Service Provider (ISP) 
block or otherwise censor connections to the Tor Network?
-!ENTITY torSettings.bridgeHelp If you are not sure how to answer this 
question, choose No.amp;#160; 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.bridgeSettingsPrompt You may use the provided set of 
bridges or you may obtain and enter a custom set of bridges.
-
-!-- Other: --
-
-!ENTITY torsettings.startingTor Waiting for Tor to startâ¦
-!ENTITY torsettings.restart Restart
-
-!ENTITY torsettings.optional Optional
-
-!ENTITY torsettings.useProxy.checkbox This computer needs to use a proxy to 
access the Internet
-!ENTITY torsettings.useProxy.type Proxy Type:
-!ENTITY torsettings.useProxy.address Address:
-!ENTITY torsettings.useProxy.address.placeholder IP address or hostname
-!ENTITY torsettings.useProxy.port Port:
-!ENTITY torsettings.useProxy.username Username:
-!ENTITY torsettings.useProxy.password Password:
-!ENTITY torsettings.useProxy.type.socks4 SOCKS 4
-!ENTITY torsettings.useProxy.type.socks5 SOCKS 5
-!ENTITY torsettings.useProxy.type.http HTTP / HTTPS
-!ENTITY torsettings.firewall.checkbox This computer goes through a firewall 
that only allows connections to certain ports
-!ENTITY torsettings.firewall.allowedPorts Allowed Ports:
-!ENTITY torsettings.useBridges.checkbox My Internet Service Provider (ISP) 
blocks connections to the Tor network
-!ENTITY torsettings.useBridges.default Connect with provided bridges
-!ENTITY torsettings.useBridges.type Transport type:
-!ENTITY torsettings.useBridges.custom Enter custom bridges
-!ENTITY torsettings.useBridges.label Enter one or more bridge relays (one 
per line).
-!ENTITY torsettings.useBridges.placeholder type address:port
-
-!ENTITY torsettings.copyLog Copy Tor Log To Clipboard
-!ENTITY torsettings.bridgeHelpTitle Bridge Relay Help
-!ENTITY torsettings.bridgeHelp1 If you are unable to connect to the Tor 
network, it could be that your Internet Service Provider (ISP) or another 
agency is blocking Tor.amp;#160; Often, you can work around this problem by 
using Tor Bridges, which are unlisted relays that are more difficult to block.
-!ENTITY torsettings.bridgeHelp1B You may use the preconfigured, provided set 
of bridge addresses or you may obtain a custom set of addresses by using one of 
these three methods:
-!ENTITY torsettings.bridgeHelp2Heading Through the Web
-!ENTITY torsettings.bridgeHelp2 Use a web browser to visit 
https://bridges.torproject.org;
-!ENTITY torsettings.bridgeHelp3Heading Through the Email Autoresponder
-!ENTITY torsettings.bridgeHelp3 Send email to brid...@torproject.org with 
the line 'get bridges' by itself in the body of the message.amp;#160; However, 
to make it harder for an

[tor-commits] [stem/master] Always skip _verify_digest() when making mock descriptors

2014-06-08 Thread atagar

commit d990698937d91fa068fa11fbebc7b01a5e465cea
Author: Damian Johnson ata...@torproject.org
Date:   Sun Jun 8 16:59:12 2014 -0700

Always skip _verify_digest() when making mock descriptors

When making mock descriptors for our tests we pretty much never want to run 
its
_verify_digest() since that makes our tests balk on the fake content. We 
were
mocking out _verify_digest() calls in each test, but it's a lot simpler to 
just
do this in the funciton that provides us the mock data.
---
 test/mocking.py   |   11 ++-
 test/unit/descriptor/export.py|   12 
 test/unit/descriptor/server_descriptor.py |8 
 test/unit/tutorial.py |1 -
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/test/mocking.py b/test/mocking.py
index f139548..057541d 100644
--- a/test/mocking.py
+++ b/test/mocking.py
@@ -49,6 +49,12 @@ import stem.prereq
 import stem.response
 import stem.util.str_tools
 
+try:
+  # added in python 3.3
+  from unittest.mock import Mock, patch
+except ImportError:
+  from mock import Mock, patch
+
 CRYPTO_BLOB = 
 MIGJAoGBAJv5IIWQ+WDWYUdyA/0L8qbIkEVH/cwryZWoIaPAzINfrw1WfNZGtBmg
 skFtXhOHHqTRN4GPPrZsAIUOQGzQtGb66IQgT4tO/pj+P6QmSCCdTfhvGfgTCsC+
@@ -347,7 +353,10 @@ def get_relay_server_descriptor(attr = None, exclude = (), 
content = False, sign
 if sign_content:
   desc_content = sign_descriptor_content(desc_content)
 
-return stem.descriptor.server_descriptor.RelayDescriptor(desc_content, 
validate = True)
+with 
patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock()):
+  desc = stem.descriptor.server_descriptor.RelayDescriptor(desc_content, 
validate = True)
+
+return desc
 
 
 def get_bridge_server_descriptor(attr = None, exclude = (), content = False):
diff --git a/test/unit/descriptor/export.py b/test/unit/descriptor/export.py
index 68b4f29..55429fd 100644
--- a/test/unit/descriptor/export.py
+++ b/test/unit/descriptor/export.py
@@ -13,15 +13,8 @@ from stem.descriptor.export import export_csv, 
export_csv_file
 from test.mocking import get_relay_server_descriptor, \
  get_bridge_server_descriptor
 
-try:
-  # added in python 3.3
-  from unittest.mock import Mock, patch
-except ImportError:
-  from mock import Mock, patch
-
 
 class TestExport(unittest.TestCase):
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_minimal_descriptor(self):
 
 Exports a single minimal tor server descriptor.
@@ -42,7 +35,6 @@ class TestExport(unittest.TestCase):
 expected = 'nickname,address,published\n' + expected
 self.assertEquals(expected, desc_csv)
 
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_multiple_descriptors(self):
 
 Exports multiple descriptors, making sure that we get them back in the same
@@ -59,7 +51,6 @@ class TestExport(unittest.TestCase):
 expected = '\n'.join(nicknames) + '\n'
 self.assertEqual(expected, export_csv(descriptors, included_fields = 
('nickname',), header = False))
 
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_file_output(self):
 
 Basic test for the export_csv_file() function, checking that it provides
@@ -74,7 +65,6 @@ class TestExport(unittest.TestCase):
 
 self.assertEqual(desc_csv, csv_buffer.getvalue())
 
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_excludes_private_attr(self):
 
 Checks that the default attributes for our csv output doesn't include 
private fields.
@@ -99,7 +89,6 @@ class TestExport(unittest.TestCase):
 
 self.assertEquals('', export_csv([]))
 
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_invalid_attributes(self):
 
 Attempts to make a csv with attributes that don't exist.
@@ -108,7 +97,6 @@ class TestExport(unittest.TestCase):
 desc = get_relay_server_descriptor()
 self.assertRaises(ValueError, export_csv, desc, ('nickname', 'blarg!'))
 
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_multiple_descriptor_types(self):
 
 Attempts to make a csv with multiple descriptor types.
diff --git a/test/unit/descriptor/server_descriptor.py 
b/test/unit/descriptor/server_descriptor.py
index c51de06..4d01219 100644
--- a/test/unit/descriptor/server_descriptor.py
+++ b/test/unit/descriptor/server_descriptor.py
@@ -26,7 +26,6 @@ except ImportError:
 
 
 class TestServerDescriptor(unittest.TestCase):
-  @patch('stem.descriptor.server_descriptor.RelayDescriptor._verify_digest', 
Mock())
   def test_minimal_relay_descriptor(self):
 
 Basic sanity check that we can parse a relay server descriptor with minimal
@@ -40,7 +39,6 @@ class TestServerDescriptor(unittest.TestCase):

[tor-commits] [tor/master] Spell getrlimit correctly.

2014-06-08 Thread nickm

commit 307aa7eb43c25f0009de33f9aea4376c329b4fe5
Author: Nick Mathewson ni...@torproject.org
Date:   Sun Jun 8 22:33:38 2014 -0400

Spell getrlimit correctly.

Fixes bug in b0c1c700114aa8d4dfc180d85870c5bbe15fcacb; bug
12229. Bugfix not in any released Tor.  Patch from alphawolf.
---
 src/common/sandbox.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index c379151..4721b8d 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -135,7 +135,7 @@ static int filter_nopar_gen[] = {
 #ifdef __NR_getgid32
 SCMP_SYS(getgid32),
 #endif
-#ifdef __NR_getrlimt
+#ifdef __NR_getrlimit
 SCMP_SYS(getrlimit),
 #endif
 SCMP_SYS(gettimeofday),

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

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-08 Thread translation

commit 24b948072b9d4eb292d9bc6ec387839fd5c484ee
Author: Translation commit bot translat...@torproject.org
Date:   Mon Jun 9 04:45:03 2014 +

Update translations for bridgedb
---
 km/LC_MESSAGES/bridgedb.po |  143 ++--
 1 file changed, 84 insertions(+), 59 deletions(-)

diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 73287b3..00fc8bd 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the BridgeDB project.
 # 
 # Translators:
-# soksophea sksop...@gmail.com, 2014
-# soksophea sksop...@gmail.com, 2013
+# Seng Sutha su...@open.org.kh, 2014
+# Sok Sophea sksop...@gmail.com, 2014
+# Sok Sophea sksop...@gmail.com, 2013
 msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
-POT-Creation-Date: 2014-05-16 18:39+\n
-PO-Revision-Date: 2014-05-17 14:36+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2014-06-06 21:46+\n
+PO-Revision-Date: 2014-06-09 04:44+\n
+Last-Translator: Seng Sutha su...@open.org.kh\n
 Language-Team: Khmer 
(http://www.transifex.com/projects/p/torproject/language/km/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -22,29 +23,26 @@ msgstr 
 
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
 #. any string (regardless of capitalization and/or punctuation):
-#. bridge
-#. bridges
 #. BridgeDB
 #. pluggable transport
 #. pluggable transports
 #. obfs2
 #. obfs3
 #. scramblesuit
-#. fte
+#. fteproxy
 #. Tor
 #. Tor Browser
-#. TBB
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
 msgid Sorry! Something went wrong with your request.
-msgstr 
+msgstr áá¼áááá! á¢ááá¸âáá½áâáá¶áâááá 
á»áâáá¶áá½áâáááá¾âááááâá¢áááá
 
 #: lib/bridgedb/strings.py:18
 msgid [This is an automated message; please do not reply.]
-msgstr 
+msgstr 
[áááâáá¶âáá¶áâááááááááááááá·; 
áá¼áâáá»áâáááá¾áááá]
 
 #: lib/bridgedb/strings.py:20
 msgid Here are your bridges:
-msgstr 
+msgstr 
áááâáá¶âááááá¸áááâááááâá¢áááá
 
 #: lib/bridgedb/strings.py:22
 #, python-format
@@ -58,39 +56,44 @@ msgid 
 COMMANDs: (combine COMMANDs to specify multiple options simultaneously)
 msgstr 
 
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word BridgeDB.
+#: lib/bridgedb/strings.py:28
 msgid Welcome to BridgeDB!
 msgstr 
 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
 msgid Currently supported transport TYPEs:
 msgstr 
 
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
 #, python-format
 msgid Hey, %s!
 msgstr 
 
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
 msgid Hello, friend!
 msgstr 
 
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
 msgid Public Keys
 msgstr 
 
 #. TRANSLATORS: This string will end up saying something like:
 #. This email was generated with rainbows, unicorns, and sparkles
 #. for al...@example.com on Friday, 09 May, 2014 at 18:59:39.
-#: lib/bridgedb/strings.py:36
+#: 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 
 
-#: lib/bridgedb/strings.py:42
+#. 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
@@ -100,14 +103,20 @@ msgid 
 \n
 msgstr 
 
-#: lib/bridgedb/strings.py:48
+#. 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 
 
-#: lib/bridgedb/strings.py:52
+#. 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
@@ -116,20 +125,20 @@ msgid 
 \n
 msgstr 
 
-#: lib/bridgedb/strings.py:65
+#:

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2014-06-08 Thread translation

commit e3cdf00ba0835fd22b9b7f50c07b9a1d51dbcb1c
Author: Translation commit bot translat...@torproject.org
Date:   Mon Jun 9 05:15:03 2014 +

Update translations for bridgedb
---
 km/LC_MESSAGES/bridgedb.po |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 00fc8bd..f48b6d2 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -11,7 +11,7 @@ msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2014-06-06 21:46+\n
-PO-Revision-Date: 2014-06-09 04:44+\n
+PO-Revision-Date: 2014-06-09 04:50+\n
 Last-Translator: Seng Sutha su...@open.org.kh\n
 Language-Team: Khmer 
(http://www.transifex.com/projects/p/torproject/language/km/)\n
 MIME-Version: 1.0\n
@@ -59,7 +59,7 @@ msgstr 
 #. TRANSLATORS: Please DO NOT translate the word BridgeDB.
 #: lib/bridgedb/strings.py:28
 msgid Welcome to BridgeDB!
-msgstr 
+msgstr áááá¶ááááâáááá¶áá BridgeDB!
 
 #. TRANSLATORS: Please DO NOT translate the words transport or TYPE.
 #: lib/bridgedb/strings.py:30
@@ -69,11 +69,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
@@ -87,7 +87,7 @@ msgstr 
 msgid 
 This email was generated with rainbows, unicorns, and sparkles\n
 for %s on %s at %s.
-msgstr 
+msgstr 
á¢áá¸áááâáááâáááá¼áâáá¶áâááááá¾áâá¡á¾áââáá¶áá½á
 rainbows, unicorns, áá·á sparkles\nááááá¶áá %s áá¾ %s 
áá %s á
 
 #. TRANSLATORS: Please DO NOT translate BridgeDB.
 #. TRANSLATORS: Please DO NOT translate Pluggable Transports.

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

[tor-commits] [tor-browser-bundle/maint-3.6] Bug 11630: Backing out the proposed fix.

[tor-commits] [tor-browser-bundle/maint-3.6] Space does matter, really.

[tor-commits] [translation/tor-launcher-network-settings] Removing si

[tor-commits] [stem/master] Always skip _verify_digest() when making mock descriptors

[tor-commits] [tor/master] Spell getrlimit correctly.

[tor-commits] [translation/bridgedb] Update translations for bridgedb

[tor-commits] [translation/bridgedb] Update translations for bridgedb

9 matches

Site Navigation

Mail list logo

Footer information