- tor-commits - lists.torproject.org

[tor/master] mention 18685 in changes file
by nickm＠torproject.org 26 Apr '16

26 Apr '16

commit f197d189a6c310ee6725e3648ceabc1322dd24fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:40:21 2016 -0400 mention 18685 in changes file --- changes/feature18685 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/feature18685 b/changes/feature18685 index a6d3dcd..bc0d1be 100644 --- a/changes/feature18685 +++ b/changes/feature18685 @@ -1,3 +1,3 @@ o Minor features (controller): - Fire a `STATUS_SERVER` event whenever the hibernation status changes - between "awake"/"soft"/"hard". + between "awake"/"soft"/"hard". Closes ticket 18685.

1 0

[tor/master] Issue a `STATUS_SERVER` event on meaningful hibernation state changes.
by nickm＠torproject.org 26 Apr '16

26 Apr '16

commit a19f4192dabe62ab74e3bf3048fa4209bff595ce Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Wed Mar 30 20:19:11 2016 +0000 Issue a `STATUS_SERVER` event on meaningful hibernation state changes. Implements feature #18685. --- changes/feature18685 | 3 +++ src/or/hibernate.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/changes/feature18685 b/changes/feature18685 new file mode 100644 index 0000000..a6d3dcd --- /dev/null +++ b/changes/feature18685 @@ -0,0 +1,3 @@ + o Minor features (controller): + - Fire a `STATUS_SERVER` event whenever the hibernation status changes + between "awake"/"soft"/"hard". diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 9408925..3666abb 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -28,6 +28,7 @@ hibernating, phase 2: #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "control.h" #include "hibernate.h" #include "main.h" #include "router.h" @@ -111,11 +112,34 @@ static int cfg_start_day = 0, cfg_start_min = 0; /** @} */ +static const char *hibernate_state_to_string(hibernate_state_t state); static void reset_accounting(time_t now); static int read_bandwidth_usage(void); static time_t start_of_accounting_period_after(time_t now); static time_t start_of_accounting_period_containing(time_t now); static void accounting_set_wakeup_time(void); +static void on_hibernate_state_change(hibernate_state_t prev_state); + +/** + * Return the human-readable name for the hibernation state state + */ +static const char * +hibernate_state_to_string(hibernate_state_t state) +{ + static char buf[64]; + switch (state) { + case HIBERNATE_STATE_EXITING: return "EXITING"; + case HIBERNATE_STATE_LOWBANDWIDTH: return "SOFT"; + case HIBERNATE_STATE_DORMANT: return "HARD"; + case HIBERNATE_STATE_INITIAL: + case HIBERNATE_STATE_LIVE: + return "AWAKE"; + default: + log_warn(LD_BUG, "unknown hibernate state %d", state); + tor_snprintf(buf, sizeof(buf), "unknown [%d]", state); + return buf; + } +} /* ************ * Functions for bandwidth accounting. @@ -935,6 +959,7 @@ consider_hibernation(time_t now) { int accounting_enabled = get_options()->AccountingMax != 0; char buf[ISO_TIME_LEN+1]; + hibernate_state_t prev_state = hibernate_state; /* If we're in 'exiting' mode, then we just shut down after the interval * elapses. */ @@ -990,6 +1015,10 @@ consider_hibernation(time_t now) hibernate_end_time_elapsed(now); } } + + /* Dispatch a controller event if the hibernation state changed. */ + if (hibernate_state != prev_state) + on_hibernate_state_change(prev_state); } /** Helper function: called when we get a GETINFO request for an @@ -1007,12 +1036,8 @@ getinfo_helper_accounting(control_connection_t *conn, if (!strcmp(question, "accounting/enabled")) { *answer = tor_strdup(accounting_is_enabled(get_options()) ? "1" : "0"); } else if (!strcmp(question, "accounting/hibernating")) { - if (hibernate_state == HIBERNATE_STATE_DORMANT) - *answer = tor_strdup("hard"); - else if (hibernate_state == HIBERNATE_STATE_LOWBANDWIDTH) - *answer = tor_strdup("soft"); - else - *answer = tor_strdup("awake"); + *answer = tor_strdup(hibernate_state_to_string(hibernate_state)); + tor_strlower(*answer); } else if (!strcmp(question, "accounting/bytes")) { tor_asprintf(answer, U64_FORMAT" "U64_FORMAT, U64_PRINTF_ARG(n_bytes_read_in_interval), @@ -1062,6 +1087,20 @@ getinfo_helper_accounting(control_connection_t *conn, return 0; } +/** + * Helper function: called when the hibernation state changes, and sends a + * SERVER_STATUS event to notify interested controllers of the accounting + * state change. + */ +static void +on_hibernate_state_change(hibernate_state_t prev_state) +{ + (void)prev_state; /* Should we do something with this? */ + control_event_server_status(LOG_NOTICE, + "HIBERNATION_STATUS STATUS=%s", + hibernate_state_to_string(hibernate_state)); +} + #ifdef TOR_UNIT_TESTS /** * Manually change the hibernation state. Private; used only by the unit

