February 2017 - tor-commits - lists.torproject.org

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 07 Feb '17

07 Feb '17

commit c10b952f93ed8710b6ed6dcb1125c9ed5f6a582f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 05:18:16 2017 +0000 Update translations for tails-greeter-2_completed --- tr/tr.po | 172 ++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 92 insertions(+), 80 deletions(-) diff --git a/tr/tr.po b/tr/tr.po index eeea36f..7adad47 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -1,14 +1,14 @@ -# Tails GDM Greeter -# Copyright (C) 2016 Tails devlopers -# This file is distributed under the same license as the tails-greeter package. -# Tails devloppers <tails(a)boum.org>, 2016. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-12-03 13:14+0000\n" +"POT-Creation-Date: 2017-01-31 10:47+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Yasin Özel <iletisim(a)yasinozel.com.tr>, 2016\n" "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n" @@ -91,87 +91,105 @@ msgstr "Tüm MAC adresleri yanıltılsın (varsayılan)" msgid "Don't spoof MAC addresses" msgstr "MAC adresleri yanıltılmasın" -#: ../data/greeter.ui.h:17 +#: ../data/greeter.ui.h:17 ../tailsgreeter/gui.py:514 +msgid "Cannot unlock encrypted storage with this passphrase." +msgstr "Bu parola ile şifreli depolama alanının kilidi açılamadı." + +#: ../data/greeter.ui.h:18 +msgid "" +"You will configure the Tor bridge and local proxy later on after connecting " +"to a network." +msgstr "" +"Bir ağa bağlandıktan sonra Tor köprüsü ya da yerel vekil sunucu " +"kullanabilirsiniz." + +#: ../data/greeter.ui.h:19 msgid "Welcome to Tails!" msgstr "Tails Uygulamasına Hoş Geldiniz!" #. This string will never be displayed in the 1st version of the greeter. -#: ../data/greeter.ui.h:19 +#: ../data/greeter.ui.h:21 msgctxt "" msgid "" "To get guided through Tails' settings, click on <b>Take a Tour</b> above" msgstr "Tails ayarlarını yapmak için yukarıdan <b>Tura Katılın</b>" -#: ../data/greeter.ui.h:20 +#: ../data/greeter.ui.h:22 msgid "Language & Region" msgstr "Dil ve Bölge" -#: ../data/greeter.ui.h:21 +#: ../data/greeter.ui.h:23 msgid "Default Settings" msgstr "Varsayılan Ayarlar" -#: ../data/greeter.ui.h:22 +#: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" msgstr "Dil ve Bölge Ayarlarını Kaydet" -#: ../data/greeter.ui.h:23 +#: ../data/greeter.ui.h:25 msgid "Language" msgstr "Dil" -#: ../data/greeter.ui.h:24 +#: ../data/greeter.ui.h:26 msgid "Keyboard Layout" msgstr "Tuş Takımı Düzeni" -#: ../data/greeter.ui.h:25 +#: ../data/greeter.ui.h:27 msgid "Formats" msgstr "Biçimler" -#: ../data/greeter.ui.h:26 +#: ../data/greeter.ui.h:28 msgid "Time Zone" msgstr "Saat Dilimi" -#: ../data/greeter.ui.h:27 +#: ../data/greeter.ui.h:29 msgid "Encrypted Persistent Storage" msgstr "Şifreli Kalıcı Depolama" -#: ../data/greeter.ui.h:28 +#: ../data/greeter.ui.h:30 msgid "Show Passphrase" msgstr "Parola Görüntülensin" -#: ../data/greeter.ui.h:29 +#: ../data/greeter.ui.h:31 msgid "Configure Persistent Storage" msgstr "Kalıcı Depolama Ayarları" -#: ../data/greeter.ui.h:30 +#: ../data/greeter.ui.h:32 msgid "Enter your passphrase to unlock the persistent storage" msgstr "Kalıcı depolamanın kilidini açmak için parolanızı yazın" -#: ../data/greeter.ui.h:31 ../tailsgreeter/gui.py:798 -#: ../tailsgreeter/gui.py:962 +#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:460 +#: ../tailsgreeter/gui.py:510 msgid "Unlock" msgstr "Kilidi Aç" -#: ../data/greeter.ui.h:32 +#: ../data/greeter.ui.h:34 msgid "Relock Persistent Storage" msgstr "Kalıcı Depolamayı Yeniden Kilitle" -#: ../data/greeter.ui.h:33 ../tailsgreeter/gui.py:514 +#: ../data/greeter.ui.h:35 +msgid "Your persistent storage is unlocked. Restart Tails to lock it again." +msgstr "" +"Kalıcı depolama kilidi açıldı. Yeniden kilitlemek için Tails uygulamasını " +"yeniden başlatın." + +#: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" msgstr "Ek Ayarlar" -#: ../data/greeter.ui.h:34 +#: ../data/greeter.ui.h:37 msgid "Save Additional Settings" msgstr "Ek Ayarları Kaydet" -#: ../data/greeter.ui.h:35 +#: ../data/greeter.ui.h:38 msgid "Add an additional setting" msgstr "Ek bir ayar ekle" -#: ../data/greeter.ui.h:36 +#: ../data/greeter.ui.h:39 msgid "Network Configuration" msgstr "Ağ Ayarları" -#: ../data/greeter.ui.h:37 +#: ../data/greeter.ui.h:40 msgid "" "If your Internet connection is censored, filtered, or proxied you can " "configure a Tor bridge or a local proxy. To work completely offline, you can" @@ -182,19 +200,19 @@ msgstr "" "kullanabilirsiniz. Tamamen çevrim dışı çalışmak için tüm ağları devre dışı " "bırakabilirsiniz." -#: ../data/greeter.ui.h:38 +#: ../data/greeter.ui.h:41 msgid "Connect directly to the Tor network (default)" msgstr "Doğrudan Tor ağına bağlanılsın (varsayılan)" -#: ../data/greeter.ui.h:39 +#: ../data/greeter.ui.h:42 msgid "Configure a Tor bridge, firewall, or proxy settings" msgstr "Bir Tor köpürüsü, güvenlik duvarı ya da vekil sunucu kulllanılsın" -#: ../data/greeter.ui.h:40 +#: ../data/greeter.ui.h:43 msgid "Disable all networking" msgstr "Tüm ağ devre dışı bırakılsın" -#: ../data/greeter.ui.h:41 +#: ../data/greeter.ui.h:44 msgid "" "The default settings are safe in most situations. To add a custom setting, " "press the \"+\" button below." @@ -202,79 +220,63 @@ msgstr "" "Çoğu durum için varsayılan ayarları kullanmak en güvenlisidir. Özel bir ayar" " eklemek için aşağıdaki \"+\" düğmesine tıklayın." -#: ../data/greeter.ui.h:42 ../tailsgreeter/gui.py:717 +#: ../data/greeter.ui.h:45 msgid "Off (default)" msgstr "Kapalı (varsayılan)" -#: ../data/greeter.ui.h:43 ../tailsgreeter/gui.py:715 +#: ../data/greeter.ui.h:46 msgid "On (default)" msgstr "Açık (varsayılan)" -#: ../data/greeter.ui.h:44 +#: ../data/greeter.ui.h:47 msgid "Network Connection" msgstr "Ağ Bağlantısı" -#: ../data/greeter.ui.h:45 ../tailsgreeter/gui.py:914 +#: ../data/greeter.ui.h:48 ../tailsgreeter/gui.py:367 msgid "Direct (default)" msgstr "Doğrudan (varsayılan)" -#: ../tailsgreeter/gui.py:456 -msgid "Shutdown" -msgstr "Kapat" +#: ../tailsgreeter/gui.py:373 +msgid "Bridge & Proxy" +msgstr "Köprü ve Vekil Sunucu" -#: ../tailsgreeter/gui.py:462 -msgid "Start Tails" -msgstr "Tails Başlatılsın" +#: ../tailsgreeter/gui.py:379 +msgid "Offline" +msgstr "Çevrim Dışı" + +#: ../tailsgreeter/gui.py:463 +msgid "Failed to relock persistent storage." +msgstr "Kalıcı depolama yeniden kilitlenemedi." -#: ../tailsgreeter/gui.py:523 +#: ../tailsgreeter/gui.py:481 +msgid "Unlocking…" +msgstr "Kilit açılıyor..." + +#: ../tailsgreeter/gui.py:562 msgid "Cancel" msgstr "İptal" -#: ../tailsgreeter/gui.py:527 +#: ../tailsgreeter/gui.py:566 msgid "Add" msgstr "Ekle" -#: ../tailsgreeter/gui.py:534 +#: ../tailsgreeter/gui.py:572 msgid "Back" msgstr "Geri" -#: ../tailsgreeter/gui.py:652 -msgid "Unlocking…" -msgstr "Kilit açılıyor..." - -#: ../tailsgreeter/gui.py:680 -msgid "" -"You will configure the Tor bridge and local proxy later on after connecting " -"to a network." -msgstr "" -"Bir ağa bağlandıktan sonra Tor köprüsü ya da yerel vekil sunucu " -"kullanabilirsiniz." - -#: ../tailsgreeter/gui.py:720 -msgid "On" -msgstr "Açık" - -#: ../tailsgreeter/gui.py:722 -msgid "Off" -msgstr "Kapalı" - -#: ../tailsgreeter/gui.py:801 -msgid "Failed to relock persistent storage." -msgstr "Kalıcı depolama yeniden kilitlenemedi." +#: ../tailsgreeter/gui.py:658 +msgid "Shutdown" +msgstr "Kapat" -#: ../tailsgreeter/gui.py:920 -msgid "Bridge & Proxy" -msgstr "Köprü ve Vekil Sunucu" +#: ../tailsgreeter/gui.py:664 +msgid "Start Tails" +msgstr "Tails Başlatılsın" -#: ../tailsgreeter/gui.py:926 -msgid "Offline" -msgstr "Çevrim Dışı" +#: ../tailsgreeter/language.py:119 +msgid "default:LTR" +msgstr "Varsayılan: Soldan Sağa" -#: ../tailsgreeter/gui.py:965 -msgid "Cannot unlock encrypted storage with this passphrase." -msgstr "Bu parola ile şifreli depolama alanının kilidi açılamadı." - -#: ../tailsgreeter/persistence.py:96 +#: ../tailsgreeter/persistence.py:89 #, python-brace-format msgid "" "live-persist failed with return code {returncode}:\n" @@ -283,8 +285,7 @@ msgstr "" "live-persist şu hata kodu ile yürütülemedi {returncode}:\n" "{stderr}" -#: ../tailsgreeter/persistence.py:138 ../tailsgreeter/persistence.py:163 -#: ../tailsgreeter/persistence.py:186 +#: ../tailsgreeter/persistence.py:120 ../tailsgreeter/persistence.py:137 #, python-brace-format msgid "" "cryptsetup failed with return code {returncode}:\n" @@ -295,7 +296,18 @@ msgstr "" "{stdout}\n" "{stderr}" -#: ../tailsgreeter/persistence.py:206 +#: ../tailsgreeter/persistence.py:154 +#, python-brace-format +msgid "" +"live-persist failed with return code {returncode}:\n" +"{stdout}\n" +"{stderr}" +msgstr "" +"live-persist şu hata kodu ile yürütülemedi {returncode}:\n" +"{stdout}\n" +"{stderr}" + +#: ../tailsgreeter/persistence.py:168 #, python-brace-format msgid "" "umount failed with return code {returncode}:\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 07 Feb '17

