commit 1ec4c7b34a595a218121b81879ced1450e3a72ad
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Mon Aug 16 08:18:57 2021 -0400
Make the version 0.4.5.10, not 0.4.5.10-dev.
---
configure.ac | 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index cd38240a34..14ce94db87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.5.10-dev])
+AC_INIT([tor],[0.4.5.10])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -16,7 +16,7 @@ configure_flags="$*"
# version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-13"], # for 0.4.5.10-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.5.10
[Approximate date when this software was released. (Updated when the version changes.)])
# "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index 9b9172fb90..fe25571c77 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.4.5.10-dev"
+!define VERSION "0.4.5.10"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 070d62c9b8..a2ebca9eb6 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.5.10-dev"
+#define VERSION "0.4.5.10"
#define HAVE_STRUCT_SOCKADDR_IN6
#define HAVE_STRUCT_IN6_ADDR
commit fd38609ae2e5fd5cb826bbf0913f60685c6a66ac
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Mon Aug 16 08:21:04 2021 -0400
Make the version 0.4.6.7, not 0.4.6.7-dev.
---
configure.ac | 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index e41c6f5bf4..788597bfdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
dnl See LICENSE for licensing information
AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.6.7-dev])
+AC_INIT([tor],[0.4.6.7])
AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
AC_CONFIG_MACRO_DIR([m4])
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config
# version number changes. Tor uses it to make sure that it
# only shuts down for missing "required protocols" when those protocols
# are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-13"], # for 0.4.6.7-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-08-16"], # for 0.4.6.7
[Approximate date when this software was released. (Updated when the version changes.)])
# "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in
index d69ba2d499..3dd470100f 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
!include "LogicLib.nsh"
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.4.6.7-dev"
+!define VERSION "0.4.6.7"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index feb997196c..cc70a3ab19 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
#define USING_TWOS_COMPLEMENT
/* Version number of package */
-#define VERSION "0.4.6.7-dev"
+#define VERSION "0.4.6.7"
#define HAVE_STRUCT_SOCKADDR_IN6
#define HAVE_STRUCT_IN6_ADDR
commit da1065cb689350e4966eabe92f56f35ede74cde0
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Aug 16 10:46:14 2021 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
fr.po | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/fr.po b/fr.po
index 430fbdcfa3..7f0dc9c257 100644
--- a/fr.po
+++ b/fr.po
@@ -23,6 +23,7 @@
# jean valjean <nihei(a)disroot.org>, 2021
# Jean-Yves Toumit <saiolar-c(a)yahoo.fr>, 2013
# Lidija <llazic.bgd(a)gmail.com>, 2015
+# Matburnx <matboury(a)gmail.com>, 2021
# mosira <romain.moisan(a)gmail.com>, 2014
# Onizuka, 2013
# Onizuka, 2013
@@ -42,8 +43,8 @@ msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-08-10 10:57+0200\n"
-"PO-Revision-Date: 2021-08-11 09:26+0000\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2021-08-16 10:43+0000\n"
+"Last-Translator: Matburnx <matboury(a)gmail.com>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -1179,11 +1180,11 @@ msgstr "Langue, mot de passe d’administration et paramètres supplémentaires"
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
msgid "Tor Bridges"
-msgstr ""
+msgstr "Les Ponts Tor"
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
msgid "Save the last bridges that you used to connect to Tor"
-msgstr ""
+msgstr "Enregistrer le dernier pont Tor utilisé pour se connecter à Tor."
#: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
msgid "Browser Bookmarks"
@@ -2634,7 +2635,7 @@ msgstr ""
msgid ""
"To prevent network attacks, your time zone and clock need to be correct to "
"connect to Tor using bridges."
-msgstr ""
+msgstr "Pour éviter les attaques de réseau, votre fuseau horaire et votre horloge ont besoin d'être corrects pour se connecter au réseau Tor avec des ponts."
#: ../config/chroot_local-includes/usr/share/tails/tca/main.ui.in:466
msgid "Set Time"
@@ -2855,17 +2856,17 @@ msgstr ""
#: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:87
msgid "Select the time zone you want to use"
-msgstr ""
+msgstr "Sélectionnez le fuseau horaire que vous souhaitez utiliser."
#: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:100
msgid ""
"Your time zone cannot be used to identify or geolocalize you. Your time zone"
" will never be sent over the network."
-msgstr ""
+msgstr "Votre fuseau horaire ne peut pas être utilisé pour vous identifier ou vous géolocaliser. Votre fuseau horaire ne sera jamais envoyé sur le réseau."
#: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:117
msgid "Time zone"
-msgstr ""
+msgstr "Fuseau horaire"
#: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:155
msgid "Time"
@@ -2929,4 +2930,4 @@ msgstr "décembre"
#: ../config/chroot_local-includes/usr/share/tails/tca/time-dialog.ui.in:324
msgid "Clock"
-msgstr ""
+msgstr "Horloge"