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

[tor-browser-bundle/master] Bug 16351: Use --no-insert-timestamp for linking
by gk＠torproject.org 25 Jun '15

25 Jun '15

commit 1b5ae9017625081f251c71afb359bf9345c76b03 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jun 25 09:38:04 2015 +0000 Bug 16351: Use --no-insert-timestamp for linking In Binutils 2.25 inserting timestamps in PE headers got the default behavior. This was motivated by https://sourceware.org/bugzilla/show_bug.cgi?id=16887. Until we find something better (see: https://sourceware.org/ml/binutils/2015-06/msg00099.html) we use the --no-insert-timestamp option which essentially gives us the linker behavior of Binutils 2.24. --- gitian/build-helpers/i686-w64-mingw32-g++ | 2 +- gitian/build-helpers/i686-w64-mingw32-gcc | 2 +- gitian/build-helpers/i686-w64-mingw32-ld | 2 +- gitian/descriptors/windows/gitian-pluggable-transports.yml | 2 +- gitian/descriptors/windows/gitian-utils.yml | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gitian/build-helpers/i686-w64-mingw32-g++ b/gitian/build-helpers/i686-w64-mingw32-g++ index b73f107..8975982 100755 --- a/gitian/build-helpers/i686-w64-mingw32-g++ +++ b/gitian/build-helpers/i686-w64-mingw32-g++ @@ -1,4 +1,4 @@ #!/bin/sh # Hardened mingw gcc wrapper -/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" +/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-g++ -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" diff --git a/gitian/build-helpers/i686-w64-mingw32-gcc b/gitian/build-helpers/i686-w64-mingw32-gcc index d4fd642..a377c32 100755 --- a/gitian/build-helpers/i686-w64-mingw32-gcc +++ b/gitian/build-helpers/i686-w64-mingw32-gcc @@ -1,4 +1,4 @@ #!/bin/sh # Hardened mingw gcc wrapper -/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" +/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-gcc -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -fstack-protector --param ssp-buffer-size=4 -fno-strict-overflow "$@" diff --git a/gitian/build-helpers/i686-w64-mingw32-ld b/gitian/build-helpers/i686-w64-mingw32-ld index f8c61fd..84b5565 100755 --- a/gitian/build-helpers/i686-w64-mingw32-ld +++ b/gitian/build-helpers/i686-w64-mingw32-ld @@ -1,4 +1,4 @@ #!/bin/sh # Hardened mingw gcc wrapper -/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section -lssp -L$INSTDIR/gcclibs/ "$@" +/home/ubuntu/install/mingw-w64/bin/i686-w64-mingw32-ld --dynamicbase --nxcompat --enable-reloc-section --no-insert-timestamp -lssp -L$INSTDIR/gcclibs/ "$@" diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 1d8caba..82fd266 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -83,7 +83,7 @@ script: | export TZ=UTC export LC_ALL=C export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" - export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs" + export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs" umask 0022 unzip -d $INSTDIR mingw-w64-win32-utils.zip diff --git a/gitian/descriptors/windows/gitian-utils.yml b/gitian/descriptors/windows/gitian-utils.yml index 9162426..650f7ad 100644 --- a/gitian/descriptors/windows/gitian-utils.yml +++ b/gitian/descriptors/windows/gitian-utils.yml @@ -82,7 +82,7 @@ script: | sed 's/msvcrt/msvcr100/' -i gcc-*/gcc/config/i386/t-mingw-w32 # LDFLAGS_FOR_TARGET does not work for some reason. Thus, we take # CFLAGS_FOR_TARGET. - export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase" + export CFLAGS_FOR_TARGET="-specs=/home/ubuntu/build/msvcr100.spec -Wl,--nxcompat -Wl,--dynamicbase -Wl,--no-insert-timestamp" gcc-*/configure --prefix=$INSTDIR/mingw-w64 --target=i686-w64-mingw32 --disable-multilib --enable-languages=c,c++ make $MAKEOPTS all-gcc make install-gcc @@ -120,11 +120,11 @@ script: | export FAKETIME=$REFERENCE_DATETIME # Building zlib export CFLAGS="-mwindows -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security" - export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" + export LDFLAGS="-mwindows -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" cd zlib find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" - make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" - make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" install + make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" + make BINARY_PATH=$INSTDIR/zlib/lib INCLUDE_PATH=$INSTDIR/zlib/include LIBRARY_PATH=$INSTDIR/zlib/lib -f win32/Makefile.gcc PREFIX=i686-w64-mingw32- $MAKEOPTS SHARED_MODE=1 LOC="-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" install cd .. # Building Libevent @@ -141,7 +141,7 @@ script: | cd openssl-* find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME" # TODO: Add enable-ec_nistp_64_gcc_128 for 64bit Windows. - ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl + ./Configure -shared --cross-compile-prefix=i686-w64-mingw32- mingw "-fstack-protector-all -Wstack-protector --param ssp-buffer-size=4 -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security -Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$INSTDIR/gcclibs/" --prefix=$INSTDIR/openssl # Using $MAKEOPTS breaks the build. Might be the issue mentioned on # http://cblfs.cross-lfs.org/index.php/OpenSSL. make

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 25 Jun '15