07 Feb '17

commit 3e134b996b1c13cfeff40573b44257fff4750e60 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 05:18:12 2017 +0000 Update translations for tails-greeter-2 --- tr/tr.po | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tr/tr.po b/tr/tr.po index 78a7ccf..7adad47 100644 --- a/tr/tr.po +++ b/tr/tr.po @@ -170,6 +170,8 @@ msgstr "Kalıcı Depolamayı Yeniden Kilitle" #: ../data/greeter.ui.h:35 msgid "Your persistent storage is unlocked. Restart Tails to lock it again." msgstr "" +"Kalıcı depolama kilidi açıldı. Yeniden kilitlemek için Tails uygulamasını " +"yeniden başlatın." #: ../data/greeter.ui.h:36 ../tailsgreeter/gui.py:554 msgid "Additional Settings" @@ -272,7 +274,7 @@ msgstr "Tails Başlatılsın" #: ../tailsgreeter/language.py:119 msgid "default:LTR" -msgstr "" +msgstr "Varsayılan: Soldan Sağa" #: ../tailsgreeter/persistence.py:89 #, python-brace-format @@ -301,6 +303,9 @@ msgid "" "{stdout}\n" "{stderr}" msgstr "" +"live-persist şu hata kodu ile yürütülemedi {returncode}:\n" +"{stdout}\n" +"{stderr}" #: ../tailsgreeter/persistence.py:168 #, python-brace-format

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 07 Feb '17