1 0

[tor/master] Merge remote-tracking branch 'yawning-schwanenleid/feature18685'
by nickm＠torproject.org 26 Apr '16

26 Apr '16

commit 4a44e2d6f1152c6d431f21dca26c84a8a28172a5 Merge: bff53aa a19f419 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 26 13:39:50 2016 -0400 Merge remote-tracking branch 'yawning-schwanenleid/feature18685' changes/feature18685 | 3 +++ src/or/hibernate.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 48 insertions(+), 6 deletions(-)

1 0

[webwml/master] Add new Tor Browser version: 5.5.5
by boklm＠torproject.org 26 Apr '16

26 Apr '16

commit e8a48e7a056063f44f9fc33482cb57661cd4dab1 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 26 18:19:06 2016 +0200 Add new Tor Browser version: 5.5.5 --- include/versions.wmi | 20 ++++++++++---------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index cf8e6cb..c350222 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -4,27 +4,27 @@ <define-tag version-win32-stable whitespace=delete>0.2.7.6</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-5.5</define-tag> -<define-tag version-torbrowserbundledir whitespace=delete>5.5.4</define-tag> +<define-tag version-torbrowserbundledir whitespace=delete>5.5.5</define-tag> <define-tag version-torbrowserbundlebetadir whitespace=delete>6.0a4</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>5.5.4</define-tag> -<define-tag releasedate-torbrowserbundle whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>5.5.5</define-tag> +<define-tag releasedate-torbrowserbundle whitespace=delete>2016-04-26</define-tag> <define-tag version-torbrowserbundlebeta whitespace=delete>6.0a4</define-tag> <define-tag releasedate-torbrowserbundlebeta whitespace=delete>2016-03-18</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.4</define-tag> -<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-03-18</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.4</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>5.5.5</define-tag> +<define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2016-04-26</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>5.5.5</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2016-03-18</define-tag> <define-tag version-torbrowserbundlelinux32beta whitespace=delete>6.0a4</define-tag> <define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2016-03-18</define-tag> <define-tag version-torbrowserbundlelinux64beta whitespace=delete>6.0a4</define-tag> <define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2016-03-18</define-tag> -<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.4</define-tag> -<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-03-18</define-tag> -<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.4</define-tag> -<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-03-18</define-tag> +<define-tag version-torbrowserbundleosx32 whitespace=delete>5.5.5</define-tag> +<define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2016-04-26</define-tag> +<define-tag version-torbrowserbundleosx64 whitespace=delete>5.5.5</define-tag> +<define-tag releasedate-torbrowserbundleosx64 whitespace=delete>2016-04-26</define-tag> <define-tag version-torbrowserbundleosx64beta whitespace=delete>6.0a4</define-tag> <define-tag releasedate-torbrowserbundleosx64beta whitespace=delete>2016-03-18</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index d6b52f3..7b5369d 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -3,6 +3,10 @@ "5.5.4-Linux", "5.5.4-MacOS", "5.5.4-Windows", +"5.5.5", +"5.5.5-Linux", +"5.5.5-MacOS", +"5.5.5-Windows", "6.0a4", "6.0a4-Linux", "6.0a4-MacOS",

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 26 Apr '16

26 Apr '16

