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

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit d5e4b67cc48e621c902f5803435660e4d384b234 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 13:15:20 2014 +0000 Update translations for tails-persistence-setup --- pt_BR/pt_BR.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/pt_BR.po b/pt_BR/pt_BR.po index 4a016ab..90da67a 100644 --- a/pt_BR/pt_BR.po +++ b/pt_BR/pt_BR.po @@ -5,6 +5,7 @@ # Translators: # Communia <ameaneantie(a)riseup.net>, 2013 # bruuh <bruuh(a)outlook.com>, 2012 +# carlo_valente <carlo.gt.valente(a)gmail.com>, 2014 # Communia <ameaneantie(a)riseup.net>, 2013 # ebonsi, 2013 # bruuh <bruuh(a)outlook.com>, 2012 @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-17 12:54+0000\n" +"Last-Translator: carlo_valente <carlo.gt.valente(a)gmail.com>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/torproject/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -178,7 +179,7 @@ msgstr "O dispositivo %s é ótico." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" +msgstr "O dispositivo %s não foi criado usando o Instalador Tails." #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error"

1 0

[tor-browser-bundle/master] Version bump.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit bc2cb177a16d8e34b359175e0804b133635a0c62 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 14:45:28 2014 +0000 Version bump. HTTPS-Everywhere has a new stable version, 3.5. Adding that to all version files. Additionally, updating the tor, Tor Browser and TorLauncher tag in the alpha version file. --- gitian/versions | 2 +- gitian/versions.alpha | 8 ++++---- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index a1e6384..addcb3b 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 650103a..56192a8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -6,11 +6,11 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.4.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 -TOR_TAG=tor-0.2.5.2-alpha -TORLAUNCHER_TAG=0.2.5.1a +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 +TOR_TAG=tor-0.2.5.3-alpha +TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 9d6a8f0..95e7235 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.4.5 +HTTPSE_TAG=3.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1869182..74455b6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,7 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=3.4.5 # XXX: Master and 4.0 require python2.7 +HTTPSE_TAG=3.5 # XXX: Master and 4.0 require python2.7 NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

[tor-browser-bundle/master] Set the bundle version in the bundle descriptor.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 62ca5505e07fd86add646b97f82caf136e39b348 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 14:06:38 2014 +0000 Set the bundle version in the bundle descriptor. We used to set the bundle version in the browser descriptor which had the bad side-effect that we needed to rebuild the whole Tor Browser just in order to change the bundle version. We do that now in the bundle descriptor instead. --- gitian/descriptors/linux/gitian-bundle.yml | 5 +++++ gitian/descriptors/linux/gitian-firefox.yml | 6 +----- gitian/descriptors/mac/gitian-bundle.yml | 5 +++++ gitian/descriptors/mac/gitian-firefox.yml | 4 ---- gitian/descriptors/windows/gitian-bundle.yml | 5 +++++ gitian/descriptors/windows/gitian-firefox.yml | 6 +----- 6 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index fa78928..39a7747 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -118,6 +119,10 @@ script: | # pushd tor-browser_en-US/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 282ea49..1f2cf12 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -5,7 +5,7 @@ suites: architectures: - "i386" - "amd64" -packages: +packages: - "faketime" - "unzip" - "zip" @@ -29,7 +29,6 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "torbrowser.version" - "re-dzip.sh" - "dzip.sh" - "python.tar.bz2" @@ -73,9 +72,6 @@ script: | fi # cd tor-browser - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 4928acb..b7ecf3a 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -46,6 +46,7 @@ files: - "versions" - "tbb-docs.zip" - "mac-tor.sh" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -146,6 +147,10 @@ script: | # pushd $TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale of the bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/mac/gitian-firefox.yml b/gitian/descriptors/mac/gitian-firefox.yml index e252888..1832f55 100644 --- a/gitian/descriptors/mac/gitian-firefox.yml +++ b/gitian/descriptors/mac/gitian-firefox.yml @@ -17,7 +17,6 @@ remotes: - "url": "https://git.torproject.org/tor-browser.git" "dir": "tor-browser" files: -- "torbrowser.version" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "x86_64-apple-darwin10.tar.xz" - "re-dzip.sh" @@ -51,9 +50,6 @@ script: | # cd tor-browser mv .mozconfig-mac .mozconfig - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index ac79d58..fddb611 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -39,6 +39,7 @@ files: - "bundle.inputs" - "versions" - "tbb-docs.zip" +- "torbrowser.version" script: | INSTDIR="$HOME/install" source versions @@ -115,6 +116,10 @@ script: | # pushd "Tor Browser"/Browser/browser/ unzip omni.ja defaults/preferences/000-tor-browser.js + # Set the version of the bundle. + grep -v '^pref(\"torbrowser.version\",' defaults/preferences/000-tor-browser.js > defaults/preferences/000-tor-browser.js.fixed + cat ~/build/torbrowser.version >> defaults/preferences/000-tor-browser.js.fixed + mv defaults/preferences/000-tor-browser.js.fixed defaults/preferences/000-tor-browser.js cp defaults/preferences/000-tor-browser.js ~/build/ # Set the locale bundle. echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index 1c151ea..fefb677 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -4,7 +4,7 @@ suites: - "precise" architectures: - "i386" -packages: +packages: - "git-core" - "unzip" - "zip" @@ -25,7 +25,6 @@ files: - "mingw-w64-svn-snapshot.zip" - "binutils.tar.bz2" - "gcc.tar.bz2" -- "torbrowser.version" - "re-dzip.sh" - "dzip.sh" - "i686-w64-mingw32-gcc" @@ -137,9 +136,6 @@ script: | # Our flags don't get passed to NSS. We need to do that manually using an # obscure one. export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec" - grep -v '^pref(\"torbrowser.version\",' browser/app/profile/000-tor-browser.js > browser/app/profile/000-tor-browser.js.fixed - cat ../torbrowser.version >> browser/app/profile/000-tor-browser.js.fixed - mv browser/app/profile/000-tor-browser.js.fixed browser/app/profile/000-tor-browser.js # .git and the src takes up a lot of useless space, and we need the space to build #git archive HEAD | tar -x -C $OUTDIR/src rm -rf .git