07 Feb '17

commit 2b70c54691a400038f500e30b71279e233f04ee2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 05:16:24 2017 +0000 Update translations for abouttor-homepage_completed --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 4bac15e..865f062 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Tarayıcısı Kullanıcı Rehberi »"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Kullanım Kılavuzu"> <!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 07 Feb '17

07 Feb '17

commit 96a213f7da1024cc90a324391cda48b574af7bff Author: Translation commit bot <translation(a)torproject.org> Date: Tue Feb 7 05:16:17 2017 +0000 Update translations for abouttor-homepage --- tr/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tr/aboutTor.dtd b/tr/aboutTor.dtd index 20917f8..865f062 100644 --- a/tr/aboutTor.dtd +++ b/tr/aboutTor.dtd @@ -30,7 +30,7 @@ <!ENTITY aboutTor.whatnext.label "Anonim Kalma İpuçları »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Kullanım Kılavuzu"> <!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US"> <!ENTITY aboutTor.helpInfo1.label "Yardım Edebilirsiniz!"> <!ENTITY aboutTor.helpInfo2.label "Tor ağını daha hızlı güçlü kılmaya yardımcı olabilmenin çeşitli yolları var:">

1 0

[tor-browser-build/master] Include *.zip files in sha256sums-unsigned-build.txt
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit 444f6e2210d62b5fd6ab8c204a1c93594bf37ec4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 14:04:06 2017 +0100 Include *.zip files in sha256sums-unsigned-build.txt --- projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index 527e269..09b4c0e 100644 --- a/projects/release/config +++ b/projects/release/config @@ -124,5 +124,5 @@ build: | mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt + sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt cat sha256sums-unsigned-build.txt

