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

[tor-messenger-build/master] libgcrypt: remove build timestamp
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 7be4daacef65c17c96c5eb861d502a25d3b57997 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 19:37:55 2015 +0200 libgcrypt: remove build timestamp --- projects/libgcrypt/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 9b9506f..37f4a0a 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -15,6 +15,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] # our compiler does not like -g sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure [% END -%] +sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+0000/' configure ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix=$distdir install

1 0

[tor-messenger-build/master] libgpg-error: set SOURCE_DATE_EPOCH
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 0577a9fef40d6259bd7327a886c40328c2df9e88 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 01:07:37 2015 +0200 libgpg-error: set SOURCE_DATE_EPOCH --- projects/libgpg-error/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgpg-error/build b/projects/libgpg-error/build index 8768dc7..5df344e 100644 --- a/projects/libgpg-error/build +++ b/projects/libgpg-error/build @@ -11,6 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] cp $rootdir/lock-obj-pub.x86_64-apple-darwin14.0.0.h src/syscfg/lock-obj-pub.darwin10.h echo 'int main() {}' > src/gen-posix-lock-obj.c [% END -%] +export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix="$distdir" [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix="$distdir" install

1 0

[tor-messenger-build/master] libgcrypt: set SOURCE_DATE_EPOCH
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 85bfa116287b3d65a715bde2d4f5b59fc54b319c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 01:08:12 2015 +0200 libgcrypt: set SOURCE_DATE_EPOCH --- projects/libgcrypt/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/libgcrypt/build b/projects/libgcrypt/build index 37f4a0a..9bd0710 100644 --- a/projects/libgcrypt/build +++ b/projects/libgcrypt/build @@ -16,6 +16,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] sed -i 's/ac_cv_prog_cc_g=yes/ac_cv_prog_cc_g=no/' configure [% END -%] sed -i 's/^BUILD_TIMESTAMP=.*/BUILD_TIMESTAMP=2000-01-01T00:00+0000/' configure +export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %][% IF c('var/windows') or c('var/osx') %] --enable-static --disable-shared[% END %] make -j4 make prefix=$distdir install

1 0

