August 2015 - tor-commits - lists.torproject.org

[tor/master] Add test_keygen tests for all log outputs; improve keygen outputs.
by nickm＠torproject.org 19 Aug '15

19 Aug '15

commit 138b28dc35c96ad4d8206a1e78a75a1072df0aa4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 6 11:57:00 2015 -0400 Add test_keygen tests for all log outputs; improve keygen outputs. --- src/or/routerkeys.c | 34 ++++++++++++++++++++++++++++------ src/test/test_keygen.sh | 20 +++++++++++++++----- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 478f6c7..125fe75 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -376,7 +376,8 @@ ed_key_init_from_file(const char *fname, uint32_t flags, tor_log(severity, LD_OR, "Couldn't repair %s", public_fname); goto err; } else { - tor_log(severity, LD_OR, "Found secret key but not %s. Regenerating.", + tor_log(LOG_NOTICE, LD_OR, + "Found secret key but not %s. Regenerating.", public_fname); } } @@ -384,12 +385,29 @@ ed_key_init_from_file(const char *fname, uint32_t flags, } /* If the secret key is absent and it's not allowed to be, fail. */ - if (!have_secret && found_public && !(flags & INIT_ED_KEY_MISSING_SECRET_OK)) + if (!have_secret && found_public && + !(flags & INIT_ED_KEY_MISSING_SECRET_OK)) { + if (have_encrypted_secret_file) { + tor_log(severity, LD_OR, "We needed to load a secret key from %s, " + "but it was encrypted. Try tor --keygen instead.", + secret_fname); + } else { + tor_log(severity, LD_OR, "We needed to load a secret key from %s, " + "but couldn't find it.", secret_fname); + } goto err; + } /* If it's absent, and we're not supposed to make a new keypair, fail. */ - if (!have_secret && !found_public && !(flags & INIT_ED_KEY_CREATE)) + if (!have_secret && !found_public && !(flags & INIT_ED_KEY_CREATE)) { + if (split) { + tor_log(severity, LD_OR, "No key found in %s or %s.", + secret_fname, public_fname); + } else { + tor_log(severity, LD_OR, "No key found in %s.", secret_fname); + } goto err; + } /* If the secret key is absent, but the encrypted key would be present, * that's an error */ @@ -471,8 +489,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags, goto done; /* If we didn't get a cert, and we're not supposed to make one, fail. */ - if (!signing_key || !(flags & INIT_ED_KEY_CREATE)) + if (!signing_key || !(flags & INIT_ED_KEY_CREATE)) { + tor_log(severity, LD_OR, "Without signing key, can't create certificate"); goto err; + } /* We have keys but not a certificate, so make one. */ uint32_t cert_flags = 0; @@ -483,8 +503,10 @@ ed_key_init_from_file(const char *fname, uint32_t flags, now, lifetime, cert_flags); - if (! cert) + if (! cert) { + tor_log(severity, LD_OR, "Couldn't create certificate"); goto err; + } /* Write it to disk. */ created_cert = 1; @@ -674,7 +696,7 @@ load_ed_keys(const or_options_t *options, time_t now) if (need_new_signing_key) { FAIL("Missing identity key"); } else { - log_warn(LD_OR, "master public key was absent; inferring from " + log_warn(LD_OR, "Master public key was absent; inferring from " "public key in signing certificate"); tor_assert(check_signing_cert); id = tor_malloc_zero(sizeof(*id)); diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh index 50d54aa..1005bb8 100755 --- a/src/test/test_keygen.sh +++ b/src/test/test_keygen.sh @@ -117,9 +117,11 @@ ME="${DATA_DIR}/case2a" SRC="${DATA_DIR}/orig" mkdir -p "${ME}/keys" cp "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/" -${TOR} --DataDirectory "${ME}" --list-fingerprint && die "Somehow succeeded when missing secret key, certs" || true +${TOR} --DataDirectory "${ME}" --list-fingerprint > "${ME}/stdout" && die "Somehow succeeded when missing secret key, certs" || true check_files_eq "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/ed25519_master_id_public_key" +grep "We needed to load a secret key.*but couldn't find it" "${ME}/stdout" >/dev/null || die "Tor didn't declare that it was missing a secret key" + echo "==== Case 2A ok" fi @@ -133,11 +135,13 @@ SRC="${DATA_DIR}/encrypted" mkdir -p "${ME}/keys" cp "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/" cp "${SRC}/keys/ed25519_master_id_secret_key_encrypted" "${ME}/keys/" -${TOR} --DataDirectory "${ME}" --list-fingerprint && dir "Somehow succeeded with encrypted secret key, missing certs" +${TOR} --DataDirectory "${ME}" --list-fingerprint > "${ME}/stdout" && dir "Somehow succeeded with encrypted secret key, missing certs" check_files_eq "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/ed25519_master_id_public_key" check_files_eq "${SRC}/keys/ed25519_master_id_secret_key_encrypted" "${ME}/keys/ed25519_master_id_secret_key_encrypted" +grep "We needed to load a secret key.*but it was encrypted.*--keygen" "${ME}/stdout" >/dev/null || die "Tor didn't declare that it was missing a secret key and suggest --keygen." + echo "==== Case 2B ok" fi @@ -230,10 +234,12 @@ SRC="${DATA_DIR}/encrypted" mkdir -p "${ME}/keys" cp "${SRC}/keys/ed25519_master_id_secret_key_encrypted" "${ME}/keys/" -${TOR} --DataDirectory "${ME}" --list-fingerprint && die "Tor started with only encrypted secret key!" +${TOR} --DataDirectory "${ME}" --list-fingerprint >"${ME}/stdout" && die "Tor started with only encrypted secret key!" check_no_file "${ME}/keys/ed25519_master_id_public_key" check_no_file "${ME}/keys/ed25519_master_id_public_key" +grep "but not public key file" "${ME}/stdout" >/dev/null || die "Tor didn't declare it couldn't find a public key." + echo "==== Case 5 ok" fi @@ -248,10 +254,12 @@ SRC="${DATA_DIR}/encrypted" mkdir -p "${ME}/keys" cp "${SRC}/keys/ed25519_master_id_secret_key_encrypted" "${ME}/keys/" cp "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/" -${TOR} --DataDirectory "${ME}" --list-fingerprint && die "Tor started with encrypted secret key and no certs" || true +${TOR} --DataDirectory "${ME}" --list-fingerprint > "${ME}/stdout" && die "Tor started with encrypted secret key and no certs" || true check_no_file "${ME}/keys/ed25519_signing_cert" check_no_file "${ME}/keys/ed25519_signing_secret_key" +grep "but it was encrypted" "${ME}/stdout" >/dev/null || die "Tor didn't declare that the secret key was encrypted." + echo "==== Case 6 ok" fi @@ -335,7 +343,9 @@ mkdir -p "${ME}/keys" cp "${SRC}/keys/ed25519_master_id_public_key" "${ME}/keys/" cp "${OTHER}/keys/ed25519_master_id_secret_key" "${ME}/keys/" -${TOR} --DataDirectory "${ME}" --list-fingerprint && die "Successfully started with mismatched keys!?" || true +${TOR} --DataDirectory "${ME}" --list-fingerprint >"${ME}/stdout" && die "Successfully started with mismatched keys!?" || true + +grep "public_key does not match.*secret_key" "${ME}/stdout" >/dev/null || die "Tor didn't declare that there was a key mismatch" echo "==== Case 10 ok"

1 0

[tor/master] More log messages for keygen problems
by nickm＠torproject.org 19 Aug '15

19 Aug '15

commit 426ef9c8eb1d88914ebff544d6704d5c6de23ba1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 10 11:04:53 2015 -0400 More log messages for keygen problems --- src/or/routerkeys.c | 21 +++++++++++++++++---- src/or/routerkeys.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c index 025fa6f..80b26e6 100644 --- a/src/or/routerkeys.c +++ b/src/or/routerkeys.c @@ -246,6 +246,9 @@ write_secret_key(const ed25519_secret_key_t *key, int encrypted, * If INIT_ED_KEY_NO_REPAIR is set, and there is any issue loading the keys * from disk _other than their absence_ (full or partial), we do not try to * replace them. + * + * If INIT_ED_KEY_SUGGEST_KEYGEN is set, have log messages about failures + * refer to the --keygen option. */ ed25519_keypair_t * ed_key_init_from_file(const char *fname, uint32_t flags, @@ -358,8 +361,12 @@ ed_key_init_from_file(const char *fname, uint32_t flags, /* If we have a secret key and we're reloading the public key, * the key must match! */ if (! ed25519_pubkey_eq(&keypair->pubkey, &pubkey_tmp)) { - tor_log(severity, LD_OR, "%s does not match %s!", - public_fname, loaded_secret_fname); + tor_log(severity, LD_OR, "%s does not match %s! If you are trying " + "to restore from backup, make sure you didn't mix up the " + "key files. If you are absolutely sure that %s is the right " + "key for this relay, delete %s or move it out of the way.", + public_fname, loaded_secret_fname, + loaded_secret_fname, public_fname); goto err; } } else { @@ -389,11 +396,17 @@ ed_key_init_from_file(const char *fname, uint32_t flags, !(flags & INIT_ED_KEY_MISSING_SECRET_OK)) { if (have_encrypted_secret_file) { tor_log(severity, LD_OR, "We needed to load a secret key from %s, " - "but it was encrypted. Try tor --keygen instead.", + "but it was encrypted. Try 'tor --keygen' instead, so you " + "can enter the passphrase.", secret_fname); } else { tor_log(severity, LD_OR, "We needed to load a secret key from %s, " - "but couldn't find it.", secret_fname); + "but couldn't find it. %s", secret_fname, + (flags & INIT_ED_KEY_SUGGEST_KEYGEN) ? + "If you're keeping your master secret key offline, you will " + "need to run 'tor --keygen' to generate new signing keys." : + "Did you forget to copy it over when you copied the rest of the " + "signing key material?"); } goto err; } diff --git a/src/or/routerkeys.h b/src/or/routerkeys.h index 9b93358..b4e73aa 100644 --- a/src/or/routerkeys.h +++ b/src/or/routerkeys.h @@ -16,6 +16,7 @@ #define INIT_ED_KEY_OMIT_SECRET (1u<<7) #define INIT_ED_KEY_TRY_ENCRYPTED (1u<<8) #define INIT_ED_KEY_NO_REPAIR (1u<<9) +#define INIT_ED_KEY_SUGGEST_KEYGEN (1u<<10) struct tor_cert_st; ed25519_keypair_t *ed_key_init_from_file(const char *fname, uint32_t flags,

1 0

[tor/master] Merge branch 'ed25519_keygen_squashed'
by nickm＠torproject.org 19 Aug '15

19 Aug '15

commit 428bb2d1c8bf5f10f7f76b9861b9a3ce498e07a7 Merge: 2f5202c 8589c47 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 19 13:36:59 2015 -0400 Merge branch 'ed25519_keygen_squashed' Makefile.am | 2 + changes/16679_16685_etc | 13 ++ src/or/config.c | 39 +++++ src/or/main.c | 4 +- src/or/or.h | 7 + src/or/routerkeys.c | 238 ++++++++++++++++++++++++++----- src/or/routerkeys.h | 1 + src/test/include.am | 2 +- src/test/test_keygen.sh | 363 +++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 634 insertions(+), 35 deletions(-)

1 0

[doctor/master] Drop hack for turtles
by atagar＠torproject.org 19 Aug '15

19 Aug '15

commit 44c3457d51e923131bac503c64b8334cd0b5804f Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 19 09:02:10 2015 -0700 Drop hack for turtles Oops, missed one of the hacks we had to exclude turtles. It was replaced a long while ago. --- descriptor_checker.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/descriptor_checker.py b/descriptor_checker.py index 309379e..6b28d95 100755 --- a/descriptor_checker.py +++ b/descriptor_checker.py @@ -65,11 +65,6 @@ def main(): if authority.v3ident is None: continue - # skip turtles, it's unmaintained - - if authority.nickname == 'turtles': - continue - log.debug("Downloading the consensus from %s..." % authority.nickname) query = stem.descriptor.remote.Query(

1 0

[stem/master] Flag Faravahar as a bandwidth authority
by atagar＠torproject.org 19 Aug '15

19 Aug '15

commit df8c9747098be2372f3b153cacdf752198f909ac Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 19 09:03:20 2015 -0700 Flag Faravahar as a bandwidth authority Sina reported on August 13th that his authority is now a bw auth... Team Cymru's Asia Bandwidth Scanner is now reporting to Faravahar. You should expect to see bandwidth reports from her as of today. --- stem/descriptor/remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 4d3423d..389182d 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -749,7 +749,7 @@ DIRECTORY_AUTHORITIES = { address = '154.35.175.225', or_port = 443, dir_port = 80, - is_bandwidth_authority = False, + is_bandwidth_authority = True, fingerprint = 'CF6D0AAFB385BE71B8E111FC5CFF4B47923733BC', v3ident = 'EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97', ),

1 0

[tor-browser-bundle/master] Bug 12240: Building OpenSSL reproducibly with LXC
by gk＠torproject.org 19 Aug '15

19 Aug '15

commit b8633570c5ae6b2881096e318889c335c958e1c2 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 17 13:32:58 2015 +0200 Bug 12240: Building OpenSSL reproducibly with LXC --- gitian/descriptors/mac/gitian-utils.yml | 20 +++++++++++++++++++- gitian/mkbundle-mac.sh | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/gitian/descriptors/mac/gitian-utils.yml b/gitian/descriptors/mac/gitian-utils.yml index c47767e..d457fef 100644 --- a/gitian/descriptors/mac/gitian-utils.yml +++ b/gitian/descriptors/mac/gitian-utils.yml @@ -16,6 +16,8 @@ reference_datetime: "2000-01-01 00:00:00" remotes: - "url": "https://github.com/libevent/libevent.git" "dir": "libevent" +- "url": "https://github.com/wolfcw/libfaketime" + "dir": "faketime" files: - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -24,6 +26,7 @@ files: - "gmp.tar.bz2" - "versions" - "dzip.sh" +- "libfaketime.patch" script: | INSTDIR="$HOME/install" source versions @@ -44,8 +47,17 @@ script: | ~/build/dzip.sh gcc-$GCC_VER-linux64-precise-utils.zip gcc cp *utils.zip $OUTDIR/ else - export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 + # Building libfaketime. + cd faketime + export GIT_COMMITTER_NAME="nobody" + export GIT_COMMITTER_EMAIL="nobody@localhost" + export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" + git am ~/build/libfaketime.patch + make + DESTDIR="$INSTDIR/faketime" make install + export FAKETIME_SKIP_CMDS="make" export FAKETIME=$REFERENCE_DATETIME + cd .. sudo dpkg -i *.deb tar xaf multiarch-darwin*tar.xz @@ -65,6 +77,7 @@ script: | ./autogen.sh find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" ./configure --disable-static --host=i686-apple-darwin11 --prefix=$INSTDIR/libevent + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make $MAKEOPTS make install cd .. @@ -84,10 +97,15 @@ script: | # Building GMP tar xjf gmp.tar.bz2 cd gmp-* + # |configure| can't cope with nano seconds faked. And even if we would revert + # that feature it would hang sometimes for unknown but to libfaketime related + # reasons. + export LD_PRELOAD="" find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # Even if we are not shipping libgmpxx anymore we still need --enable-xcc # during compile time. ./configure --host=x86_64-apple-darwin11 --prefix=$INSTDIR/gmp --disable-static --enable-shared --enable-cxx + export LD_PRELOAD="$INSTDIR/faketime/usr/local/lib/faketime/libfaketime.so.1" make make install cd .. diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index cf54e19..4e458bd 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -114,7 +114,7 @@ then echo echo "****** Starting Utilities Component of Mac Bundle (1/5 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit libevent=$LIBEVENT_TAG,faketime=$FAKETIME_TAG $DESCRIPTOR_DIR/mac/gitian-utils.yml if [ $? -ne 0 ]; then #mv var/build.log ./utils-fail-mac.log.`date +%Y%m%d%H%M%S`

1 0

[tor-browser-spec/master] Some release process tweaks.
by mikeperry＠torproject.org 19 Aug '15

19 Aug '15

commit e5dba878f924d1f2230b487a4303dbaf2033517a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 19 03:08:40 2015 -0700 Some release process tweaks. --- processes/ReleaseProcess | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index b4dca6a..dddf02e 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -89,7 +89,7 @@ #. Clear out old builds, transfer builds to staticiforme #. Remote: # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix - torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… + torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R /srv/dist-master.torproject.org/htdocs/torbrowser/*" torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Local to staticiforme: @@ -98,13 +98,16 @@ eval $( ./get-tb-version release ) # or alpha / beta # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~gk/builds/$TORBROWSER_VERSION - # Verify everything was downloaded correctly - for i in $TORBROWSER_VERSION/*.asc; do echo $i ; gpg -q $i || break; done rm $TORBROWSER_VERSION/index.html* mv $TORBROWSER_VERSION /srv/dist-master.torproject.org/htdocs/torbrowser/ chmod 775 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION chmod 664 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/* + # XXX: Need to manually get .htaccess :( + chmod 664 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/.htaccess chown -R :torwww /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION + # Verify everything was downloaded/copied correctly + cd /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION + for i in *.asc; do echo $i ; gpg -q $i || break; done static-update-component dist.torproject.org #. Update website's torbrowser versions file in the website git @@ -130,9 +133,11 @@ # responses! make update_responses # (or update_responses-alpha, update_responses-beta) cd ../tools/update-responses + # XXX: nothing sets $TORBROWSER_UPDATE_CHANNEL here.. chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/* chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/.htaccess chmod 775 htdocs/$TORBROWSER_UPDATE_CHANNEL/ + torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/update_2/${TORBROWSER_UPDATE_CHANNEL}/*" torsocks rsync -avP htdocs/$TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrows… # Finally, remove old version as we point the update channel at the new version. # XXX: CAREFUL! $OLD_TOR_BROWSER_VERSION must be set!

1 0

[torbutton/master] Bug 16797: brandShorterName is missing from brand.properties.
by gk＠torproject.org 19 Aug '15

19 Aug '15

commit 71a0bba47c0d2d079b778cd2763a27c90d664420 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Aug 13 14:37:42 2015 -0400 Bug 16797: brandShorterName is missing from brand.properties. Adding this fixes problems such as the lack of "Tor Browser" in the left side of the URL bar for pages such as about:config. --- src/chrome/locale/en/brand.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/locale/en/brand.properties b/src/chrome/locale/en/brand.properties index f63def3..732c157 100644 --- a/src/chrome/locale/en/brand.properties +++ b/src/chrome/locale/en/brand.properties @@ -2,6 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser vendorShortName=Tor Project

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 19 Aug '15

19 Aug '15

commit db633e6b74c02c3a0bb83a31673b87350309b7ed Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 19 08:15:47 2015 +0000 Update translations for tails-misc_completed --- id.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/id.po b/id.po index f91f68c..16b64ab 100644 --- a/id.po +++ b/id.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-28 19:40+0200\n" -"PO-Revision-Date: 2015-06-29 14:38+0000\n" +"POT-Creation-Date: 2015-08-10 18:53+0200\n" +"PO-Revision-Date: 2015-08-19 08:01+0000\n" "Last-Translator: Zamani Karmana <zamani.karmana(a)gmail.com>\n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" +"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -146,7 +146,7 @@ msgstr "Sidik jari:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:403 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "ID pengguna:" +msgstr[0] "ID Pengguna:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:433 msgid "None (Don't sign)" @@ -209,7 +209,7 @@ msgstr "Anda memerlukan private key untuk menandai pesan atau public key untuk m #: config/chroot_local-includes/usr/local/bin/gpgApplet:751 msgid "GnuPG error" -msgstr "GnuPG bermasalah" +msgstr "Galat GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:772 msgid "Therefore the operation cannot be performed." @@ -221,7 +221,7 @@ msgstr "Hasil GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:828 msgid "Output of GnuPG:" -msgstr "keluaran GnuPG:" +msgstr "Keluaran GnuPG:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:853 msgid "Other messages provided by GnuPG:" @@ -229,11 +229,11 @@ msgstr "Pesan-pesan lain dari GnuPG:" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" -msgstr "Segera matikan" +msgstr "Segera Matikan" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 msgid "Reboot Immediately" -msgstr "Segera nayalakan ulang" +msgstr "Segera Nyalakan Ulang" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -272,11 +272,11 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "Upgrade gagal. Ini bisa disebabkan oleh masalah jaringan. Silakan periksa koneksi jaringan Anda, coba memulai ulang Tails, atau baca log sistem untuk lebih memahami permasalahannya." +msgstr "Pemutakhiran gagal. Ini bisa disebabkan oleh masalah jaringan. Harap periksa koneksi jaringan Anda, coba mulai ulang Tails, atau baca log sistem untuk lebih memahami permasalahannya." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "Upgrade telah berhasil." +msgstr "Pemutakhiran telah berhasil." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" @@ -286,7 +286,7 @@ msgstr "Menyinkronisasi jam sistem" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Tor memerlukan jam yang akurat agar bekerja dengan baik, khususnya untuk layanan-layanan tersembunyi. Silakan tunggu..." +msgstr "Tor memerlukan jam yang akurat agar bekerja dengan baik, khususnya untuk Hidden Services. Silakan tunggu..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" @@ -371,19 +371,19 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Pelajari lebih lanjut...</a>" -#: config/chroot_local-includes/usr/local/bin/tor-browser:24 +#: config/chroot_local-includes/usr/local/bin/tor-browser:29 msgid "Tor is not ready" msgstr "Tor belum siap" -#: config/chroot_local-includes/usr/local/bin/tor-browser:25 +#: config/chroot_local-includes/usr/local/bin/tor-browser:30 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor belum siap. Tetap jalankan peramban Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:26 +#: config/chroot_local-includes/usr/local/bin/tor-browser:31 msgid "Start Tor Browser" msgstr "Mulai peramban Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:27 +#: config/chroot_local-includes/usr/local/bin/tor-browser:32 msgid "Cancel" msgstr "Batal"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 19 Aug '15

19 Aug '15

commit f80d3296e08819b52bb8ac29725c1fd870c6848b Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 19 08:15:43 2015 +0000 Update translations for tails-misc --- id.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/id.po b/id.po index f91f68c..16b64ab 100644 --- a/id.po +++ b/id.po @@ -13,10 +13,10 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-28 19:40+0200\n" -"PO-Revision-Date: 2015-06-29 14:38+0000\n" +"POT-Creation-Date: 2015-08-10 18:53+0200\n" +"PO-Revision-Date: 2015-08-19 08:01+0000\n" "Last-Translator: Zamani Karmana <zamani.karmana(a)gmail.com>\n" -"Language-Team: Indonesian (http://www.transifex.com/projects/p/torproject/language/id/)\n" +"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -146,7 +146,7 @@ msgstr "Sidik jari:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:403 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "ID pengguna:" +msgstr[0] "ID Pengguna:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:433 msgid "None (Don't sign)" @@ -209,7 +209,7 @@ msgstr "Anda memerlukan private key untuk menandai pesan atau public key untuk m #: config/chroot_local-includes/usr/local/bin/gpgApplet:751 msgid "GnuPG error" -msgstr "GnuPG bermasalah" +msgstr "Galat GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:772 msgid "Therefore the operation cannot be performed." @@ -221,7 +221,7 @@ msgstr "Hasil GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:828 msgid "Output of GnuPG:" -msgstr "keluaran GnuPG:" +msgstr "Keluaran GnuPG:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:853 msgid "Other messages provided by GnuPG:" @@ -229,11 +229,11 @@ msgstr "Pesan-pesan lain dari GnuPG:" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:39 msgid "Shutdown Immediately" -msgstr "Segera matikan" +msgstr "Segera Matikan" #: config/chroot_local-includes/usr/local/lib/shutdown-helper-applet:40 msgid "Reboot Immediately" -msgstr "Segera nayalakan ulang" +msgstr "Segera Nyalakan Ulang" #: config/chroot_local-includes/usr/local/bin/tails-about:16 msgid "not available" @@ -272,11 +272,11 @@ msgid "" "The upgrade failed. This might be due to a network problem. Please check " "your network connection, try to restart Tails, or read the system log to " "understand better the problem." -msgstr "Upgrade gagal. Ini bisa disebabkan oleh masalah jaringan. Silakan periksa koneksi jaringan Anda, coba memulai ulang Tails, atau baca log sistem untuk lebih memahami permasalahannya." +msgstr "Pemutakhiran gagal. Ini bisa disebabkan oleh masalah jaringan. Harap periksa koneksi jaringan Anda, coba mulai ulang Tails, atau baca log sistem untuk lebih memahami permasalahannya." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:125 msgid "The upgrade was successful." -msgstr "Upgrade telah berhasil." +msgstr "Pemutakhiran telah berhasil." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:52 msgid "Synchronizing the system's clock" @@ -286,7 +286,7 @@ msgstr "Menyinkronisasi jam sistem" msgid "" "Tor needs an accurate clock to work properly, especially for Hidden " "Services. Please wait..." -msgstr "Tor memerlukan jam yang akurat agar bekerja dengan baik, khususnya untuk layanan-layanan tersembunyi. Silakan tunggu..." +msgstr "Tor memerlukan jam yang akurat agar bekerja dengan baik, khususnya untuk Hidden Services. Silakan tunggu..." #: config/chroot_local-includes/usr/local/bin/tails-htp-notify-user:87 msgid "Failed to synchronize the clock!" @@ -371,19 +371,19 @@ msgid "" " more...</a>" msgstr "<a href='file:///usr/share/doc/tails/website/doc/advanced_topics/virtualization.en.html#security'>Pelajari lebih lanjut...</a>" -#: config/chroot_local-includes/usr/local/bin/tor-browser:24 +#: config/chroot_local-includes/usr/local/bin/tor-browser:29 msgid "Tor is not ready" msgstr "Tor belum siap" -#: config/chroot_local-includes/usr/local/bin/tor-browser:25 +#: config/chroot_local-includes/usr/local/bin/tor-browser:30 msgid "Tor is not ready. Start Tor Browser anyway?" msgstr "Tor belum siap. Tetap jalankan peramban Tor?" -#: config/chroot_local-includes/usr/local/bin/tor-browser:26 +#: config/chroot_local-includes/usr/local/bin/tor-browser:31 msgid "Start Tor Browser" msgstr "Mulai peramban Tor" -#: config/chroot_local-includes/usr/local/bin/tor-browser:27 +#: config/chroot_local-includes/usr/local/bin/tor-browser:32 msgid "Cancel" msgstr "Batal"

1 0