1 0

[tor-browser-build/master] Add option to sign the sha256sums-unsigned-build.txt file
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit c0242adc7a6a414bb183a3f07dddd64b7e3a51bc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 19:23:44 2017 +0100 Add option to sign the sha256sums-unsigned-build.txt file --- README | 9 +++++++++ projects/release/config | 3 +++ 2 files changed, 12 insertions(+) diff --git a/README b/README index 0b8e510..2c36d74 100644 --- a/README +++ b/README @@ -149,6 +149,15 @@ the build files in the tor-browser-builds/ directory (unless you changed the publish_dir option). +Signing builds +-------------- + +If the environment variable RBM_SIGN_BUILD is set to 1, the +sha256sums-unsigned-build.txt file will be signed with gpg. +You can use the RBM_GPG_OPTS environment variable to add some options +to the gpg command used to sign the file. + + Cleaning obsolete files and containers images --------------------------------------------- diff --git a/projects/release/config b/projects/release/config index 09b4c0e..daa78dd 100644 --- a/projects/release/config +++ b/projects/release/config @@ -125,4 +125,7 @@ build: | [% END -%] cd "$destdir" sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt + [% IF ENV.RBM_SIGN_BUILD -%] + gpg -abs [% ENV.RBM_GPG_OPTS %] sha256sums-unsigned-build.txt + [% END -%] cat sha256sums-unsigned-build.txt

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Feb '17