[tor-messenger-build/master] binutils: add patch to define PE timestamps using SOURCE_DATE_EPOCH
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 7209f00a2c3f4aa068da5c8bb5fc532611765d07 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 00:39:21 2015 +0200 binutils: add patch to define PE timestamps using SOURCE_DATE_EPOCH Patch from Debian: https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ SOURCE_DATE_EPOCH specification: https://reproducible-builds.org/specs/source-date-epoch/ --- projects/binutils/build | 5 +- projects/binutils/config | 5 +- projects/binutils/peXXigen.patch | 14 ---- projects/binutils/specify-timestamp.patch | 123 +++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 17 deletions(-) diff --git a/projects/binutils/build b/projects/binutils/build index 765c4c9..3531e89 100644 --- a/projects/binutils/build +++ b/projects/binutils/build @@ -8,8 +8,9 @@ cd [% project %]-[% c("version") %] sed 's/= extern_rt_rel_d;/= extern_rt_rel_d;\n memset (extern_rt_rel_d, 0, PE_IDATA5_SIZE);/' -i ld/pe-dll.c # Needed for the hardening... patch -p1 < ../enable-reloc-section-ld.patch -# Zeroing timestamps in PE headers reliably, see bug 12753. -patch -p1 < ../peXXigen.patch +# specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> +# https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ +patch -p2 < ../specify-timestamp.patch [% END -%] ./configure --prefix=$distdir [% c('var/configure_opt') %] make -j4 diff --git a/projects/binutils/config b/projects/binutils/config index 7bd26f5..dee7ef0 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -29,5 +29,8 @@ input_files: - project: docker-image - filename: enable-reloc-section-ld.patch enable: '[% c("var/windows") %]' - - filename: peXXigen.patch + + # specify-timestamp patch from Stephen Kitt <steve(a)sk2.org> + # https://anonscm.debian.org/cgit/collab-maint/binutils-mingw-w64.git/ + - filename: specify-timestamp.patch enable: '[% c("var/windows") %]' diff --git a/projects/binutils/peXXigen.patch b/projects/binutils/peXXigen.patch deleted file mode 100644 index f07dcf5..0000000 --- a/projects/binutils/peXXigen.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -crB binutils-2.24/bfd/peXXigen.c binutils-2.24/bfd/peXXigen.c -*** binutils-2.24/bfd/peXXigen.c Tue Nov 26 11:37:33 2013 ---- binutils-2.24/bfd/peXXigen.c Mon Aug 4 07:10:15 2014 -*************** -*** 795,800 **** ---- 795,802 ---- - /* Only use a real timestamp if the option was chosen. */ - if ((pe_data (abfd)->insert_timestamp)) - H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); -+ else -+ H_PUT_32 (abfd, 0, filehdr_out->f_timdat); - - PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, - filehdr_out->f_symptr); diff --git a/projects/binutils/specify-timestamp.patch b/projects/binutils/specify-timestamp.patch new file mode 100644 index 0000000..37f4347 --- /dev/null +++ b/projects/binutils/specify-timestamp.patch @@ -0,0 +1,123 @@ +--- a/upstream/bfd/peXXigen.c ++++ b/upstream/bfd/peXXigen.c +@@ -66,6 +66,9 @@ + #include <wchar.h> + #endif + ++#include <errno.h> ++#include <limits.h> ++ + /* NOTE: it's strange to be including an architecture specific header + in what's supposed to be general (to PE/PEI) code. However, that's + where the definitions are, and they don't vary per architecture +@@ -873,8 +876,36 @@ + H_PUT_16 (abfd, filehdr_in->f_nscns, filehdr_out->f_nscns); + + /* Only use a real timestamp if the option was chosen. */ +- if ((pe_data (abfd)->insert_timestamp)) +- H_PUT_32 (abfd, time (0), filehdr_out->f_timdat); ++ if (pe_data (abfd)->insert_timestamp) { ++ time_t now; ++ char *source_date_epoch; ++ unsigned long long epoch; ++ char *endptr; ++ ++ now = time(NULL); ++ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if (source_date_epoch) { ++ errno = 0; ++ epoch = strtoull(source_date_epoch, &endptr, 10); ++ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ++ || (errno != 0 && epoch == 0)) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", ++ strerror(errno)); ++ } else if (endptr == source_date_epoch) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", ++ endptr); ++ } else if (*endptr != '\0') { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", ++ endptr); ++ } else if (epoch > ULONG_MAX) { ++ _bfd_error_handler("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", ++ ULONG_MAX, epoch); ++ } else { ++ now = epoch; ++ } ++ } ++ H_PUT_32 (abfd, now, filehdr_out->f_timdat); ++ } + + PUT_FILEHDR_SYMPTR (abfd, filehdr_in->f_symptr, + filehdr_out->f_symptr); +--- a/upstream/ld/pe-dll.c ++++ b/upstream/ld/pe-dll.c +@@ -26,6 +26,8 @@ + #include "filenames.h" + #include "safe-ctype.h" + ++#include <errno.h> ++#include <limits.h> + #include <time.h> + + #include "ld.h" +@@ -1185,8 +1187,36 @@ + + memset (edata_d, 0, edata_sz); + +- if (pe_data (abfd)->insert_timestamp) +- H_PUT_32 (abfd, time (0), edata_d + 4); ++ if (pe_data (abfd)->insert_timestamp) { ++ time_t now; ++ char *source_date_epoch; ++ unsigned long long epoch; ++ char *endptr; ++ ++ now = time(NULL); ++ source_date_epoch = getenv("SOURCE_DATE_EPOCH"); ++ if (source_date_epoch) { ++ errno = 0; ++ epoch = strtoull(source_date_epoch, &endptr, 10); ++ if ((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0)) ++ || (errno != 0 && epoch == 0)) { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: strtoull: %s\n", ++ strerror(errno)); ++ } else if (endptr == source_date_epoch) { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: No digits were found: %s\n", ++ endptr); ++ } else if (*endptr != '\0') { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: Trailing garbage: %s\n", ++ endptr); ++ } else if (epoch > ULONG_MAX) { ++ einfo("Environment variable $SOURCE_DATE_EPOCH: value must be smaller than or equal to: %lu but was found to be: %llu\n", ++ ULONG_MAX, epoch); ++ } else { ++ now = epoch; ++ } ++ } ++ H_PUT_32 (abfd, now, edata_d + 4); ++ } + + if (pe_def_file->version_major != -1) + { +--- a/upstream/ld/emultempl/pe.em ++++ b/upstream/ld/emultempl/pe.em +@@ -307,7 +307,7 @@ + OPTION_USE_NUL_PREFIXED_IMPORT_TABLES}, + {"no-leading-underscore", no_argument, NULL, OPTION_NO_LEADING_UNDERSCORE}, + {"leading-underscore", no_argument, NULL, OPTION_LEADING_UNDERSCORE}, +- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, ++ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, + #ifdef DLL_SUPPORT + /* getopt allows abbreviations, so we do this to stop it +--- a/upstream/ld/emultempl/pep.em ++++ b/upstream/ld/emultempl/pep.em +@@ -324,7 +324,7 @@ + {"no-bind", no_argument, NULL, OPTION_NO_BIND}, + {"wdmdriver", no_argument, NULL, OPTION_WDM_DRIVER}, + {"tsaware", no_argument, NULL, OPTION_TERMINAL_SERVER_AWARE}, +- {"insert-timestamp", no_argument, NULL, OPTION_INSERT_TIMESTAMP}, ++ {"insert-timestamp", optional_argument, NULL, OPTION_INSERT_TIMESTAMP}, + {"no-insert-timestamp", no_argument, NULL, OPTION_NO_INSERT_TIMESTAMP}, + {"build-id", optional_argument, NULL, OPTION_BUILD_ID}, + {NULL, no_argument, NULL, 0}

