[tor-commits] [translation/tails-misc] Update translations for tails-misc

2015-04-05 Thread translation 
commit e0894360cdb10bc6550a64da6b1f8c3f29f1c309
Author: Translation commit bot translat...@torproject.org
Date:   Sun Apr 5 22:45:34 2015 +

Update translations for tails-misc
---
 ro.po |   13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ro.po b/ro.po
index ee0c2b3..f4211a7 100644
--- a/ro.po
+++ b/ro.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Andrei Draga, 2013
+# axel_89 axel_...@yahoo.com, 2015
 # Draga Bianca - Madalina dragabia...@yahoo.com, 2014
 # Nicola Radu eston...@yahoo.com, 2014
 # Paul Ionut Anton, 2014
@@ -14,9 +15,9 @@ msgid 
 msgstr 
 Project-Id-Version: The Tor Project\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2015-02-23 16:25+0100\n
-PO-Revision-Date: 2015-02-25 11:56+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+POT-Creation-Date: 2015-03-30 16:51+0200\n
+PO-Revision-Date: 2015-04-05 22:41+\n
+Last-Translator: axel_89 axel_...@yahoo.com\n
 Language-Team: Romanian 
(http://www.transifex.com/projects/p/torproject/language/ro/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -24,11 +25,11 @@ msgstr 
 Language: ro\n
 Plural-Forms: nplurals=3; 
plural=(n==1?0:(((n%10019)||((n%100==0)(n!=0)))?2:1));\n
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:42
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
 msgid Tor is ready
 msgstr Tor este pregătit
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh:43
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
 msgid You can now access the Internet.
 msgstr Acum puteți accesa Internetul.
 
@@ -47,7 +48,7 @@ msgid 
 an opportunity for eavesdroppers, like your email or Internet provider, to\n
 confirm that you are using Tails.\n
 /p\n
-msgstr 
+msgstr h1Ajutaține sa reparăm greșelilel!/h1\n\npCiteștea 
href=\%s\instrutia de raportare a greșelilor/a./p\n\npstrongNu 
includeți mai multa informație personală\n\ndecît este 
necesar!/strong/p\n\nh2Despre trimiterea nouă a email-ului 
personal/h2\n\np\n\nTrimiterea proprului email ne permite sa vă contactăm 
pentru a clarifica problema.Asta\n\ne necesar pentru majoritatea raporturilor 
pe care le primim,altfel fară date de contact\n\ninformația raportata e 
nefolositoare.Pe de alta parte ea tot permite de a recepționa\n\nca folosiți 
Tails.\n
 
 #: config/chroot_local-includes/usr/local/bin/electrum:14
 msgid Persistence is disabled for Electrum

___
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

2015-04-05 Thread translation 
commit cb78cbcdda662c19e918cbeced04cc3e9f8a0200
Author: Translation commit bot translat...@torproject.org
Date:   Sun Apr 5 22:15:04 2015 +

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

diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index 348d01b..effa86c 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Adda.17 adrianatri...@gmail.com, 2013
+# axel_89 axel_...@yahoo.com, 2015
 # Isus Satanescu i...@openmailbox.org, 2014
 # laura berindei lauraagavril...@yahoo.com, 2014
 # clopotel yo_sergi...@yahoo.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=BridgeDBkeywords=bridgedb-reported,msgidcc=isis,sysrqbowner=isis'\n
 POT-Creation-Date: 2015-02-03 03:24+\n
-PO-Revision-Date: 2015-02-14 08:51+\n
-Last-Translator: runasand runa.sand...@gmail.com\n
+PO-Revision-Date: 2015-04-05 22:11+\n
+Last-Translator: axel_89 axel_...@yahoo.com\n
 Language-Team: Romanian 
(http://www.transifex.com/projects/p/torproject/language/ro/)\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
@@ -279,7 +280,7 @@ msgstr Selectare totală
 
 #: lib/bridgedb/templates/bridges.html:87
 msgid Show QRCode
-msgstr 
+msgstr Arată QRcod-ul
 
 #: lib/bridgedb/templates/bridges.html:100
 msgid QRCode for your bridge lines
@@ -296,7 +297,7 @@ msgstr O, spagettios!
 
 #: lib/bridgedb/templates/bridges.html:116
 msgid It seems there was an error getting your QRCode.
-msgstr 
+msgstr Se pare ca sa produs o eroare cind sa introdus QRcod-ul dumneavoastra.
 
 #: lib/bridgedb/templates/bridges.html:121
 msgid 

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

[tor-commits] [tor-messenger-build/master] Remove part of instantbird/fix-mingw-build.patch

2015-04-05 Thread boklm 
commit d31e65ca54ccbbb7ead5b2701922d5ec183d7b2e
Author: Nicolas Vigier bo...@torproject.org
Date:   Sun Apr 5 23:20:09 2015 +0200

Remove part of instantbird/fix-mingw-build.patch

This change have been applied upstream.
---
 projects/instantbird/fix-mingw-build.patch |9 -
 1 file changed, 9 deletions(-)

diff --git a/projects/instantbird/fix-mingw-build.patch 
b/projects/instantbird/fix-mingw-build.patch
index 8c7ca7c..26359f4 100644
--- a/projects/instantbird/fix-mingw-build.patch
+++ b/projects/instantbird/fix-mingw-build.patch
@@ -2,15 +2,6 @@ diff --git a/im/installer/package-manifest.in 
b/im/installer/package-manifest.in
 index 0376e05c74a5..70c1a6ada34c 100644
 --- a/im/installer/package-manifest.in
 +++ b/im/installer/package-manifest.in
-@@ -52,7 +52,7 @@
- @RESPATH@/searchplugins/*
- @RESPATH@/dictionaries/*
- @RESPATH@/hyphenation/*
--#ifdef XP_WIN32
-+#ifdef MAKENSISU
- @BINPATH@/uninstall/helper.exe
- #endif
- #ifdef MOZ_UPDATER
 @@ -123,6 +123,8 @@
  #endif
  

___
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

2015-04-05 Thread translation 
commit f0e245fc731cf9fcfdc48469ed66421bee670022
Author: Translation commit bot translat...@torproject.org
Date:   Sun Apr 5 15:15:33 2015 +

Update translations for tor-launcher-network-settings
---
 bg/network-settings.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd
index e3dc878..6b1c255 100644
--- a/bg/network-settings.dtd
+++ b/bg/network-settings.dtd
@@ -9,7 +9,7 @@
 
 !ENTITY torSettings.firstQuestion Кое от следните описва 
най-добре вашата ситуация?
 !ENTITY torSettings.configurePrompt1 Интернет връзката на 
този компютър е цензурирана или минава 
през proxy сървър.
-!ENTITY torSettings.configurePrompt2 I need to configure bridge or local 
proxy settings.
+!ENTITY torSettings.configurePrompt2 Трябва да 
конфигурирам bridge или proxy настройки.
 !ENTITY torSettings.configure Конфигурирай
 !ENTITY torSettings.connectPrompt2 Бих искал да се свържа 
директно към Tor мрежата.
 !ENTITY torSettings.connectPrompt3 Това ще работи при 
повечето ситуации.
@@ -17,7 +17,7 @@
 
 !ENTITY torSettings.proxyQuestion Този компютър използва 
ли локално прокси за достъп до Интернет?
 !-- 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 local proxy.
+!ENTITY torSettings.proxyHelp Ако не сте сигурни как да 
отговорите на този въпрос проверете 
интернет настройките на друг браузър,за да 
видите дали е настроен да използва прокси.
 !ENTITY torSettings.enterProxy Въведете настройките за 
прокси.
 !ENTITY torSettings.bridgeQuestion Блокирани или 
цензурирани ли са връзките към Tor Мрежата 
от вашият Интернет Доставчик(ISP)?
 !ENTITY torSettings.bridgeHelp Ако не сте сигурни как да 
отговорите на този въпрос, изберете No.#160; 
Ако изберете Yes, вие ще бъдете помолен да 
конфигурирате Tor Bridges, непубликувани relays 
които правят блокирането на връзката към Tor 
Network по трудна.

___
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_completed] Update translations for tor-launcher-network-settings_completed

2015-04-05 Thread translation 
commit 7e38edf0e921daa03372b5e709562aae719217e3
Author: Translation commit bot translat...@torproject.org
Date:   Sun Apr 5 15:15:37 2015 +

Update translations for tor-launcher-network-settings_completed
---
 bg/network-settings.dtd |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bg/network-settings.dtd b/bg/network-settings.dtd
index f011cd1..6b1c255 100644
--- a/bg/network-settings.dtd
+++ b/bg/network-settings.dtd
@@ -15,7 +15,7 @@
 !ENTITY torSettings.connectPrompt3 Това ще работи при 
повечето ситуации.
 !ENTITY torSettings.connect Свържи се
 
-!ENTITY torSettings.proxyQuestion Нуждае ли се този 
компютър от прокси за свързване към 
Интернет?
+!ENTITY torSettings.proxyQuestion Този компютър използва 
ли локално прокси за достъп до Интернет?
 !-- see https://www.torproject.org/docs/proxychain.html.en --
 !ENTITY torSettings.proxyHelp Ако не сте сигурни как да 
отговорите на този въпрос проверете 
интернет настройките на друг браузър,за да 
видите дали е настроен да използва прокси.
 !ENTITY torSettings.enterProxy Въведете настройките за 
прокси.
@@ -30,7 +30,7 @@
 
 !ENTITY torsettings.optional Допълнителен
 
-!ENTITY torsettings.useProxy.checkbox Този компютър се 
нуждае от прокси за да се свърже към 
Интернет.
+!ENTITY torsettings.useProxy.checkbox Необходимо е 
използването на локален прокси сървър за 
достъп до Интернет
 !ENTITY torsettings.useProxy.type Прокси Тип:
 !ENTITY torsettings.useProxy.address Адрес:
 !ENTITY torsettings.useProxy.address.placeholder IP адрес или х
ост

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

[tor-commits] [obfs4/master] Move logging wrappers into common/log, and add a DEBUG log level.

2015-04-05 Thread yawning 
commit df4265707999b08d220374c08e82711f264247bf
Author: Yawning Angel yawn...@torproject.org
Date:   Fri Apr 3 14:21:31 2015 +

Move logging wrappers into common/log, and add a DEBUG log level.

Implements feature #15576.
---
 ChangeLog|3 +
 common/log/log.go|  179 ++
 doc/obfs4proxy.1 |6 +-
 obfs4proxy/log.go|   88 ---
 obfs4proxy/obfs4proxy.go |  142 ++--
 obfs4proxy/termmon.go|6 +-
 6 files changed, 227 insertions(+), 197 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce868b8..50a2f49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Changes in version 0.0.5 - UNRELEASED:
  - Changed the go.net import path to the new location (golang.org/x/net).
  - Added limited support for detecting if the parent process crashes.
  - Support for tor feature #15335 (stdin based termination notification).
+ - Moved the leveled logging wrappers into common/log so they are usable
+   in transport implementations.
+ - Added a DEBUG log level.
 
 Changes in version 0.0.4 - 2015-02-17
  - Improve the runtime performance of the obfs4 handshake tests.
diff --git a/common/log/log.go b/common/log/log.go
new file mode 100644
index 000..5d0a146
--- /dev/null
+++ b/common/log/log.go
@@ -0,0 +1,179 @@
+/*
+ * Copyright (c) 2014-2015, Yawning Angel yawning at torproject dot org
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *this list of conditions and the following disclaimer.
+ *
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *this list of conditions and the following disclaimer in the documentation
+ *and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// Package log implements a simple set of leveled logging wrappers around the
+// standard log package.
+package log
+
+import (
+   fmt
+   io/ioutil
+   log
+   net
+   os
+   strings
+)
+
+const (
+   elidedAddr = [scrubbed]
+
+   levelError = iota
+   levelWarn
+   levelInfo
+   levelDebug
+)
+
+var logLevel = levelInfo
+var enableLogging bool
+var unsafeLogging bool
+
+// Init initializes logging with the given path, and log safety options.
+func Init(enable bool, logFilePath string, unsafe bool) error {
+   if enable {
+   f, err := os.OpenFile(logFilePath, 
os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0600)
+   if err != nil {
+   return err
+   }
+   log.SetOutput(f)
+   } else {
+   log.SetOutput(ioutil.Discard)
+   }
+   enableLogging = enable
+   return nil
+}
+
+// SetLogLevel sets the log level to the value indicated by the given string
+// (case-insensitive).
+func SetLogLevel(logLevelStr string) error {
+   switch strings.ToUpper(logLevelStr) {
+   case ERROR:
+   logLevel = levelError
+   case WARN:
+   logLevel = levelWarn
+   case INFO:
+   logLevel = levelInfo
+   case DEBUG:
+   logLevel = levelDebug
+   default:
+   return fmt.Errorf(invalid log level '%s', logLevelStr)
+   }
+   return nil
+}
+
+// Noticef logs the given format string/arguments at the NOTICE log level.
+func Noticef(format string, a ...interface{}) {
+   if enableLogging {
+   msg := fmt.Sprintf(format, a...)
+   log.Print([NOTICE]:  + msg)
+   }
+}
+
+// Errorf logs the given format string/arguments at the ERROR log level.
+func Errorf(format string, a ...interface{}) {
+   if enableLogging  logLevel = levelError {
+   msg := fmt.Sprintf(format, a...)
+   log.Print([ERROR]:  + msg)
+   }
+}
+
+// Warnf logs the given format string/arguments at the WARN log level.
+func Warnf(format string, a ...interface{}) {
+   if enableLogging  logLevel = levelWarn {
+