06 Feb '17

commit 523eede072086f4ee72baba2c71df9194f334ec5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 6 18:18:18 2017 +0000 Update translations for tor-browser-manual --- nl/nl.po | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index df9adce..3493cf7 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -6,12 +6,13 @@ # Stijn <stijn.vansieleghem(a)gmail.com>, 2016 # André Koot <meneer(a)tken.net>, 2016 # Wim <wikkesjr(a)gmail.com>, 2017 +# Stefan Roukens <info(a)stefanroukens.nl>, 2017 msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "POT-Creation-Date: 2016-12-06 16:36-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Wim <wikkesjr(a)gmail.com>, 2017\n" +"Last-Translator: Stefan Roukens <info(a)stefanroukens.nl>, 2017\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -283,7 +284,7 @@ msgstr "" #: circumvention.page:60 msgid "Which transport should I use?" -msgstr "" +msgstr "Welk transport zal ik gebruiken?" #: circumvention.page:61 msgid "" @@ -1230,7 +1231,7 @@ msgstr "" #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "" +msgstr "Wat te doen als de Tor Browser niet werkt" #: troubleshooting.page:12 msgid "" @@ -1303,7 +1304,7 @@ msgstr "" #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "Hoe verwijder je de Tor Browser van je systeem" #: uninstalling.page:10 msgid "Uninstalling" @@ -1368,7 +1369,7 @@ msgstr "" #: updating.page:26 msgid "Updating Tor Browser automatically" -msgstr "" +msgstr "Tor Browser automatisch bijwerken" #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1407,6 +1408,8 @@ msgid "" "When Tor Browser has finished checking for updates, click on the “Update” " "button." msgstr "" +"Als de Tor Browser klaar is met het controleren voor beschikbare updates, " +"klik dan vervolgens op de \"Update\" knop." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to

1 0

[tor-browser-bundle/master] Bug 21402: verify sandbox git tag's gpg signature
by gk＠torproject.org 06 Feb '17

06 Feb '17

commit 917d38c1d58c8cb11ff5b016054d2589d313882e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 13:43:44 2017 +0100 Bug 21402: verify sandbox git tag's gpg signature --- gitian/verify-tags.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index e8dfe3f..4b17550 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -104,6 +104,7 @@ meek meek.gpg $MEEK_TAG obfs4 obfs4proxy.gpg $OBFS4_TAG https-everywhere https-everywhere.gpg $HTTPSE_TAG cmake cmake.gpg $CMAKE_TAG +sandbox obfs4proxy.gpg $SANDBOX_TAG EOF while read dir commit; do

1 0

[tor-browser-build/master] Add linux sandbox
by boklm＠torproject.org 06 Feb '17

06 Feb '17