1 0

[tor-messenger-build/master] binutils: use --enable-deterministic-archives
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit b144bb323684534f623a3f9fba574dacc15eba84 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Oct 15 22:28:12 2015 +0200 binutils: use --enable-deterministic-archives --- projects/binutils/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/binutils/config b/projects/binutils/config index 0882ea5..7bd26f5 100644 --- a/projects/binutils/config +++ b/projects/binutils/config @@ -10,12 +10,12 @@ var: deps: - build-essential - bison - configure_opt: '--disable-multilib --enable-gold' + configure_opt: '--disable-multilib --enable-gold --enable-deterministic-archives' targets: windows-i686: var: - configure_opt: '--target=i686-w64-mingw32 --disable-multilib' + configure_opt: '--target=i686-w64-mingw32 --disable-multilib --enable-deterministic-archives' lsb_release: id: Ubuntu release: 14.10

1 0

[tor-messenger-build/master] Update rbm for hg commit timestamp support
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 8d6ab70d878cc121051dda1621fdb37ddc0ed806 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 14:57:39 2015 +0200 Update rbm for hg commit timestamp support --- rbm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm b/rbm index a8fafa3..9887d89 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a8fafa3691de6ea722c60d882f84f26ed84a3c90 +Subproject commit 9887d891f57b1f45962693c97fb5cfa4aa26dbb0

1 0

[tor-messenger-build/master] libotr: set SOURCE_DATE_EPOCH
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit a2f0773cc2111d3c77a7d4f1d1dbc552d3e39e14 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 01:08:28 2015 +0200 libotr: set SOURCE_DATE_EPOCH --- projects/libotr/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/libotr/build b/projects/libotr/build index 3aa8443..30ec46c 100755 --- a/projects/libotr/build +++ b/projects/libotr/build @@ -14,6 +14,7 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf libotr-[% c('version') %].tar.gz cd /var/tmp/build/libotr-[% c('version') %] patch -p1 < $rootdir/bugs-otr-im-72.patch +export SOURCE_DATE_EPOCH=$(stat -c %Y ChangeLog) ./configure --prefix=$distdir [% c("var/configure_opt") %] make -j4 [% IF c("var/windows") %]LDFLAGS='-no-undefined -lssp'[% END %] make prefix=$distdir install

1 0

