Le Tue, 4 Sep 2012 23:23:04 +0000,
Matsa <matsa@???> a écrit :
> Salut,
>
> j'ai commencé des traductions, et à 'unfuzzer' tout un tas de truc.
>
> J'aimerai me relire avant de pusher, tôt demain. Dans l'attente,
> merci de ne pas trop modifier les fichiers .fr.po, afin de m'éviter
> d'avoir à résoudre des merge-conflict en pagaille.
>
> Merci, à demain
Salut,
je me retrouve malgré tout avec des self-made merge-conflicts en
pagaille.
Sur le départ, je me résouds, la mort dans l'âme, à vous soumettre les
patchs ci-joints. Même si je ne suis pas satisfait du résultat, ils
apportent quelques corrections utiles.
Chose importante, les sous-page de 'Vérifier l'image ISO' s'affichent
en anglais, pas moyen de trouver d'où ça vient:
https://tails.boum.org/download/index.fr.html#index3h1
(cliquez sur
- En utilisant Linux avec Gnome: Ubuntu, Debian, Tails, etc.
- En utilisant Linux et les lignes de commande
- En utilisant un autre système d'exploitation )
Je suis conscient que c'est une contribution de bien piètre qualité, et
dans l'espoir de me faire pardonner, je joins également un petit
'howto', permettant de chercher récursivement les 'fuzzy' et 'FIXME'
dans les fichiers.
Si, après test et relecture, il vous semble interessant, il peut être
éventuellement transmis à l'adresse des autres traducteurs.
Bonne relecture,
A+
From 78e725eae9355ff9b40ab1838985dee7950bf258 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@???>
Date: Wed, 5 Sep 2012 10:57:35 +0000
Subject: [PATCH 1/2] [fr] Unfuzz and tiny corrections
diff --git a/wiki/src/doc/anonymous_internet.fr.po b/wiki/src/doc/anonymous_internet.fr.po
index 397ed5a..6a78c51 100644
--- a/wiki/src/doc/anonymous_internet.fr.po
+++ b/wiki/src/doc/anonymous_internet.fr.po
@@ -3,7 +3,6 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
diff --git a/wiki/src/doc/anonymous_internet/pidgin.fr.po b/wiki/src/doc/anonymous_internet/pidgin.fr.po
index c2d9ec3..552d0b6 100644
--- a/wiki/src/doc/anonymous_internet/pidgin.fr.po
+++ b/wiki/src/doc/anonymous_internet/pidgin.fr.po
@@ -21,20 +21,13 @@ msgid "[[!meta title=\"Chatting with Pidgin\"]]\n"
msgstr "[[!meta title=\"Discuter avec Pidgin\"]]\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "For instant messaging Tails includes the Pidgin Instant Messenger. It is "
-#| "a multi-protocol client, so you can run MSN, ICQ, IRC, AIM, Jabber and "
-#| "many other protocols at the same time, even with several instances of the "
-#| "same protocol. See the following picture for a Pidgin user with three "
-#| "different protocols enabled at the same time:"
msgid ""
"For instant messaging Tails includes the [Pidgin Instant Messenger](
http://"
"pidgin.im/). It is a multi-protocol client, so you can run MSN, ICQ, IRC, "
"AIM, Jabber and many other protocols at the same time, even with several "
"instances of the same protocol."
msgstr ""
-"Pour la messagerie instantanée, le client de messagerie instantanée Pidgin "
+"Pour la messagerie instantanée, le [client de messagerie instantanée Pidgin](
http://pidgin.im) "
"est inclus dans Tails. C'est un client multi-protocole, vous pouvez donc "
"démarrer MSN, ICQ, IRC, AIM, Jabber et beaucoups d'autres protocoles en même "
"temps, même avec plusieurs instances du même protocole."
@@ -51,18 +44,6 @@ msgid "OTR encryption"
msgstr "Chiffrement OTR"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "Of course the issue of end-to-end encryption arises again. As we "
-#| "mentioned earlier, we have [Off-the-record messaging](
http://www."
-#| "cypherpunks.ca/otr) (commonly called OTR) for instant messaging, and "
-#| "Pidgin and many other instant messengers have support for that. There are "
-#| "several resources on how it works and how to use it on their web site. "
-#| "Basically all you need to do is choose \"Start private conversation\" in "
-#| "the OTR menu and a key will be generated automatically if you do not have "
-#| "one already. After that OTR will establish a private conversation if the "
-#| "other end's instant messenger supports it. This is will look something "
-#| "like this:"
msgid ""
"Of course the issue of end-to-end encryption arises again. As we mentioned "
"earlier, we have [Off-the-record messaging](
http://www.cypherpunks.ca/otr) "
@@ -116,7 +97,7 @@ msgstr ""
msgid ""
"**FIXME**: mention `/me` is **not** encrypted when used in a OTR\n"
"private conversation.\n"
-msgstr "**FIXEZMOI**: Il est important de mentionner que les messages envoyés au travers de la commande /me **ne** seront **pas** chiffrés lors d'une conversation privée OTR.\n"
+msgstr "**FIXME**: Il est important de mentionner que les messages envoyés au travers de la commande /me **ne** seront **pas** chiffrés lors d'une conversation privée OTR.\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/anonymous_internet/vidalia.fr.po b/wiki/src/doc/anonymous_internet/vidalia.fr.po
index 761d9e4..ec1813a 100644
--- a/wiki/src/doc/anonymous_internet/vidalia.fr.po
+++ b/wiki/src/doc/anonymous_internet/vidalia.fr.po
@@ -173,18 +173,17 @@ msgid "Configuring Hidden Services for Tor\n"
msgstr "Configurer des Services Cachés pour Tor\n"
#. type: Plain text
-#, fuzzy
msgid ""
"Tor allows clients and relays to offer hidden services. That is, you can "
"offer a web server, SSH server, etc. without revealing your IP address to "
"its users. In fact, because you don't use any public address, you can run a "
"hidden service from behind a firewall."
msgstr ""
-"Tor permet à des relais ainsi qu'à se utilisateurs d'avoir des services "
-"cachés. Ceci étant, vous pouvez rendre disponible un serveur web, un serveur "
-"SSH, etc. Sans pour autant révéler votre adresse IP aux utilisateurs. Dans "
-"les faits, comme vous n'utilisez pas d'adresse publique, vous pouvez faire "
-"tourner un service caché depuis derrière un firewall."
+"Tor permet à des relais ainsi qu'à ses utilisateurs de faire fonctionner des services "
+"cachés. Vous pouvez ainsi rendre disponible un serveur web, un serveur "
+"SSH, etc. sans pour autant révéler votre adresse IP aux utilisateurs. En "
+"effet, comme vous n'utilisez pas d'adresse publique, vous pouvez faire "
+"tourner un service caché derrière un firewall."
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/first_steps.index.fr.po b/wiki/src/doc/first_steps.index.fr.po
index e46134b..7ed7fcc 100644
--- a/wiki/src/doc/first_steps.index.fr.po
+++ b/wiki/src/doc/first_steps.index.fr.po
@@ -17,29 +17,6 @@ msgstr ""
#. type: Plain text
#, no-wrap
-#| msgid ""
-#| " - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
-#| " - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
-#| " for [[!traillink Linux|first_steps/manual_usb_installation/linux]],\n"
-#| " for [[!traillink Windows|first_steps/manual_usb_installation/windows]],\n"
-#| " for [[!traillink Mac|first_steps/manual_usb_installation/mac]]\n"
-#| " - [[!traillink Uninstalling_Tails_or_Resetting_a_USB_Stick|first_steps/usb_reset]],\n"
-#| " for [[!traillink Linux|first_steps/usb_reset/linux]],\n"
-#| " for [[!traillink Windows|first_steps/usb_reset/windows]]\n"
-#| " - [[!traillink Upgrading_a_Tails_USB_Stick|first_steps/usb_upgrade]]\n"
-#| " - [[!traillink Start_Tails|first_steps/start_tails]]\n"
-#| " - [[!traillink Startup_Options|first_steps/startup_options]]\n"
-#| " - [[!traillink Administration_Password|first_steps/startup_options/administration_password]]\n"
-#| " - [[!traillink Tor_Bridge_Mode|first_steps/startup_options/bridge_mode]]\n"
-#| " - [[!traillink Windows_Camouflage|first_steps/startup_options/windows_camouflage]]\n"
-#| " - [[!traillink Introduction_to_GNOME_and_the_Tails_Desktop|first_steps/introduction_to_gnome_and_the_tails_desktop]]\n"
-#| " - [[!traillink Persistence|first_steps/persistence]]\n"
-#| " - [[!traillink Warnings_About_Persistence|first_steps/persistence/warnings]]\n"
-#| " - [[!traillink Create_&_Configure_the_Persistent_Volume|first_steps/persistence/configure]]\n"
-#| " - [[!traillink Enable_&_Use_the_Persistent_Volume|first_steps/persistence/use]]\n"
-#| " - [[!traillink Delete_the_Persistent_Volume|first_steps/persistence/delete]]\n"
-#| " - [[!traillink Logging_in_to_captive_portals|first_steps/unsafe_browser]]\n"
-#| " - [[!traillink Reporting_Bugs|first_steps/bug_reporting]]\n"
msgid ""
" - [[!traillink Installing_onto_a_USB_Stick|first_steps/usb_installation]] (recommended)\n"
" - [[!traillink Manually_Installing_onto_a_USB_Stick|first_steps/manual_usb_installation]],\n"
@@ -87,4 +64,4 @@ msgstr ""
" - [[!traillink Effacer_le_volume_persistant|first_steps/persistence/delete]]\n"
" - [[!traillink S'identifier_auprès_d'un_portail_captif|first_steps/unsafe_browser]]\n"
" - [[!traillink Rapporter_un_bug|first_steps/bug_reporting]]\n"
-" - [[!traillink Tails_ne_démarre_pas|first_steps/bug_reporting/tails_does_not start]]\n"
+" - [[!traillink Tails_ne_démarre_pas|first_steps/bug_reporting/tails_does_not_start]]\n"
diff --git a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
index 1e62503..26cc2aa 100644
--- a/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
+++ b/wiki/src/doc/first_steps/bug_reporting/tails_does_not_start.fr.po
@@ -79,7 +79,6 @@ msgstr ""
"un.\n"
#. type: Bullet: '3. '
-#, fuzzy
#| msgid ""
#| "3. From which media are you trying to start Tails: DVD, USB stick\n"
#| "[[installed manually|/doc/first_steps/manual_usb_installation]], USB\n"
@@ -94,7 +93,7 @@ msgid ""
"mind that, we do not support any other installation method than the ones "
"listed above."
msgstr ""
-"3. Depuis quel type de support essayez-vous de démarrer Tails : DVD, clé\n"
+"Depuis quel type de support essayez-vous de démarrer Tails : DVD, clé\n"
"USB [[installée manuellement|/doc/first_steps/manual_usb_installation]],\n"
"clé USB [[installée avec l'installeur USB\n"
"Tails|/doc/first_steps/manual_usb_installation]]? Sachez que nous ne "
@@ -179,7 +178,6 @@ msgid "Remove all appearance of the `quiet` parameter."
msgstr "Supprimez toute occurence du paramètre `quiet`."
#. type: Plain text
-#, fuzzy
#| msgid ""
#| "This will hopefully display useful messages while starting, and that you "
#| "can later include in your bug report."
diff --git a/wiki/src/doc/sensitive_documents/audio.fr.po b/wiki/src/doc/sensitive_documents/audio.fr.po
index 9c09e0e..b80df83 100644
--- a/wiki/src/doc/sensitive_documents/audio.fr.po
+++ b/wiki/src/doc/sensitive_documents/audio.fr.po
@@ -3,7 +3,6 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -22,16 +21,11 @@ msgid "[[!meta title=\"Audio\"]]\n"
msgstr ""
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "[Audacity](audacity.sourceforge.net) is a multi-track audio editor for "
-#| "Linux/Unix, MacOS and Windows. It is designed for easy recording, playing "
-#| "and editing of digital audio."
msgid ""
"[Audacity](
http://audacity.sourceforge.net) is a multi-track audio editor "
"for Linux/Unix, MacOS and Windows. It is designed for easy recording, "
"playing and editing of digital audio."
msgstr ""
-"[Audacity](audacity.sourceforge.net) est un éditeur audio multi-piste pour "
+"[Audacity](
http://audacity.sourceforge.net) est un éditeur audio multi-piste pour "
"Linux/Unix, MacOS et Windows. Il a été conçu pour l'enregistrement, la "
"lecture et la modification de données audio de manière intuitive."
diff --git a/wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po b/wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po
index 77be4e8..bf7c7a2 100644
--- a/wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po
+++ b/wiki/src/doc/sensitive_documents/printing_and_scanning.fr.po
@@ -3,7 +3,6 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
@@ -22,16 +21,11 @@ msgid "[[!meta title=\"Printing and scanning\"]]\n"
msgstr "[[!meta title=\"Imprimer et scanner\"]]\n"
#. type: Plain text
-#, fuzzy
-#| msgid ""
-#| "The [CUPS printing system](cups.org), which includes drivers for several "
-#| "common printers allows printing, while you can scan with [Simple scan]"
-#| "(launchpad.net/simple-scan)"
msgid ""
"The [CUPS printing system](
http://cups.org), which includes drivers for "
"several common printers allows printing, while you can scan with [Simple "
"scan](
https://launchpad.net/simple-scan)"
msgstr ""
-"Le [système d'impression CUPS](cups.org), qui contient les pilotes de la "
+"Le [système d'impression CUPS](
http://cups.org), qui contient les pilotes de la "
"plupart des imprimantes permet d'imprimer, par ailleurs vous pouvez scanner "
-"avec [Simple scan](launchpad.net/simple-scan)"
+"avec [Simple scan](
https://launchpad.net/simple-scan)"
diff --git a/wiki/src/download.fr.po b/wiki/src/download.fr.po
index 47ba658..eef8daa 100644
--- a/wiki/src/download.fr.po
+++ b/wiki/src/download.fr.po
@@ -371,7 +371,7 @@ msgstr ""
"community/BurningIsoHowto\">la documentation Ubuntu correspondante</a>, en "
"remplaçant simplement l'image ISO d'Ubuntu par celle de Tails et en ignorant "
"la partie concernant la vérification du fichier, étant donné que vous l'avez "
-"déjà effectuée.FIXME: Trouver une documentation équivalente en Français."
+"déjà effectuée. FIXME: Trouver une documentation équivalente en Français."
#. type: Content of: <div><div><h2>
msgid "Installing onto a USB stick"
@@ -464,10 +464,6 @@ msgstr ""
"diffusion d'annonces</a>"
#. type: Content of: <div><div><ul><li>
-#, fuzzy
-#| msgid ""
-#| "our <a href='torrents/rss/index.rss'>RSS</a> and <a href='/torrents/rss/"
-#| "index.atom'>Atom</a> feeds that announces new available BitTorrent files."
msgid ""
"our <a href='/torrents/rss/index.rss'>RSS</a> and <a href='/torrents/rss/"
"index.atom'>Atom</a> feeds that announces new available BitTorrent files."
diff --git a/wiki/src/news.fr.po b/wiki/src/news.fr.po
index 0fc0cab..acc2c18 100644
--- a/wiki/src/news.fr.po
+++ b/wiki/src/news.fr.po
@@ -40,12 +40,11 @@ msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"
msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
#. type: Plain text
-#, fuzzy, no-wrap
-#| msgid "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
+#, no-wrap
msgid ""
"[[!inline pages=\"news/* and !news/*/* and !news/discussion and tagged(announce)\"\n"
" show=\"30\" feeds=\"yes\" feedonly=\"yes\" feedfile=\"emails\"]]\n"
-msgstr "[[!inline pages=\"news/* and !news/*/* and !news/discussion\" show=\"30\"]]\n"
+msgstr ""
#. type: Plain text
msgid ""
diff --git a/wiki/src/support/known_issues.fr.po b/wiki/src/support/known_issues.fr.po
index fcc8551..372a03b 100644
--- a/wiki/src/support/known_issues.fr.po
+++ b/wiki/src/support/known_issues.fr.po
@@ -138,12 +138,11 @@ msgid "With BIOS version A17 02/22/2012"
msgstr "Avec un BIOS version A17 02/22/2012"
#. type: Plain text
-#, fuzzy
msgid ""
"Some users reported that the legacy BIOS shipped by Dell doesn't know how to "
"deal with the GPT partition scheme installed by Tails USB Installer."
msgstr ""
-"Des utlisateurs ont rapporté que le legacy BIOS livré par Dell ne prend pas "
+"Des utlisateurs ont rapporté que l'ancien BIOS livré par Dell ne prend pas "
"en charge le schéma de partition GPT installé par l'installeur USB Tails."
#. type: Plain text
diff --git a/wiki/src/support/talk.fr.po b/wiki/src/support/talk.fr.po
index 91d871a..9748192 100644
--- a/wiki/src/support/talk.fr.po
+++ b/wiki/src/support/talk.fr.po
@@ -66,10 +66,6 @@ msgid "use TLS/SSL to connect!"
msgstr "utilisez TLS/SSL pour vous connecter!"
#. type: Content of: <div><p>
-#, fuzzy
-#| msgid ""
-#| "You can use [[Pidgin|
http://www.pidgin.im/]] an Instant Messaging client "
-#| "client for Windows, GNU/Linux and Mac OS X."
msgid ""
"You can use [[Pidgin|
http://www.pidgin.im/]], an Instant Messaging client "
"for Windows, GNU/Linux and Mac OSÂ X."
--
1.7.2.5
>From 6a0c0aafd5d42a46c10e7eeb7ef1931298bfd233 Mon Sep 17 00:00:00 2001
From: Tails developers <amnesia@???>
Date: Wed, 5 Sep 2012 11:01:12 +0000
Subject: [PATCH 2/2] Link correction
---
wiki/src/contribute/build.mdwn | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/wiki/src/contribute/build.mdwn b/wiki/src/contribute/build.mdwn
index 9f1acb9..3d4a25f 100644
--- a/wiki/src/contribute/build.mdwn
+++ b/wiki/src/contribute/build.mdwn
@@ -172,7 +172,7 @@ Build process
-------------
Every build commands must be run as `root`, at the root of a clone of the
-[`amnesia.git` repository|git]].
+[[`amnesia.git` repository|git]].
In short, a build could be done using:
--
1.7.2.5
How to hunt the 'fuzzy' and 'FIXME' recursively et edit them smoothly:
Add the following line to .vimrc:
map <F4> :execute "vimgrep /" . expand("<cword>") . "/j **" <Bar> cw<CR>
Browse to the wiki/src folder
Start vim
Enter the 'insertion mode' (normally pressing 'i')
Type the word you want to recursively search for ('FIXME' or 'fuzzy' for example)
Get back to the visual mode (normally pressing 'Escape')
Put the cursor on your word
Press F4
You will get a list of the files containing your word and the possibility to edit them.
You can eventually add those lines, still in .vimrc:
nmap <silent> <A-Up> :wincmd k<CR>
nmap <silent> <A-Down> :wincmd j<CR>
You can then switch between the file editor and the list, using Alt+Arrow up and down.
This method does not allow to search for more than one word, nor filter by filetype/file extension.
Please fell free to correct, complete, etc