commit 918acde2b07acc72313ed8f69f0fd4a2622d772a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Feb 6 13:58:21 2017 +0100 Add linux sandbox --- projects/go/config | 9 ++++++++- projects/goerrors/config | 16 ++++++++++++++++ projects/gogb/config | 22 ++++++++++++++++++++++ projects/gogb/gb-build-dir.patch | 31 +++++++++++++++++++++++++++++++ projects/release/config | 8 ++++++++ projects/sandbox/build | 27 +++++++++++++++++++++++++++ projects/sandbox/config | 29 +++++++++++++++++++++++++++++ 7 files changed, 141 insertions(+), 1 deletion(-) diff --git a/projects/go/config b/projects/go/config index a5920f5..9341f98 100644 --- a/projects/go/config +++ b/projects/go/config @@ -12,7 +12,7 @@ var: export GOOS=[% c("var/GOOS") %] export GOARCH=[% c("var/GOARCH") %] export GOPATH=/var/tmp/dist/gopath - export PATH=/var/tmp/dist/go/bin:"$PATH" + export PATH=/var/tmp/dist/go/bin:/var/tmp/dist/gopath/bin:"$PATH" # Template build script for building a go library. # This can be called as projects/go/var/build_go_lib. @@ -26,9 +26,16 @@ var: distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz + [% FOREACH dep = c("var/go_lib_deps") -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %] + [% END -%] mkdir -p $(dirname "$GOPATH/src/[% c("var/go_lib") %]") mv /var/tmp/build/[% project %]-[% c('version') %] "$GOPATH/src/[% c("var/go_lib") %]" cd "$GOPATH/src/[% c("var/go_lib") %]" + for p in $(ls -1 $rootdir/*.patch 2> /dev/null | sort) + do + patch -p1 < $p + done [% IF c("var/go_lib_install") -%] [% FOREACH inst IN c("var/go_lib_install") %] go install [% inst %] diff --git a/projects/goerrors/config b/projects/goerrors/config new file mode 100644 index 0000000..4451f7b --- /dev/null +++ b/projects/goerrors/config @@ -0,0 +1,16 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/pkg/errors +git_hash: 248dadf4e9068a0b3e79f02ed0a610d935de5302 +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/pkg/errors + +input_files: + - project: docker-image + - name: go + project: go diff --git a/projects/gogb/config b/projects/gogb/config new file mode 100644 index 0000000..a358819 --- /dev/null +++ b/projects/gogb/config @@ -0,0 +1,22 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/constabulary/gb +git_hash: 06cc925cce6592e922dcc4839a8b44feb384e71e +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 + +build: '[% c("projects/go/var/build_go_lib") %]' + +var: + go_lib: github.com/constabulary/gb + go_lib_install: github.com/constabulary/gb/cmd/gb + go_lib_deps: + - goerrors + +input_files: + - project: docker-image + - name: go + project: go + - name: goerrors + project: goerrors + - filename: gb-build-dir.patch diff --git a/projects/gogb/gb-build-dir.patch b/projects/gogb/gb-build-dir.patch new file mode 100644 index 0000000..a52ca69 --- /dev/null +++ b/projects/gogb/gb-build-dir.patch @@ -0,0 +1,31 @@ +From a7b198e3a32509197150d7c2767262a7319ff339 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Tue, 6 Dec 2016 21:34:16 +0000 +Subject: [PATCH] Make the gb build directory deterministic + + +diff --git a/context.go b/context.go +index 53c00da..d040082 100644 +--- a/context.go ++++ b/context.go +@@ -3,7 +3,6 @@ package gb + import ( + "fmt" + "io" +- "io/ioutil" + "os" + "os/exec" + "path/filepath" +@@ -136,7 +135,8 @@ func NewContext(p Project, opts ...func(*Context) error) (*Context, error) { + }, + GcToolchain(), + } +- workdir, err := ioutil.TempDir("", "gb") ++ workdir := filepath.Join(os.TempDir(), "gb") ++ err := os.Mkdir(workdir, 0777) + if err != nil { + return nil, err + } +-- +2.10.2 + diff --git a/projects/release/config b/projects/release/config index 26dd8b7..527e269 100644 --- a/projects/release/config +++ b/projects/release/config @@ -75,6 +75,13 @@ input_files: - '[% c("var/build_target") %]' - torbrowser-linux-x86_64 + - name: sandbox-linux-x86_64 + project: sandbox + enable: '[% c("var/torbrowser-linux-x86_64") %]' + target: + - '[% c("var/build_target") %]' + - torbrowser-linux-x86_64 + - name: linux-i686 project: tor-browser enable: '[% c("var/torbrowser-linux-i686") %]' @@ -114,6 +121,7 @@ build: | [% END -%] [% IF c("var/torbrowser-linux-x86_64") -%] mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv [% c('input_files_by_name/sandbox-linux-x86_64') %] "$destdir"/sandbox-[% pc('sandbox', 'version') %]-linux64.zip [% END -%] cd "$destdir" sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt diff --git a/projects/sandbox/build b/projects/sandbox/build new file mode 100644 index 0000000..28b5a48 --- /dev/null +++ b/projects/sandbox/build @@ -0,0 +1,27 @@ +#!/bin/bash +set -e +rootdir=$(pwd) +[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %] +distdir=/var/tmp/dist/[% project %] +mkdir -p $distdir + +tar -C /var/tmp/dist -xf [% c('input_files_by_name/gogb') %] + +mkdir -p /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz +cd /var/tmp/build/[% project %]-[% c('version') %] + +# we don't have access to the git repository during the build +sed -i Makefile -e 's|git rev-parse --short HEAD > data/revision|echo [% c("abbrev") %] > data/revision|' +# Unset GOOS and GOARCH as they change some file names, and we don't need +# them as we are only building on x86_64 +unset GOOS +unset GOARCH +make +cp bin/sandboxed-tor-browser $distdir + +cd $distdir/.. +[% c('zip', { + zip_src => [ project ], + zip_args => dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/sandbox/config b/projects/sandbox/config new file mode 100644 index 0000000..54fe4df --- /dev/null +++ b/projects/sandbox/config @@ -0,0 +1,29 @@ +# vim: filetype=yaml sw=2 +version: 0.0.3 +git_url: https://git.schwanenlied.me/yawning/sandboxed-tor-browser +git_hash: 'sandboxed-tor-browser-[% c("version") %]' +tag_gpg_id: 1 +gpg_keyring: obfs4.gpg +filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 +distribution: Debian-8.7 + +var: + deps: + - libx11-dev + - pkg-config + - libgtk-3-dev + - libnotify-dev + - zip + +targets: + nightly: + git_hash: master + tag_gpg_id: 0 + +input_files: + - project: docker-image + - name: go + project: go + - name: gogb + project: gogb

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 06 Feb '17