[tor-messenger-build/master] instantbird: build from a non-random directory
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit d9bf8b2cca86a1285578e3521afcd1a451fda306 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 17:07:05 2015 +0200 instantbird: build from a non-random directory --- projects/instantbird/build | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index 1f79af7..5d91c50 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -31,44 +31,45 @@ ln -s /usr/bin/yasm-1 /var/tmp/dist/yasm/bin/yasm export PATH="/var/tmp/dist/yasm/bin:$PATH" [% END -%] cd $rootdir -tar xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +mkdir /var/tmp/build +tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] mkdir moz cd moz tar xf ../[% c('input_files_by_name/mozilla-src') %] -mv mozilla-* ../[% project %]-[% c('version') %]/mozilla -cd ../[% project %]-[% c('version') %] +mv mozilla-* /var/tmp/build/[% project %]-[% c('version') %]/mozilla +cd /var/tmp/build/[% project %]-[% c('version') %] mkdir im/branding/messenger cp -R im/branding/nightly/* im/branding/messenger/ -for patch in $(ls -1 ../*.patch | sort) +for patch in $(ls -1 $rootdir/*.patch | sort) do patch -p1 < $patch done -for patch in $(ls -1 ../branding/*.patch | sort) +for patch in $(ls -1 $rootdir/branding/*.patch | sort) do patch -p1 < $patch done -cat ../spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt +cat $rootdir/spi-cacert.der >> mozilla/security/nss/lib/ckfw/builtins/certdata.txt [% IF c("var/osx") -%] -cp ../cert_override.txt im/app/profile +cp $rootdir/cert_override.txt im/app/profile [% END -%] -cp ../xmppRegister* im/content/ +cp $rootdir/xmppRegister* im/content/ -cp ../branding/default*.png im/branding/messenger/gtk/ -cp ../branding/convWindow*.png im/branding/messenger/gtk/ -cp ../branding/blistWindow*.png im/branding/messenger/gtk/ +cp $rootdir/branding/default*.png im/branding/messenger/gtk/ +cp $rootdir/branding/convWindow*.png im/branding/messenger/gtk/ +cp $rootdir/branding/blistWindow*.png im/branding/messenger/gtk/ -cp ../branding/blistWindow.ico im/branding/messenger/windows/ -cp ../branding/convWindow.ico im/branding/messenger/windows/ -cp ../branding/default.ico im/branding/messenger/windows/ +cp $rootdir/branding/blistWindow.ico im/branding/messenger/windows/ +cp $rootdir/branding/convWindow.ico im/branding/messenger/windows/ +cp $rootdir/branding/default.ico im/branding/messenger/windows/ -cp ../branding/instantbird.ico im/branding/messenger/ -cp ../branding/instantbird.icns im/branding/messenger/ +cp $rootdir/branding/instantbird.ico im/branding/messenger/ +cp $rootdir/branding/instantbird.icns im/branding/messenger/ -cp ../branding/about.png im/branding/messenger/content/ +cp $rootdir/branding/about.png im/branding/messenger/content/ cd mozilla if ls -1 $rootdir/*.mozpatch > /dev/null 2>&1 @@ -80,7 +81,7 @@ then fi cd .. -cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig +cp $rootdir/[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package mv obj-*/dist/*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %]

1 0

[tor-messenger-build/master] instantbird: set MOZ_BUILD_DATE based on commit date
by boklm＠torproject.org 16 Oct '15

16 Oct '15

commit 750686ef16a6688cac791c819d30303f21abc496 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 16 17:06:04 2015 +0200 instantbird: set MOZ_BUILD_DATE based on commit date --- projects/instantbird/build | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/instantbird/build b/projects/instantbird/build index a422cce..1f79af7 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -3,6 +3,7 @@ set -e rootdir=$(pwd) export SHELL=/bin/sh export HOME=$rootdir +export MOZ_BUILD_DATE=$(date -d @[% c('timestamp') %] +%Y%m%d%H) [% IF c('var/osx') -%] [% pc('gcc', 'var/setup', { compiler_tarfile => c('input_files_by_name/gcchost') }) %] ln -s /var/tmp/dist/gcc/bin/gcc /var/tmp/dist/gcc/bin/cc

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Oct '15

16 Oct '15

commit 5af38b533e09d55b404c01d1847dafd7662a0267 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 16 15:15:04 2015 +0000 Update translations for bridgedb --- te_IN/LC_MESSAGES/bridgedb.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po index aa6b8ec..aeb07eb 100644 --- a/te_IN/LC_MESSAGES/bridgedb.po +++ b/te_IN/LC_MESSAGES/bridgedb.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2015-10-16 14:43+0000\n" +"PO-Revision-Date: 2015-10-16 14:54+0000\n" "Last-Translator: decode_dev <gh0sthack3r007(a)gmail.com>\n" "Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n" "MIME-Version: 1.0\n" @@ -48,19 +48,19 @@ msgstr "" #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "సంప్రదించండి " #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "అన్ని ఎంచుకోండి" #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "QRCode చూపించండి " #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "మీ Bridges లైన్స్ QRCode" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -73,7 +73,7 @@ msgstr "" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "మీ QRCode పొందడంలో లోపం వుంది" #: bridgedb/https/templates/bridges.html:73 msgid "" @@ -277,7 +277,7 @@ msgstr "నా Bridges పనిచేయట్లేదు! నాకు సహ #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "మీ Tor పనిచేయకపోతే మీరు మెయిల్ %s చేయండి " #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -291,19 +291,19 @@ msgstr "" #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "" +msgstr "ఇదిగో మీ Bridge రేఖలు " #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "" +msgstr "Bridges పొందండి!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "" +msgstr "Bridge రకం కోసం ఎంపికలు ఎంచుకోండి:" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "" +msgstr "మీకు IPV6 చిరునామాలు అవసరమా?" #: bridgedb/strings.py:135 #, python-format @@ -312,11 +312,11 @@ msgstr "" #: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." -msgstr "" +msgstr "మీ బ్రౌజర్ సరిగా చిత్రాలు ప్రదర్శించడం లేదు." #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "పైన చిత్రం నుండి అక్షరాలు ఎంటర్ చేయంది ..." #: bridgedb/strings.py:144 msgid "How to start using your bridges" @@ -356,14 +356,14 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "ఈ సందేశాన్ని ప్రదర్శిస్తుంది." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "వనిల్లా Bridges అభ్యర్థన." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges."

1 0