January 2018 - tor-commits - lists.torproject.org

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 19 Jan '18

19 Jan '18

commit c737d44f6209636e1ce74dc364204c3e60ae050e Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 19 18:45:05 2018 +0000 Update translations for bridgedb --- mk/LC_MESSAGES/bridgedb.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index 214c7da54..ba8b37765 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -5,13 +5,13 @@ # Translators: # Cacko Cackoas <cackothe(a)gmail.com>, 2015 # Viktor Hristov, 2014 -# Zarko Gjurov <zarkogjurov(a)gmail.com>, 2017 +# Zarko Gjurov <zarkogjurov(a)gmail.com>, 2017-2018 msgid "" 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: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-12-19 20:39+0000\n" +"PO-Revision-Date: 2018-01-19 18:44+0000\n" "Last-Translator: Zarko Gjurov <zarkogjurov(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "Извинете! Се случи грешка со вашето бар #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "Пријави проблем/грешка" +msgstr "Пријави проблем" #: bridgedb/https/templates/base.html:82 msgid "Source Code" @@ -54,7 +54,7 @@ msgstr "Контакт" #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "Селектирај се" +msgstr "Одбери се" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" @@ -62,7 +62,7 @@ msgstr "Покажи QR код" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR код за вашата премостувачка / мост конекција" +msgstr "QR код за вашите мост конекции" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -81,11 +81,11 @@ msgstr "Има грешка во добивањето на вашиот QR ко msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Овој QR код содржи податоци за вашата мост / јазол / чвор конекција. Скенирај го со QR код читач за мост конекција т.е. со камерата на вашиот мобилен телефон или друг уред." +msgstr "Овој QR код ги содржи вашите мост врските. Скенирај го со QR код читач т.е. со камерата за да ги копирате мост врските на вашиот мобилен телефон или друг уред." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Моментално нема достапни премостувања..." +msgstr "Моментално нема достапни мостови..." #: bridgedb/https/templates/bridges.html:132 #, python-format

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 4953efec39b6902cf1cd4d7b741d716df0361c82 Merge: e8fdac775 36567c5ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:18:59 2018 -0500 Merge branch 'maint-0.2.9' into release-0.2.9 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.9] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b32dbe4..60f82af3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -61,6 +67,18 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.9
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.0] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b32dbe4..60f82af3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -61,6 +67,18 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.5' into maint-0.2.9
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 36567c5ca4a1f9800415c772c87ee17dfba8d75d Merge: 9464da210 49de586ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:16:47 2018 -0500 Merge branch 'maint-0.2.5' into maint-0.2.9 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 49de586add6394c7a04c9a982fbe66b185cf4e58 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59b32dbe4..60f82af3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -61,6 +67,18 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 1cf11b69408ab3707de01711308a05e223a767f5 Merge: b85fa0bd5 36567c5ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 19 10:17:05 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 .travis.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Work around Travis CI ptrace regression
by nickm＠torproject.org 19 Jan '18

19 Jan '18

commit 0e7f1b06e90e91006e781c3c8387e15368abd543 Author: Taylor Yu <catalyst(a)torproject.org> Date: Wed Jan 10 14:52:04 2018 -0600 Work around Travis CI ptrace regression Travis CI deployed a change that disables ptrace capabilities in container builds, which prevents LeakSanitizer on clang from working properly. Set "sudo: required" to force non-container builds for clang and work around this. --- .travis.yml | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8cc210827..19bbe6df0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,10 @@ language: c -compiler: - - gcc - - clang +## Comment out the compiler list for now to allow an explicit build +## matrix. +# compiler: +# - gcc +# - clang notifications: irc: @@ -28,6 +30,10 @@ dist: trusty ## We don't need sudo. (The "apt:" stanza after this allows us to not need sudo; ## otherwise, we would need it for getting dependencies.) +## +## We override this in the explicit build matrix to work around a +## Travis CI environment regression +## https://github.com/travis-ci/travis-ci/issues/9033 sudo: false ## (Linux only) Download our dependencies @@ -55,8 +61,12 @@ env: ## The Travis CI environment allows us two cores, so let's use both. - MAKEFLAGS="-j 2" matrix: + ## Leave at least one entry here or Travis seems to generate a + ## matrix entry with empty matrix environment variables. Leaving + ## more than one entry causes unwanted matrix entries with + ## unspecified compilers. - RUST_OPTIONS="--enable-rust --enable-cargo-online-mode" - - RUST_OPTIONS="" + # - RUST_OPTIONS="" matrix: ## If one build in the matrix fails (e.g. if building withour Rust and Clang @@ -64,6 +74,23 @@ matrix: ## entire job early and call the whole thing a failure. fast_finish: true + ## Create explicit matrix entries to work around a Travis CI + ## environment issue. Missing keys inherit from the first list + ## entry under that key outside the "include" clause. + include: + - compiler: gcc + - compiler: gcc + env: RUST_OPTIONS="" + ## The "sudo: required" forces non-containerized builds, working + ## around a Travis CI environment issue: clang LeakAnalyzer fails + ## because it requires ptrace and the containerized environment no + ## longer allows ptrace. + - compiler: clang + sudo: required + - compiler: clang + sudo: required + env: RUST_OPTIONS="" + before_install: ## If we're on OSX, homebrew usually needs to updated first - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi

1 0