1 0

[translation/tails-iuk_completed] Update translations for tails-iuk_completed
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit 0033d0c67d94b44e4abc24b54a863bc5a565a183 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 12:15:53 2014 +0000 Update translations for tails-iuk_completed --- nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 980972a..8bba01c 100644 --- a/nb.po +++ b/nb.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 10:00+0000\n" +"POT-Creation-Date: 2014-04-16 17:54+0200\n" +"PO-Revision-Date: 2014-04-17 12:10+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "ingen automatisk oppgradering er tilgjengelig fra nettsiden vår til den #: ../lib/Tails/IUK/Frontend.pm:240 msgid "your device was not created using Tails Installer" -msgstr "enheten ble ikke opprettet ved å bruke Tails installereren" +msgstr "enheten din ble ikke opprettet med Tails installerer" #: ../lib/Tails/IUK/Frontend.pm:245 msgid "Tails was started from a DVD or a read-only device"

1 0

[translation/tails-iuk] Update translations for tails-iuk
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit 39c0452f5a2ee409a7242cf78cc72b99ac26436d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 12:15:50 2014 +0000 Update translations for tails-iuk --- nb.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nb.po b/nb.po index 980972a..8bba01c 100644 --- a/nb.po +++ b/nb.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2014-03-05 15:11+0100\n" -"PO-Revision-Date: 2014-03-06 10:00+0000\n" +"POT-Creation-Date: 2014-04-16 17:54+0200\n" +"PO-Revision-Date: 2014-04-17 12:10+0000\n" "Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "ingen automatisk oppgradering er tilgjengelig fra nettsiden vår til den #: ../lib/Tails/IUK/Frontend.pm:240 msgid "your device was not created using Tails Installer" -msgstr "enheten ble ikke opprettet ved å bruke Tails installereren" +msgstr "enheten din ble ikke opprettet med Tails installerer" #: ../lib/Tails/IUK/Frontend.pm:245 msgid "Tails was started from a DVD or a read-only device"

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit e74c4eb9770f0f931f5214474749ba856f55f6eb Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 12:15:24 2014 +0000 Update translations for tails-persistence-setup_completed --- ja/ja.po | 52 ++++++++++++++++++++++++++-------------------------- nb/nb.po | 18 +++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index a1d5a03..4c6337f 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# plazmism <gomidori(a)live.jp>, 2013 +# plazmism <gomidori(a)live.jp>, 2013-2014 # Masaki Saito <rezoolab(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-11-07 16:37+0100\n" -"PO-Revision-Date: 2013-11-15 09:19+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-04-16 21:26+0200\n" +"PO-Revision-Date: 2014-04-17 11:46+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -120,67 +120,67 @@ msgstr "`ドットファイル'ディレクトリで見つかった$HOMEの各 msgid "Setup Tails persistent volume" msgstr "Talisの永続的ボリュームをセットアップ" -#: ../lib/Tails/Persistence/Setup.pm:331 +#: ../lib/Tails/Persistence/Setup.pm:337 #, perl-format msgid "Device %s already has a persistent volume." msgstr "デバイス %s にはすでに永続的ボリュームがあります。" -#: ../lib/Tails/Persistence/Setup.pm:339 +#: ../lib/Tails/Persistence/Setup.pm:345 #, perl-format msgid "Device %s has not enough unallocated space." msgstr "デバイス %s には十分な未割り当て領域がありません。" -#: ../lib/Tails/Persistence/Setup.pm:347 ../lib/Tails/Persistence/Setup.pm:361 +#: ../lib/Tails/Persistence/Setup.pm:353 ../lib/Tails/Persistence/Setup.pm:367 #, perl-format msgid "Device %s has no persistent volume." msgstr "デバイス %s には永続的ボリュームがありません。" -#: ../lib/Tails/Persistence/Setup.pm:353 +#: ../lib/Tails/Persistence/Setup.pm:359 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." msgstr "使用中の間は永続的ボリュームを削除出来ません。永続をオフにしてTailsを再起動すべきです。" -#: ../lib/Tails/Persistence/Setup.pm:372 +#: ../lib/Tails/Persistence/Setup.pm:378 msgid "Persistence volume is not unlocked." msgstr "永続的ボリュームがアンロックされていません。" -#: ../lib/Tails/Persistence/Setup.pm:377 +#: ../lib/Tails/Persistence/Setup.pm:383 msgid "Persistence volume is not mounted." msgstr "永続的ボリュームがマウントされていません。" -#: ../lib/Tails/Persistence/Setup.pm:382 +#: ../lib/Tails/Persistence/Setup.pm:388 msgid "Persistence volume is not readable. Permissions or ownership problems?" msgstr "永続的ボリュームが読み込み可能ではありません。パーミッションや所有権に問題があるかもしれません。" -#: ../lib/Tails/Persistence/Setup.pm:387 +#: ../lib/Tails/Persistence/Setup.pm:393 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" msgstr "永続的ボリュームが書き込み可能ではありません。リードオンリーでマウントされた可能性があります。" -#: ../lib/Tails/Persistence/Setup.pm:396 +#: ../lib/Tails/Persistence/Setup.pm:402 #, perl-format msgid "Tails is running from non-USB / non-SDIO device %s." msgstr "Tailsは現在、USBまたはSDIOでないデバイス %s から動作しています。" -#: ../lib/Tails/Persistence/Setup.pm:402 +#: ../lib/Tails/Persistence/Setup.pm:408 #, perl-format msgid "Device %s is optical." msgstr "デバイス %sは光学機器です。" -#: ../lib/Tails/Persistence/Setup.pm:409 +#: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "デバイス %sはTails USB installerを用いて作成されませんでした。" +msgid "Device %s was not created using Tails Installer." +msgstr "デバイス %s は Tails インストーラーを使用して作成されませんでした。" -#: ../lib/Tails/Persistence/Setup.pm:444 +#: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "エラー" -#: ../lib/Tails/Persistence/Setup.pm:680 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "永続ウィザード -終了" -#: ../lib/Tails/Persistence/Setup.pm:683 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" @@ -289,28 +289,28 @@ msgstr "保存中..." msgid "Saving persistence configuration..." msgstr "永続的設定を保存中..." -#: ../lib/Tails/Persistence/Step/Delete.pm:40 +#: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" msgstr "永続ウィザード - 永続的ボリューム削除" -#: ../lib/Tails/Persistence/Step/Delete.pm:43 +#: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." msgstr "あなたの永続データが削除されます。" -#: ../lib/Tails/Persistence/Step/Delete.pm:47 +#: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the <b>%s %s</b> device, will be deleted." msgstr "永続ボリューム %s (%s) (<b>%s %s</b>デバイス上) は削除されます。" -#: ../lib/Tails/Persistence/Step/Delete.pm:53 +#: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" msgstr "削除" -#: ../lib/Tails/Persistence/Step/Delete.pm:91 +#: ../lib/Tails/Persistence/Step/Delete.pm:101 msgid "Deleting..." msgstr "削除中..." -#: ../lib/Tails/Persistence/Step/Delete.pm:94 +#: ../lib/Tails/Persistence/Step/Delete.pm:104 msgid "Deleting the persistent volume..." msgstr "永続的ボリュームを削除中..." diff --git a/nb/nb.po b/nb/nb.po index 52cf902..a2a2f88 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Ylada <4d233f20(a)opayq.com>, 2013 -# lateralus, 2013 +# Ylada <jan.erik.ek(a)gmail.com>, 2013 +# lateralus, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2013-12-19 12:20+0100\n" -"PO-Revision-Date: 2013-12-31 03:00+0000\n" -"Last-Translator: Ylada <4d233f20(a)opayq.com>\n" +"POT-Creation-Date: 2014-04-16 21:26+0200\n" +"PO-Revision-Date: 2014-04-17 12:08+0000\n" +"Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -169,18 +169,18 @@ msgstr "Enheten %s er optisk." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format -msgid "Device %s was not created using Tails USB installer." -msgstr "Enheten %s ble ikke laget ved å bruke Tails USB installerer." +msgid "Device %s was not created using Tails Installer." +msgstr "Enhet %s ble ikke opprettet med Tails installerer." #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" msgstr "Feil" -#: ../lib/Tails/Persistence/Setup.pm:665 +#: ../lib/Tails/Persistence/Setup.pm:670 msgid "Persistence wizard - Finished" msgstr "Veiviser for vedvarende enget - Ferdig" -#: ../lib/Tails/Persistence/Setup.pm:668 +#: ../lib/Tails/Persistence/Setup.pm:673 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Apr '14