25 Jun '15

commit 30146f00d046a666a8c306d7a330678e105d7506 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 18:15:54 2015 +0000 Update translations for abouttor-homepage --- nn/aboutTor.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nn/aboutTor.dtd b/nn/aboutTor.dtd index a00be6d..0b3d71f 100644 --- a/nn/aboutTor.dtd +++ b/nn/aboutTor.dtd @@ -41,9 +41,9 @@ <!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> <!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> <!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> +<!ENTITY aboutTor.helpInfo5.label "Doner pengar »"> <!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> <!ENTITY aboutTor.footer.label "Tor-prosjektet er ein US 501(c)(3) frivillig organisasjon dedikert til forsking, utvikling og utdanning av nettbasert anonymitet og personvern."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> +<!ENTITY aboutTor.learnMore.label "Lær meir om Tor-prosjektet »"> <!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en">

1 0

[translation/tails-greeter_completed] Update translations for tails-greeter_completed
by translation＠torproject.org 25 Jun '15

25 Jun '15

commit cad125594ce9922370a18790288efee76bb24216 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 18:15:32 2015 +0000 Update translations for tails-greeter_completed --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index 7344361..6522dc9 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2015-06-19 21:12+0000\n" +"PO-Revision-Date: 2015-06-25 17:49+0000\n" "Last-Translator: apaddlingduck\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 25 Jun '15

25 Jun '15