06 Feb '17

commit fc0952a2686208e8883fb275d63cdc7f32591fb8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Feb 6 11:48:20 2017 +0000 Update translations for tor-browser-manual --- vi/vi.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 422e118..e1acbe2 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -1307,11 +1307,11 @@ msgstr "" #: updating.page:6 msgid "How to update Tor Browser" -msgstr "" +msgstr "Làm thế nào để cập nhật Trình duyệt Tor" #: updating.page:10 msgid "Updating" -msgstr "" +msgstr "Cập nhật" #: updating.page:12 msgid "" @@ -1319,10 +1319,10 @@ msgid "" "outdated version of the software, you may be vulnerable to serious security " "flaws that compromise your privacy and anonymity." msgstr "" -"Trình duyệt Tor phải luôn được cập nhật tại mọi thời điểm. Nếu bạn tiếp tục " -"sử dụng một phiên bản đã hết hạn của Tor, bạn có thể suy yếu trước các lỗ " -"hổng bảo mật nghiêm trọng và điều này đặt sự riêng tư và tính ẩn danh của " -"bạn vào nguy hiểm." +"Trình duyệt Tor phải luôn cập nhật tại mọi thời điểm. Nếu bạn tiếp tục sử " +"dụng một phiên bản đã hết hạn của Tor, bạn có thể suy yếu trước các lỗ hổng " +"bảo mật nghiêm trọng và điều này đặt sự riêng tư và tính ẩn danh của bạn vào" +" nguy hiểm." #: updating.page:18 msgid ""

1 0