commit eb70e6e888f4b2f3a53d34b4ebc96a0d0d5c4f29 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 26 15:15:46 2016 +0000 Update translations for tails-misc_completed --- es.po | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/es.po b/es.po index 5fa9edb..4bcc390 100644 --- a/es.po +++ b/es.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-31 21:16+0000\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-04-26 14:55+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -65,13 +65,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "¿Quiere iniciar Electrum de todas formas?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Iniciar" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Salir" @@ -233,17 +233,24 @@ msgstr "Datos de salida de GnuPG:" msgid "Other messages provided by GnuPG:" msgstr "Otros mensajes emitidos por GnuPG:" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "La característica de persistencia de Claws Mail está activada." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Si tiene correos guardados en Claws Mail, debe <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrar sus datos</a> antes de iniciar Icedove." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Si ya migró sus correos electrónicos a Icedove, debería <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>borrar todos sus datos de Claws Mail</a> para eliminar esta advertencia." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Reiniciar"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Apr '16

26 Apr '16

commit 2b729c78cac25015dbb0e35553ae7cddfbcb0862 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 26 15:15:42 2016 +0000 Update translations for tails-misc --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index 947e5ed..4bcc390 100644 --- a/es.po +++ b/es.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-26 14:55+0000\n" +"Last-Translator: strel\n" "Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -249,7 +249,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Si ya migró sus correos electrónicos a Icedove, debería <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>borrar todos sus datos de Claws Mail</a> para eliminar esta advertencia." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 26 Apr '16

26 Apr '16

commit 2221589fd86808ec625bc3305531fa22bd5501bc Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 26 13:15:44 2016 +0000 Update translations for tails-misc_completed --- zh_CN.po | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index b7f7b33..95c61a6 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -5,19 +5,20 @@ # Translators: # khi, 2013 # bnw, 2014 -# Meng3, 2014 +# Meng San, 2014 # leungsookfan <leung.sookfan(a)riseup.net>, 2014 # Sanya chang <408070986(a)qq.com>, 2013 # khi, 2014 # Xiaolan <xiaolan(a)protonmail.ch>, 2014 -# YF <yfdyh000(a)gmail.com>, 2013-2016 +# Y.F Yang <yfdyh000(a)gmail.com>, 2016 +# Y.F Yang <yfdyh000(a)gmail.com>, 2013-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: YF <yfdyh000(a)gmail.com>\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-04-26 13:07+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,13 +67,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "您无论如何都要启动 Electrum 吗？" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "启动(_L)" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "退出(_E)" @@ -231,17 +232,24 @@ msgstr "GnuPG 输出：" msgid "Other messages provided by GnuPG:" msgstr "GnuPG 提供的其他信息：" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "Claws Mail 持久功能已激活。" -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "如果您有电子邮件保存在 Claws Mail 中，您应该在启动 Icedove 前<a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>迁移数据</a>。" +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "如果您已迁移您的邮件到 Icedove，您应该<a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>删除您所有的 Claws Mail 数据</a>以去除此警告。" + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "重新启动"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Apr '16

26 Apr '16

commit b38f2a162710a8576874eaf8a0733131c95a85ef Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 26 13:15:41 2016 +0000 Update translations for tails-misc --- zh_CN.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/zh_CN.po b/zh_CN.po index d28e133..95c61a6 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,14 +10,15 @@ # Sanya chang <408070986(a)qq.com>, 2013 # khi, 2014 # Xiaolan <xiaolan(a)protonmail.ch>, 2014 +# Y.F Yang <yfdyh000(a)gmail.com>, 2016 # Y.F Yang <yfdyh000(a)gmail.com>, 2013-2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-26 13:07+0000\n" +"Last-Translator: Y.F Yang <yfdyh000(a)gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -247,7 +248,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "如果您已迁移您的邮件到 Icedove，您应该<a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>删除您所有的 Claws Mail 数据</a>以去除此警告。" #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 26 Apr '16

26 Apr '16