17 Apr '14

commit bdfc3b0dc46b55095a50f07258055fbdf61c0d4c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 17 12:15:21 2014 +0000 Update translations for tails-persistence-setup --- ja/ja.po | 8 ++++---- nb/nb.po | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index b3d18de..4c6337f 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# plazmism <gomidori(a)live.jp>, 2013 +# plazmism <gomidori(a)live.jp>, 2013-2014 # Masaki Saito <rezoolab(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-17 11:46+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,7 +170,7 @@ msgstr "デバイス %sは光学機器です。" #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" +msgstr "デバイス %s は Tails インストーラーを使用して作成されませんでした。" #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error" diff --git a/nb/nb.po b/nb/nb.po index e2d4da6..a2a2f88 100644 --- a/nb/nb.po +++ b/nb/nb.po @@ -4,14 +4,14 @@ # # Translators: # Ylada <jan.erik.ek(a)gmail.com>, 2013 -# lateralus, 2013 +# lateralus, 2013-2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2014-04-16 21:26+0200\n" -"PO-Revision-Date: 2014-04-17 09:09+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-04-17 12:08+0000\n" +"Last-Translator: lateralus\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/torproject/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,7 +170,7 @@ msgstr "Enheten %s er optisk." #: ../lib/Tails/Persistence/Setup.pm:415 #, perl-format msgid "Device %s was not created using Tails Installer." -msgstr "" +msgstr "Enhet %s ble ikke opprettet med Tails installerer." #: ../lib/Tails/Persistence/Setup.pm:450 msgid "Error"