commit 06936303ca63ca47425554cef4b595e2acceb8d5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 18:15:27 2015 +0000 Update translations for tails-greeter --- fr/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fr/fr.po b/fr/fr.po index 7344361..6522dc9 100644 --- a/fr/fr.po +++ b/fr/fr.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-10-15 16:05+0200\n" -"PO-Revision-Date: 2015-06-19 21:12+0000\n" +"PO-Revision-Date: 2015-06-25 17:49+0000\n" "Last-Translator: apaddlingduck\n" "Language-Team: French (http://www.transifex.com/projects/p/torproject/language/fr/)\n" "MIME-Version: 1.0\n"

1 0

[tor-messenger-build/master] Add libdmg-hfsplus
by boklm＠torproject.org 25 Jun '15

25 Jun '15

commit 3a3a9c16a9d0b66fa44309bade175d6a1034f769 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Jun 25 20:01:32 2015 +0200 Add libdmg-hfsplus --- projects/libdmg-hfsplus/build | 16 ++++++++++++++ projects/libdmg-hfsplus/config | 19 +++++++++++++++++ projects/libdmg-hfsplus/libdmg.patch | 39 ++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/projects/libdmg-hfsplus/build b/projects/libdmg-hfsplus/build new file mode 100644 index 0000000..2903150 --- /dev/null +++ b/projects/libdmg-hfsplus/build @@ -0,0 +1,16 @@ +#!/bin/sh +set -e +distdir=$(pwd)/dist +mkdir -p $distdir/[% project %] +tar xf [% project %]-[% c('version') %].tar.gz +cd [% project %]-[% c('version') %] +patch -p1 < ../libdmg.patch +cmake -DCMAKE_INSTALL_PREFIX:PATH=$distdir/[% project %] CMakeLists.txt +cd dmg +make -j4 +make install +cd $distdir +[% c('tar', { + tar_src => [ project ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/libdmg-hfsplus/config b/projects/libdmg-hfsplus/config new file mode 100644 index 0000000..eb02168 --- /dev/null +++ b/projects/libdmg-hfsplus/config @@ -0,0 +1,19 @@ +# vim: filetype=yaml sw=2 +version: '[% c("abbrev") %]' +git_url: https://github.com/vasi/libdmg-hfsplus +git_hash: dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 +filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +remote_docker: 1 +lsb_release: + id: Ubuntu + release: 12.04 + codename: precise +var: + deps: + - build-essential + - cmake + - zlib1g-dev + - libbz2-dev +input_files: + - filename: libdmg.patch + - project: docker-image diff --git a/projects/libdmg-hfsplus/libdmg.patch b/projects/libdmg-hfsplus/libdmg.patch new file mode 100644 index 0000000..a84ac3e --- /dev/null +++ b/projects/libdmg-hfsplus/libdmg.patch @@ -0,0 +1,39 @@ +From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 6 Mar 2014 19:47:05 -0800 +Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. + +Some of the struct padding and fields contained unitialized memory, which +caused two successive invocations to produce archives that differed in some +bytes. +--- + dmg/dmglib.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/dmg/dmglib.c b/dmg/dmglib.c +index f481b1f..b74e50b 100644 +--- a/dmg/dmglib.c ++++ b/dmg/dmglib.c +@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { + ChecksumToken dataForkToken; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + off_t plistOffset; + uint32_t plistSize; + uint32_t dataForkChecksum; +@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { + uint64_t numSectors; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + char partitionName[512]; + + off_t fileLength; +-- +1.8.1.2 +

1 0

[stem/master] Link to 1.4.1b.tar as our latest release
by atagar＠torproject.org 25 Jun '15

25 Jun '15

commit 87f5833ccdc522f1edbea33a67ee6cf5c07f7aae Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 25 10:11:33 2015 -0700 Link to 1.4.1b.tar as our latest release I uploaded the wrong commit to PyPI for our 1.4.1 hotfix release. Unfortunately it doesn't let us replace files, so I had to make a new one (named 1.4.1b.tar). Seems I forgot to update the link... https://trac.torproject.org/projects/tor/ticket/16445 --- docs/_static/example/compare_flags.py | 2 +- docs/download.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/_static/example/compare_flags.py b/docs/_static/example/compare_flags.py index 84f8a4f..1043af1 100644 --- a/docs/_static/example/compare_flags.py +++ b/docs/_static/example/compare_flags.py @@ -7,7 +7,7 @@ queries = {} for name, authority in remote.get_authorities().items(): if authority.v3ident is None: - continue # authority doens't vote if it lacks a v3ident + continue # authority doesn't vote if it lacks a v3ident queries[name] = downloader.get_vote(authority) diff --git a/docs/download.rst b/docs/download.rst index f7c71e6..1673565 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -71,9 +71,9 @@ Download Signed releases and instructions for both Python 2.x and 3.x. You can easily install from its `tarball - <https://pypi.python.org/packages/source/s/stem/stem-1.4.1.tar.bz2>`_ + <https://pypi.python.org/packages/source/s/stem/stem-1.4.1b.tar.bz2>`_ (`sig - <https://pypi.python.org/packages/source/s/stem/stem-1.4.1.tar.bz2.asc>`_), + <https://pypi.python.org/packages/source/s/stem/stem-1.4.1b.tar.bz2.asc>`_), or with **pip**... ::

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 25 Jun '15

25 Jun '15

commit 653ae8ff1fd3727b1b1c9370b868ae560dd24a4e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 16:46:15 2015 +0000 Update translations for torbutton-torbuttondtd --- ka/torbutton.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd index 3e5ff86..06bc783 100644 --- a/ka/torbutton.dtd +++ b/ka/torbutton.dtd @@ -1,5 +1,5 @@ -<!ENTITY torbutton.prefs.title "Torbutton Preferences"> -<!ENTITY torbutton.prefs.tor_settings "Proxy Settings"> +<!ENTITY torbutton.prefs.title "Torbutton-ის პარამეტრები"> +<!ENTITY torbutton.prefs.tor_settings "პროქსის პარამეტრები"> <!ENTITY torbutton.prefs.recommended_settings "Use the recommended proxy settings for my version of Firefox"> <!ENTITY torbutton.prefs.use_privoxy "Use Privoxy"> <!ENTITY torbutton.prefs.use_polipo "Use Polipo">

1 0

[translation/torbutton-browserproperties_completed] Update translations for torbutton-browserproperties_completed
by translation＠torproject.org 25 Jun '15

25 Jun '15

commit 75cc486e3036ce9cab8f5511e5561c252f1f1633 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 16:46:09 2015 +0000 Update translations for torbutton-browserproperties_completed --- ka/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/browser.properties b/ka/browser.properties index 09d52be..b280cf8 100644 --- a/ka/browser.properties +++ b/ka/browser.properties @@ -2,4 +2,4 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=ინგლისური +spellchecker.dictionary=ka_GE

1 0

[translation/torbutton-browserproperties] Update translations for torbutton-browserproperties
by translation＠torproject.org 25 Jun '15

25 Jun '15

commit b6d963ffbcd24c5feeef4b468280d11dd9d12f0c Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 16:46:06 2015 +0000 Update translations for torbutton-browserproperties --- ka/browser.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ka/browser.properties b/ka/browser.properties index 09d52be..b280cf8 100644 --- a/ka/browser.properties +++ b/ka/browser.properties @@ -2,4 +2,4 @@ browser.startup.homepage=about:tor # Spell checker dictionary -spellchecker.dictionary=ინგლისური +spellchecker.dictionary=ka_GE

1 0

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

25 Jun '15

commit 2c1c375dae7e936503e13c0e22a18983d563d408 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 25 16:45:54 2015 +0000 Update translations for tails-misc --- ka.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ka.po b/ka.po index 8944a72..0179aed 100644 --- a/ka.po +++ b/ka.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# George Salukvadze <giosal90(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-02 23:47+0200\n" -"PO-Revision-Date: 2015-05-03 08:25+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2015-06-25 16:43+0000\n" +"Last-Translator: George Salukvadze <giosal90(a)gmail.com>\n" "Language-Team: Georgian (http://www.transifex.com/projects/p/torproject/language/ka/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -123,7 +124,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/gpgApplet:366 msgid "Name" -msgstr "Name" +msgstr "სახელი" #: config/chroot_local-includes/usr/local/bin/gpgApplet:367 msgid "Key ID" @@ -379,7 +380,7 @@ msgstr "" #: config/chroot_local-includes/usr/local/bin/tor-browser:21 msgid "Cancel" -msgstr "Cancel" +msgstr "გაუქმება" #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:33 msgid "Do you really want to launch the Unsafe Browser?"

1 0