commit c6868eadf3aededf566eba6eeb4bda323566adeb Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 26 12:15:44 2016 +0000 Update translations for tails-misc_completed --- fr_CA.po | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 7ebaf68..323afc1 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -4,18 +4,19 @@ # # Translators: # Carley Wilson <carley.wilson(a)me.com>, 2014 +# French language coordinator <yahoe.001(a)gmail.com>, 2016 # Jean-Yves Toumit <saiolar-c(a)yahoo.fr>, 2013 # Onizuka, 2013 # Towatowa441, 2013 -# Trans-fr, 2015-2016 -# Trans-fr, 2014-2015 +# French language coordinator <yahoe.001(a)gmail.com>, 2015-2016 +# French language coordinator <yahoe.001(a)gmail.com>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-03-17 15:03+0100\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: Trans-fr\n" +"POT-Creation-Date: 2016-04-25 14:02+0200\n" +"PO-Revision-Date: 2016-04-26 12:09+0000\n" +"Last-Translator: French language coordinator <yahoe.001(a)gmail.com>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,13 +65,13 @@ msgid "Do you want to start Electrum anyway?" msgstr "Voulez-vous quand même démarrer Electrum?" #: config/chroot_local-includes/usr/local/bin/electrum:23 -#: config/chroot_local-includes/usr/local/bin/icedove:23 +#: config/chroot_local-includes/usr/local/bin/icedove:30 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:41 msgid "_Launch" msgstr "_Lancer" #: config/chroot_local-includes/usr/local/bin/electrum:24 -#: config/chroot_local-includes/usr/local/bin/icedove:24 +#: config/chroot_local-includes/usr/local/bin/icedove:31 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:42 msgid "_Exit" msgstr "_Quitter" @@ -232,17 +233,24 @@ msgstr "Sortie de GnuPG :" msgid "Other messages provided by GnuPG:" msgstr "Autres messages fournis par GnuPG :" -#: config/chroot_local-includes/usr/local/bin/icedove:19 +#: config/chroot_local-includes/usr/local/bin/icedove:20 msgid "The Claws Mail persistence feature is activated." msgstr "La fonction de persistance du client Claws Mail est activée." -#: config/chroot_local-includes/usr/local/bin/icedove:21 +#: config/chroot_local-includes/usr/local/bin/icedove:22 msgid "" "If you have emails saved in Claws Mail, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrate" " your data</a> before starting Icedove." msgstr "Si vous avez des courriels enregistrés dans le client Claws Mail, vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove'>migrer vos données</a> avant de lancer Icedove." +#: config/chroot_local-includes/usr/local/bin/icedove:27 +msgid "" +"If you already migrated your emails to Icedove, you should <a " +"href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" +" all your Claws Mail data</a> to remove this warning." +msgstr "Si vous avez déjà migrés vos courriels vers Icedove, vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>effacer toutes vos données Claws Mail</a> pour supprimer ce message." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart" msgstr "Redémarrer"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Apr '16

26 Apr '16

commit 6d999fafbfc43b32843e81570650304d3cbb1509 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 26 12:15:41 2016 +0000 Update translations for tails-misc --- fr_CA.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fr_CA.po b/fr_CA.po index 3d31870..323afc1 100644 --- a/fr_CA.po +++ b/fr_CA.po @@ -4,6 +4,7 @@ # # Translators: # Carley Wilson <carley.wilson(a)me.com>, 2014 +# French language coordinator <yahoe.001(a)gmail.com>, 2016 # Jean-Yves Toumit <saiolar-c(a)yahoo.fr>, 2013 # Onizuka, 2013 # Towatowa441, 2013 @@ -14,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-25 14:02+0200\n" -"PO-Revision-Date: 2016-04-26 09:06+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2016-04-26 12:09+0000\n" +"Last-Translator: French language coordinator <yahoe.001(a)gmail.com>\n" "Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -248,7 +249,7 @@ msgid "" "If you already migrated your emails to Icedove, you should <a " "href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>delete" " all your Claws Mail data</a> to remove this warning." -msgstr "" +msgstr "Si vous avez déjà migrés vos courriels vers Icedove, vous devriez <a href='https://tails.boum.org/doc/anonymous_internet/claws_mail_to_icedove#delete'>effacer toutes vos données Claws Mail</a> pour supprimer ce message." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/shutdown-helper@tails.boum.org/extension.js:71 msgid "Restart"

1 0