1 0

[tor-browser-bundle/master] Bug 11539: Update PTs when building nightlies.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit e47484df829eefead58ed10c8541a493c0ba6e3a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 12:40:53 2014 +0000 Bug 11539: Update PTs when building nightlies. We have to update branches to build the latest and greatest Pluggable Transport code. In order to do so we need to tell update_git() the corresponding tag. --- gitian/fetch-inputs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index e80713b..6b8ae99 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -297,10 +297,10 @@ https-everywhere https://git.torproject.org/https-everywhere.git $HTTPSE_TA torbutton https://git.torproject.org/torbutton.git $TORBUTTON_TAG tor-launcher https://git.torproject.org/tor-launcher.git $TORLAUNCHER_TAG tor-browser https://git.torproject.org/tor-browser.git $TORBROWSER_TAG -pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git -obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git -flashproxy https://git.torproject.org/flashproxy.git -fteproxy https://github.com/kpdyer/fteproxy.git +pyptlib https://git.torproject.org/pluggable-transports/pyptlib.git $PYPTLIB_TAG +obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPROXY_TAG +flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG +fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG EOF

1 0

[tor-browser-bundle/master] Bug 11535: Hardcoding obfsproxy commit.
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 612972b1eb3ac54754467c66ab146baa800f5eb8 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 11:14:09 2014 +0000 Bug 11535: Hardcoding obfsproxy commit. Until #11535 is getting fixed we are hardcoding commit b58fd9e1ef264796b6bddbde5db117472fb674a0 to avoid a broken obfsproxy in nightly builds. --- gitian/versions.nightly | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index c54df5a..79930f7 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -16,7 +16,8 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master -OBFSPROXY_TAG=master +# Hardcoding this commit until #11535 is fixed +OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0 FLASHPROXY_TAG=master FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014

1 0

[tor-browser-bundle/master] Merge remote-tracking branch 'kpdyer/master'
by gk＠torproject.org 17 Apr '14

17 Apr '14

commit 7df52e4294bcb0fff50c34bffe7aca38a9b88b61 Merge: e1623db a6208dc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Apr 17 12:29:21 2014 +0000 Merge remote-tracking branch 'kpdyer/master' gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- gitian/versions.nightly | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --cc gitian/versions.nightly index 79930f7,c2d2997..1869182 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@@ -16,10 -16,9 +16,10 @@@ ZLIB_TAG=v1.2. LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master -OBFSPROXY_TAG=master +# Hardcoding this commit until #11535 is fixed +OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0 FLASHPROXY_TAG=master - FTEPROXY_TAG=master + FTEPROXY_TAG=0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0