Hi,
Please review the patches attached to prepare the Greeter for Tails 1.1
The first one, 0001-fr-Update-translations-according-[..]
is the result of updating the PO files, so it basically does not
need review
Thanks and cheers,
matsaFrom e1e5785d426af3cc7a7b8cddb0a9de6418f56c80 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@???>
Date: Mon, 7 Jul 2014 18:23:17 +0000
Subject: [PATCH 1/2] [fr] Update translations according to README.translators
---
po/fr.po | 188 +++++++++++++++++++++++++-------------------------
po/tails-greeter.pot | 120 ++++++++++++++++----------------
2 files changed, 155 insertions(+), 153 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index fbd6595..d0b7b67 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 15:09+0200\n"
+"POT-Creation-Date: 2014-07-07 18:21+0000\n"
"PO-Revision-Date: 2014-03-17 13:31+0100\n"
"Last-Translator: Onizuka\n"
"Language-Team: French (
http://www.transifex.com/projects/p/torproject/"
@@ -22,62 +22,95 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
#: ../glade/persistencewindow.glade.h:1
+msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+msgstr "<a href=\"doc/first_steps/persistence/use.fr.html\">Documentation</a>"
+
+#: ../glade/persistencewindow.glade.h:2
+msgid "<i>Wrong passphrase. Please try again.</i>"
+msgstr "<i>Mauvaise phrase de passe. Essayez de nouveau.</i>"
+
+#: ../glade/persistencewindow.glade.h:3
msgid "Forward"
msgstr "Suivant"
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
+#: ../glade/persistencewindow.glade.h:4 ../glade/optionswindow.glade.h:11
msgid "Login"
msgstr "Connexion"
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
-msgstr "Bienvenue dans Tails"
-
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
-msgstr "Activer la persistance ?"
-
#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
-msgstr "<a href=\"doc/first_steps/persistence/use.fr.html\">Documentation</a>"
+msgid "More options?"
+msgstr "Plus d'options ?"
#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
-msgstr "Oui"
-
-#: ../glade/persistencewindow.glade.h:7
msgid "No"
msgstr "Non"
-#: ../glade/persistencewindow.glade.h:8
+#: ../glade/persistencewindow.glade.h:7
msgid "Passphrase:"
msgstr "Phrase de passe :"
-#: ../glade/persistencewindow.glade.h:9
+#: ../glade/persistencewindow.glade.h:8
msgid "Read-Only?"
msgstr "Lecture-Seule ?"
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
-msgstr "<i>Mauvaise phrase de passe. Essayez de nouveau.</i>"
+#: ../glade/persistencewindow.glade.h:9
+msgid "Use persistence?"
+msgstr "Activer la persistance ?"
+
+#: ../glade/persistencewindow.glade.h:10 ../glade/optionswindow.glade.h:21
+msgid "Welcome to Tails"
+msgstr "Bienvenue dans Tails"
#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
-msgstr "Plus d'options ?"
+msgid "Yes"
+msgstr "Oui"
+
+#: ../glade/optionswindow.glade.h:1
+msgid ""
+"<a href=\"doc/first_steps/startup_options/administration_password.en.html"
+"\">Documentation</a>"
+msgstr ""
+"<a href=\"doc/first_steps/startup_options/administration_password.fr.html"
+"\">Documentation</a>"
+
+#: ../glade/optionswindow.glade.h:2
+msgid ""
+"<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html"
+"\">Documentation</a>"
+msgstr ""
+"<a href=\"doc/first_steps/startup_options/mac_spoofing.fr.html"
+"\">Documentation</a>"
#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
-msgstr "Mot de passe d'administration"
+msgid ""
+"<a href=\"doc/first_steps/startup_options/network_configuration.en.html"
+"\">Documentation</a>"
+msgstr ""
+"<a href=\"doc/first_steps/startup_options/network_configuration.fr.html"
+"\">Documentation</a>"
#: ../glade/optionswindow.glade.h:4
msgid ""
-"<a href=\"doc/first_steps/startup_options/administration_password.en.html"
+"<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html"
"\">Documentation</a>"
msgstr ""
-"<a href=\"doc/first_steps/startup_options/administration_password.fr.html"
+"<a href=\"doc/first_steps/startup_options/windows_camouflage.fr.html"
"\">Documentation</a>"
#: ../glade/optionswindow.glade.h:5
+msgid "<i>Passwords do not match</i>"
+msgstr "<i>Les mots de passe ne concordent pas</i>"
+
+#: ../glade/optionswindow.glade.h:6
+#, fuzzy
+msgid "Activate Microsoft Windows 8 Camouflage"
+msgstr "Activer le camouflage Microsoft Windows XP"
+
+#: ../glade/optionswindow.glade.h:7
+msgid "Administration password"
+msgstr "Mot de passe d'administration"
+
+#: ../glade/optionswindow.glade.h:8
msgid ""
"Enter an administration password in case you need to perform administration "
"tasks.\n"
@@ -87,53 +120,30 @@ msgstr ""
"tâches d'administration.\n"
"Sinon, il sera désactivé pour une meilleure sécurité."
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
-msgstr "Vérification du mot de passe :"
-
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
-msgstr "<i>Les mots de passe ne concordent pas</i>"
-
#: ../glade/optionswindow.glade.h:10
-msgid "Windows camouflage"
-msgstr "Camouflage Windows "
-
-#: ../glade/optionswindow.glade.h:11
msgid ""
-"<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html"
-"\">Documentation</a>"
+"It is generally safer to spoof MAC addresses, but it might also raise "
+"suspicion or cause network connection problems."
msgstr ""
-"<a href=\"doc/first_steps/startup_options/windows_camouflage.fr.html"
-"\">Documentation</a>"
+"Il est généralement plus sûr d'usurper les adresses MAC, mais cela peut "
+"également attirer les soupçons et provoquer des problèmes de connexion "
+"réseau."
#: ../glade/optionswindow.glade.h:12
-msgid ""
-"This option makes Tails look more like Microsoft Windows XP. This may be "
-"useful in public places in order to avoid attracting suspicion."
-msgstr ""
-"Cette option donne à Tails les apparences de Microsoft Windows XP. Cela peut "
-"être utile afin de ne pas attirer l'attention dans un lieu public."
+msgid "MAC address spoofing"
+msgstr "Usurpation d'adresse MAC"
#: ../glade/optionswindow.glade.h:13
-msgid "Activate Microsoft Windows XP Camouflage"
-msgstr "Activer le camouflage Microsoft Windows XP"
+msgid "Network configuration"
+msgstr "Configuration réseau"
#: ../glade/optionswindow.glade.h:14
-msgid "MAC address spoofing"
-msgstr "Usurpation d'adresse MAC"
+msgid "Password:"
+msgstr "Mot de passe :"
#: ../glade/optionswindow.glade.h:15
-msgid ""
-"<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html"
-"\">Documentation</a>"
-msgstr ""
-"<a href=\"doc/first_steps/startup_options/mac_spoofing.fr.html"
-"\">Documentation</a>"
+msgid "Spoof all MAC addresses"
+msgstr "Usurper toutes les adresses MAC"
#: ../glade/optionswindow.glade.h:16
msgid ""
@@ -145,30 +155,13 @@ msgstr ""
#: ../glade/optionswindow.glade.h:17
msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+"This computer's Internet connection is censored, filtered, or proxied. You "
+"need to configure bridge, firewall, or proxy settings."
msgstr ""
-"Il est généralement plus sûr d'usurper les adresses MAC, mais cela peut "
-"également attirer les soupçons et provoquer des problèmes de connexion "
-"réseau."
+"La connexion Internet de cet ordinateur est censurée, filtrée ou passe par "
+"un proxy. Vous devez configurer un bridge, un pare-feu ou un proxy."
#: ../glade/optionswindow.glade.h:18
-msgid "Spoof all MAC addresses"
-msgstr "Usurper toutes les adresses MAC"
-
-#: ../glade/optionswindow.glade.h:19
-msgid "Network configuration"
-msgstr "Configuration réseau"
-
-#: ../glade/optionswindow.glade.h:20
-msgid ""
-"<a href=\"doc/first_steps/startup_options/network_configuration.en.html"
-"\">Documentation</a>"
-msgstr ""
-"<a href=\"doc/first_steps/startup_options/network_configuration.fr.html"
-"\">Documentation</a>"
-
-#: ../glade/optionswindow.glade.h:21
msgid ""
"This computer's Internet connection is clear of obstacles. You would like to "
"connect directly to the Tor network."
@@ -176,13 +169,22 @@ msgstr ""
"La connexion Internet de cet ordinateur est sans obstacle. Vous voulez vous "
"connecter directement au réseau Tor."
-#: ../glade/optionswindow.glade.h:22
+#: ../glade/optionswindow.glade.h:19
+#, fuzzy
msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+"This option makes Tails look more like Microsoft Windows 8. This may be "
+"useful in public places in order to avoid attracting suspicion."
msgstr ""
-"La connexion Internet de cet ordinateur est censurée, filtrée ou passe par "
-"un proxy. Vous devez configurer un bridge, un pare-feu ou un proxy."
+"Cette option donne à Tails les apparences de Microsoft Windows XP. Cela peut "
+"être utile afin de ne pas attirer l'attention dans un lieu public."
+
+#: ../glade/optionswindow.glade.h:20
+msgid "Verify Password:"
+msgstr "Vérification du mot de passe :"
+
+#: ../glade/optionswindow.glade.h:22
+msgid "Windows camouflage"
+msgstr "Camouflage Windows "
#: ../glade/langpanel.glade.h:1
msgid " "
@@ -193,13 +195,13 @@ msgid "Language"
msgstr "Langue"
#: ../glade/langpanel.glade.h:3
-msgid "Locale"
-msgstr "Lieu"
-
-#: ../glade/langpanel.glade.h:4
msgid "Layout"
msgstr "Agencement"
+#: ../glade/langpanel.glade.h:4
+msgid "Locale"
+msgstr "Lieu"
+
#: ../tailsgreeter/persistence.py:59
#, python-format
msgid ""
diff --git a/po/tails-greeter.pot b/po/tails-greeter.pot
index db941d0..cc8742c 100644
--- a/po/tails-greeter.pot
+++ b/po/tails-greeter.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-28 22:33+0200\n"
+"POT-Creation-Date: 2014-07-07 18:21+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@???>\n"
@@ -18,106 +18,112 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../glade/persistencewindow.glade.h:1
-msgid "Forward"
+msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
msgstr ""
-#: ../glade/persistencewindow.glade.h:2 ../glade/optionswindow.glade.h:1
-msgid "Login"
+#: ../glade/persistencewindow.glade.h:2
+msgid "<i>Wrong passphrase. Please try again.</i>"
msgstr ""
-#: ../glade/persistencewindow.glade.h:3 ../glade/optionswindow.glade.h:2
-msgid "Welcome to Tails"
+#: ../glade/persistencewindow.glade.h:3
+msgid "Forward"
msgstr ""
-#: ../glade/persistencewindow.glade.h:4
-msgid "Use persistence?"
+#: ../glade/persistencewindow.glade.h:4 ../glade/optionswindow.glade.h:11
+msgid "Login"
msgstr ""
#: ../glade/persistencewindow.glade.h:5
-msgid "<a href=\"doc/first_steps/persistence/use.en.html\">Documentation</a>"
+msgid "More options?"
msgstr ""
#: ../glade/persistencewindow.glade.h:6
-msgid "Yes"
+msgid "No"
msgstr ""
#: ../glade/persistencewindow.glade.h:7
-msgid "No"
+msgid "Passphrase:"
msgstr ""
#: ../glade/persistencewindow.glade.h:8
-msgid "Passphrase:"
+msgid "Read-Only?"
msgstr ""
#: ../glade/persistencewindow.glade.h:9
-msgid "Read-Only?"
+msgid "Use persistence?"
msgstr ""
-#: ../glade/persistencewindow.glade.h:10
-msgid "<i>Wrong passphrase. Please try again.</i>"
+#: ../glade/persistencewindow.glade.h:10 ../glade/optionswindow.glade.h:21
+msgid "Welcome to Tails"
msgstr ""
#: ../glade/persistencewindow.glade.h:11
-msgid "More options?"
+msgid "Yes"
+msgstr ""
+
+#: ../glade/optionswindow.glade.h:1
+msgid ""
+"<a href=\"doc/first_steps/startup_options/administration_password.en.html"
+"\">Documentation</a>"
+msgstr ""
+
+#: ../glade/optionswindow.glade.h:2
+msgid ""
+"<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html"
+"\">Documentation</a>"
msgstr ""
#: ../glade/optionswindow.glade.h:3
-msgid "Administration password"
+msgid ""
+"<a href=\"doc/first_steps/startup_options/network_configuration.en.html"
+"\">Documentation</a>"
msgstr ""
#: ../glade/optionswindow.glade.h:4
msgid ""
-"<a href=\"doc/first_steps/startup_options/administration_password.en.html"
+"<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html"
"\">Documentation</a>"
msgstr ""
#: ../glade/optionswindow.glade.h:5
-msgid ""
-"Enter an administration password in case you need to perform administration "
-"tasks.\n"
-"Otherwise it will be disabled for better security."
+msgid "<i>Passwords do not match</i>"
msgstr ""
-#: ../glade/optionswindow.glade.h:7
-msgid "Password:"
+#: ../glade/optionswindow.glade.h:6
+msgid "Activate Microsoft Windows 8 Camouflage"
msgstr ""
-#: ../glade/optionswindow.glade.h:8
-msgid "Verify Password:"
+#: ../glade/optionswindow.glade.h:7
+msgid "Administration password"
msgstr ""
-#: ../glade/optionswindow.glade.h:9
-msgid "<i>Passwords do not match</i>"
+#: ../glade/optionswindow.glade.h:8
+msgid ""
+"Enter an administration password in case you need to perform administration "
+"tasks.\n"
+"Otherwise it will be disabled for better security."
msgstr ""
#: ../glade/optionswindow.glade.h:10
-msgid "Windows camouflage"
-msgstr ""
-
-#: ../glade/optionswindow.glade.h:11
msgid ""
-"<a href=\"doc/first_steps/startup_options/windows_camouflage.en.html"
-"\">Documentation</a>"
+"It is generally safer to spoof MAC addresses, but it might also raise "
+"suspicion or cause network connection problems."
msgstr ""
#: ../glade/optionswindow.glade.h:12
-msgid ""
-"This option makes Tails look more like Microsoft Windows 8. This may be "
-"useful in public places in order to avoid attracting suspicion."
+msgid "MAC address spoofing"
msgstr ""
#: ../glade/optionswindow.glade.h:13
-msgid "Activate Microsoft Windows 8 Camouflage"
+msgid "Network configuration"
msgstr ""
#: ../glade/optionswindow.glade.h:14
-msgid "MAC address spoofing"
+msgid "Password:"
msgstr ""
#: ../glade/optionswindow.glade.h:15
-msgid ""
-"<a href=\"doc/first_steps/startup_options/mac_spoofing.en.html"
-"\">Documentation</a>"
+msgid "Spoof all MAC addresses"
msgstr ""
#: ../glade/optionswindow.glade.h:16
@@ -128,34 +134,28 @@ msgstr ""
#: ../glade/optionswindow.glade.h:17
msgid ""
-"It is generally safer to spoof MAC addresses, but it might also raise "
-"suspicion or cause network connection problems."
+"This computer's Internet connection is censored, filtered, or proxied. You "
+"need to configure bridge, firewall, or proxy settings."
msgstr ""
#: ../glade/optionswindow.glade.h:18
-msgid "Spoof all MAC addresses"
+msgid ""
+"This computer's Internet connection is clear of obstacles. You would like to "
+"connect directly to the Tor network."
msgstr ""
#: ../glade/optionswindow.glade.h:19
-msgid "Network configuration"
-msgstr ""
-
-#: ../glade/optionswindow.glade.h:20
msgid ""
-"<a href=\"doc/first_steps/startup_options/network_configuration.en.html"
-"\">Documentation</a>"
+"This option makes Tails look more like Microsoft Windows 8. This may be "
+"useful in public places in order to avoid attracting suspicion."
msgstr ""
-#: ../glade/optionswindow.glade.h:21
-msgid ""
-"This computer's Internet connection is clear of obstacles. You would like to "
-"connect directly to the Tor network."
+#: ../glade/optionswindow.glade.h:20
+msgid "Verify Password:"
msgstr ""
#: ../glade/optionswindow.glade.h:22
-msgid ""
-"This computer's Internet connection is censored, filtered, or proxied. You "
-"need to configure bridge, firewall, or proxy settings."
+msgid "Windows camouflage"
msgstr ""
#: ../glade/langpanel.glade.h:1
@@ -167,11 +167,11 @@ msgid "Language"
msgstr ""
#: ../glade/langpanel.glade.h:3
-msgid "Locale"
+msgid "Layout"
msgstr ""
#: ../glade/langpanel.glade.h:4
-msgid "Layout"
+msgid "Locale"
msgstr ""
#: ../tailsgreeter/persistence.py:59
--
1.7.2.5
From 47044e29cf3ed4f42e1f05417152605af532bba9 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@???>
Date: Mon, 7 Jul 2014 18:31:26 +0000
Subject: [PATCH 2/2] [fr] translations for Windows 8 camouflage
---
po/fr.po | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/po/fr.po b/po/fr.po
index d0b7b67..a3dc1d6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-07-07 18:21+0000\n"
-"PO-Revision-Date: 2014-03-17 13:31+0100\n"
+"PO-Revision-Date: 2014-07-07 18:30-0000\n"
"Last-Translator: Onizuka\n"
"Language-Team: French (
http://www.transifex.com/projects/p/torproject/"
"language/fr/)\n"
@@ -102,9 +102,8 @@ msgid "<i>Passwords do not match</i>"
msgstr "<i>Les mots de passe ne concordent pas</i>"
#: ../glade/optionswindow.glade.h:6
-#, fuzzy
msgid "Activate Microsoft Windows 8 Camouflage"
-msgstr "Activer le camouflage Microsoft Windows XP"
+msgstr "Activer le camouflage Microsoft Windows 8"
#: ../glade/optionswindow.glade.h:7
msgid "Administration password"
@@ -170,12 +169,11 @@ msgstr ""
"connecter directement au réseau Tor."
#: ../glade/optionswindow.glade.h:19
-#, fuzzy
msgid ""
"This option makes Tails look more like Microsoft Windows 8. This may be "
"useful in public places in order to avoid attracting suspicion."
msgstr ""
-"Cette option donne à Tails les apparences de Microsoft Windows XP. Cela peut "
+"Cette option donne à Tails les apparences de Microsoft Windows 8. Cela peut "
"être utile afin de ne pas attirer l'attention dans un lieu public."
#: ../glade/optionswindow.glade.h:20
--
1.7.2.5
