diff --git a/po/fr.po b/po/fr.po
index 5e70f659..1937e0fd 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Comprehensive Rust 🦀\n"
-"POT-Creation-Date: 2023-12-08T18:20:47-05:00\n"
+"POT-Creation-Date: 2024-01-24T13:24:49+01:00\n"
 "PO-Revision-Date: 2023-10-20 18:46-0400\n"
 "Last-Translator: Olivier Charrez <olivier.charrez@hotmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -12,1274 +12,1253 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 3.3.2\n"
 
-#: src/SUMMARY.md:3 src/index.md:1
+#: src/SUMMARY.md src/index.md
 msgid "Welcome to Comprehensive Rust 🦀"
 msgstr "Bienvenue à Comprehensive Rust (le guide complet de Rust) 🦀"
 
-#: src/SUMMARY.md:4 src/running-the-course.md:1
+#: src/SUMMARY.md src/running-the-course.md
 msgid "Running the Course"
 msgstr "Comment présenter le cours"
 
-#: src/SUMMARY.md:5 src/running-the-course/course-structure.md:1
+#: src/SUMMARY.md src/running-the-course/course-structure.md
 msgid "Course Structure"
 msgstr "Structure du cours"
 
-#: src/SUMMARY.md:6 src/running-the-course/keyboard-shortcuts.md:1
+#: src/SUMMARY.md src/running-the-course/keyboard-shortcuts.md
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: src/SUMMARY.md:7 src/running-the-course/translations.md:1
+#: src/SUMMARY.md src/running-the-course/translations.md
 msgid "Translations"
 msgstr "Traductions"
 
-#: src/SUMMARY.md:8 src/cargo.md:1
+#: src/SUMMARY.md src/cargo.md
 msgid "Using Cargo"
 msgstr "Utiliser Cargo"
 
-#: src/SUMMARY.md:9
+#: src/SUMMARY.md
 msgid "Rust Ecosystem"
 msgstr "Écosystème de Rust"
 
-#: src/SUMMARY.md:10
+#: src/SUMMARY.md
 msgid "Code Samples"
 msgstr "Exemples de code"
 
-#: src/SUMMARY.md:11
+#: src/SUMMARY.md
 msgid "Running Cargo Locally"
 msgstr "Exécuter Cargo localement"
 
-#: src/SUMMARY.md:16
+#: src/SUMMARY.md
 msgid "Day 1: Morning"
 msgstr "Jour 1 : Matin"
 
-#: src/SUMMARY.md:18 src/SUMMARY.md:44 src/SUMMARY.md:70 src/SUMMARY.md:93
-#: src/SUMMARY.md:119 src/SUMMARY.md:138 src/SUMMARY.md:158 src/SUMMARY.md:184
-#: src/SUMMARY.md:207 src/SUMMARY.md:246 src/SUMMARY.md:288 src/SUMMARY.md:340
+#: src/SUMMARY.md
 msgid "Welcome"
 msgstr "Bienvenue"
 
-#: src/SUMMARY.md:19 src/SUMMARY.md:21 src/hello-world.md:1
-#: src/hello-world/hello-world.md:1
+#: src/SUMMARY.md src/hello-world.md src/hello-world/hello-world.md
 #, fuzzy
 msgid "Hello, World"
 msgstr "Bonjour le monde!"
 
-#: src/SUMMARY.md:20 src/hello-world/what-is-rust.md:1
+#: src/SUMMARY.md src/hello-world/what-is-rust.md
 msgid "What is Rust?"
 msgstr "Qu'est-ce que Rust ?"
 
-#: src/SUMMARY.md:22 src/hello-world/benefits.md:1
+#: src/SUMMARY.md src/hello-world/benefits.md
 msgid "Benefits of Rust"
 msgstr ""
 
-#: src/SUMMARY.md:23 src/hello-world/playground.md:1
+#: src/SUMMARY.md src/hello-world/playground.md
 msgid "Playground"
 msgstr ""
 
-#: src/SUMMARY.md:24 src/types-and-values.md:1
+#: src/SUMMARY.md src/types-and-values.md
 msgid "Types and Values"
 msgstr ""
 
-#: src/SUMMARY.md:25 src/types-and-values/variables.md:1
+#: src/SUMMARY.md src/types-and-values/variables.md
 msgid "Variables"
 msgstr "Variables"
 
-#: src/SUMMARY.md:26 src/types-and-values/values.md:1
+#: src/SUMMARY.md src/types-and-values/values.md
 msgid "Values"
 msgstr ""
 
-#: src/SUMMARY.md:27 src/types-and-values/arithmetic.md:1
+#: src/SUMMARY.md src/types-and-values/arithmetic.md
 msgid "Arithmetic"
 msgstr ""
 
-#: src/SUMMARY.md:28 src/types-and-values/strings.md:1
+#: src/SUMMARY.md src/types-and-values/strings.md
 #, fuzzy
 msgid "Strings"
 msgstr "Cordes"
 
-#: src/SUMMARY.md:29 src/types-and-values/inference.md:1
+#: src/SUMMARY.md src/types-and-values/inference.md
 msgid "Type Inference"
 msgstr "Inférence de type"
 
-#: src/SUMMARY.md:30 src/types-and-values/exercise.md:1
+#: src/SUMMARY.md src/types-and-values/exercise.md
 msgid "Exercise: Fibonacci"
 msgstr ""
 
-#: src/SUMMARY.md:31 src/SUMMARY.md:40 src/SUMMARY.md:51 src/SUMMARY.md:56
-#: src/SUMMARY.md:64 src/SUMMARY.md:75 src/SUMMARY.md:82 src/SUMMARY.md:89
-#: src/SUMMARY.md:103 src/SUMMARY.md:113 src/SUMMARY.md:129 src/SUMMARY.md:134
-#: src/SUMMARY.md:144 src/SUMMARY.md:152 src/SUMMARY.md:164 src/SUMMARY.md:171
-#: src/SUMMARY.md:180 src/SUMMARY.md:192 src/SUMMARY.md:201
-#: src/types-and-values/solution.md:1 src/control-flow-basics/solution.md:1
-#: src/tuples-and-arrays/solution.md:1 src/references/solution.md:1
-#: src/user-defined-types/solution.md:1 src/pattern-matching/solution.md:1
-#: src/methods-and-traits/solution.md:1 src/generics/solution.md:1
-#: src/std-types/solution.md:1 src/std-traits/solution.md:1
-#: src/memory-management/solution.md:1 src/smart-pointers/solution.md:1
-#: src/borrowing/solution.md:1 src/slices-and-lifetimes/solution.md:1
-#: src/iterators/solution.md:1 src/modules/solution.md:1
-#: src/testing/solution.md:1 src/error-handling/solution.md:1
-#: src/unsafe-rust/solution.md:1
+#: src/SUMMARY.md src/types-and-values/solution.md
+#: src/control-flow-basics/solution.md src/tuples-and-arrays/solution.md
+#: src/references/solution.md src/user-defined-types/solution.md
+#: src/pattern-matching/solution.md src/methods-and-traits/solution.md
+#: src/generics/solution.md src/std-types/solution.md
+#: src/std-traits/solution.md src/memory-management/solution.md
+#: src/smart-pointers/solution.md src/borrowing/solution.md
+#: src/slices-and-lifetimes/solution.md src/iterators/solution.md
+#: src/modules/solution.md src/testing/solution.md
+#: src/error-handling/solution.md src/unsafe-rust/solution.md
 #, fuzzy
 msgid "Solution"
 msgstr "Solutions"
 
-#: src/SUMMARY.md:32 src/control-flow-basics.md:1
+#: src/SUMMARY.md src/control-flow-basics.md
 #, fuzzy
 msgid "Control Flow Basics"
 msgstr "Flux de contrôle"
 
-#: src/SUMMARY.md:33 src/control-flow-basics/conditionals.md:1
+#: src/SUMMARY.md src/control-flow-basics/conditionals.md
 msgid "Conditionals"
 msgstr ""
 
-#: src/SUMMARY.md:34 src/control-flow-basics/loops.md:1
+#: src/SUMMARY.md src/control-flow-basics/loops.md
 #, fuzzy
 msgid "Loops"
 msgstr "Boucles `for`"
 
-#: src/SUMMARY.md:35 src/control-flow-basics/break-continue.md:1
+#: src/SUMMARY.md src/control-flow-basics/break-continue.md
 #, fuzzy
 msgid "`break` and `continue`"
 msgstr "`pause` et `continue`"
 
-#: src/SUMMARY.md:36 src/control-flow-basics/blocks-and-scopes.md:1
+#: src/SUMMARY.md src/control-flow-basics/blocks-and-scopes.md
 msgid "Blocks and Scopes"
 msgstr ""
 
-#: src/SUMMARY.md:37 src/control-flow-basics/functions.md:1
+#: src/SUMMARY.md src/control-flow-basics/functions.md
 msgid "Functions"
 msgstr "Fonctions"
 
-#: src/SUMMARY.md:38 src/control-flow-basics/macros.md:1
+#: src/SUMMARY.md src/control-flow-basics/macros.md
 msgid "Macros"
 msgstr ""
 
-#: src/SUMMARY.md:39 src/control-flow-basics/exercise.md:1
+#: src/SUMMARY.md src/control-flow-basics/exercise.md
 msgid "Exercise: Collatz Sequence"
 msgstr ""
 
-#: src/SUMMARY.md:42
+#: src/SUMMARY.md
 msgid "Day 1: Afternoon"
 msgstr "Jour 1 : Après-midi"
 
-#: src/SUMMARY.md:45 src/SUMMARY.md:46 src/tuples-and-arrays.md:1
-#: src/tuples-and-arrays/tuples-and-arrays.md:1
+#: src/SUMMARY.md src/tuples-and-arrays.md
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid "Tuples and Arrays"
 msgstr ""
 
-#: src/SUMMARY.md:47 src/tuples-and-arrays/iteration.md:1
+#: src/SUMMARY.md src/tuples-and-arrays/iteration.md
 #, fuzzy
 msgid "Array Iteration"
 msgstr "Iterator"
 
-#: src/SUMMARY.md:48 src/SUMMARY.md:71 src/tuples-and-arrays/match.md:1
-#: src/pattern-matching.md:1
+#: src/SUMMARY.md src/tuples-and-arrays/match.md src/pattern-matching.md
 msgid "Pattern Matching"
 msgstr "Filtrage par motif"
 
-#: src/SUMMARY.md:49 src/SUMMARY.md:72 src/tuples-and-arrays/destructuring.md:1
-#: src/pattern-matching/destructuring.md:1
+#: src/SUMMARY.md src/tuples-and-arrays/destructuring.md
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid "Destructuring"
 msgstr "Déstructuration des énumérations"
 
-#: src/SUMMARY.md:50 src/tuples-and-arrays/exercise.md:1
+#: src/SUMMARY.md src/tuples-and-arrays/exercise.md
 msgid "Exercise: Nested Arrays"
 msgstr ""
 
-#: src/SUMMARY.md:52 src/references.md:1
+#: src/SUMMARY.md src/references.md
 msgid "References"
 msgstr "Références"
 
-#: src/SUMMARY.md:53 src/references/shared.md:1
+#: src/SUMMARY.md src/references/shared.md
 #, fuzzy
 msgid "Shared References"
 msgstr "Références"
 
-#: src/SUMMARY.md:54 src/references/exclusive.md:1
+#: src/SUMMARY.md src/references/exclusive.md
 #, fuzzy
 msgid "Exclusive References"
 msgstr "Références invalides"
 
-#: src/SUMMARY.md:55 src/references/exercise.md:1
+#: src/SUMMARY.md src/references/exercise.md
 msgid "Exercise: Geometry"
 msgstr ""
 
-#: src/SUMMARY.md:57 src/user-defined-types.md:1
+#: src/SUMMARY.md src/user-defined-types.md
 msgid "User-Defined Types"
 msgstr ""
 
-#: src/SUMMARY.md:58 src/user-defined-types/named-structs.md:1
+#: src/SUMMARY.md src/user-defined-types/named-structs.md
 #, fuzzy
 msgid "Named Structs"
 msgstr "Structures"
 
-#: src/SUMMARY.md:59 src/user-defined-types/tuple-structs.md:4
+#: src/SUMMARY.md src/user-defined-types/tuple-structs.md
 msgid "Tuple Structs"
 msgstr "Structures tuple"
 
-#: src/SUMMARY.md:60 src/user-defined-types/enums.md:1
-#: src/pattern-matching/destructuring.md:23
-#: src/pattern-matching/destructuring.md:65
+#: src/SUMMARY.md src/user-defined-types/enums.md
+#: src/pattern-matching/destructuring.md
 msgid "Enums"
 msgstr "Énumérations"
 
-#: src/SUMMARY.md:61 src/user-defined-types/static-and-const.md:1
+#: src/SUMMARY.md src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "Static and Const"
 msgstr "static & const"
 
-#: src/SUMMARY.md:62 src/user-defined-types/aliases.md:1
+#: src/SUMMARY.md src/user-defined-types/aliases.md
 msgid "Type Aliases"
 msgstr ""
 
-#: src/SUMMARY.md:63 src/user-defined-types/exercise.md:1
+#: src/SUMMARY.md src/user-defined-types/exercise.md
 msgid "Exercise: Elevator Events"
 msgstr ""
 
-#: src/SUMMARY.md:68
+#: src/SUMMARY.md
 msgid "Day 2: Morning"
 msgstr "Jour 2 : Matin"
 
-#: src/SUMMARY.md:73 src/pattern-matching/let-control-flow.md:1
+#: src/SUMMARY.md src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid "Let Control Flow"
 msgstr "Flux de contrôle"
 
-#: src/SUMMARY.md:74 src/pattern-matching/exercise.md:1
+#: src/SUMMARY.md src/pattern-matching/exercise.md
 msgid "Exercise: Expression Evaluation"
 msgstr ""
 
-#: src/SUMMARY.md:76 src/methods-and-traits.md:1
+#: src/SUMMARY.md src/methods-and-traits.md
 #, fuzzy
 msgid "Methods and Traits"
 msgstr "Read et Write"
 
-#: src/SUMMARY.md:77 src/methods-and-traits/methods.md:1
+#: src/SUMMARY.md src/methods-and-traits/methods.md
 msgid "Methods"
 msgstr "Méthodes"
 
-#: src/SUMMARY.md:78 src/methods-and-traits/traits.md:1
+#: src/SUMMARY.md src/methods-and-traits/traits.md
 msgid "Traits"
 msgstr "Traits"
 
-#: src/SUMMARY.md:79 src/methods-and-traits/deriving.md:1
+#: src/SUMMARY.md src/methods-and-traits/deriving.md
 #, fuzzy
 msgid "Deriving"
 msgstr "Traits dérivés"
 
-#: src/SUMMARY.md:80 src/methods-and-traits/trait-objects.md:1
+#: src/SUMMARY.md src/methods-and-traits/trait-objects.md
 msgid "Trait Objects"
 msgstr "Objets traits"
 
-#: src/SUMMARY.md:81 src/methods-and-traits/exercise.md:1
+#: src/SUMMARY.md src/methods-and-traits/exercise.md
 #, fuzzy
-msgid "Exercise: GUI Library"
-msgstr "Une bibliothèque d'interface graphique"
+msgid "Exercise: Generic Logger"
+msgstr "Exercices"
 
-#: src/SUMMARY.md:83 src/generics.md:1
+#: src/SUMMARY.md src/generics.md
 msgid "Generics"
 msgstr "Génériques"
 
-#: src/SUMMARY.md:84 src/generics/generic-functions.md:1
+#: src/SUMMARY.md src/generics/generic-functions.md
 #, fuzzy
 msgid "Generic Functions"
 msgstr "Fonctions externes"
 
-#: src/SUMMARY.md:85 src/generics/generic-data.md:1
+#: src/SUMMARY.md src/generics/generic-data.md
 msgid "Generic Data Types"
 msgstr "Types de données génériques"
 
-#: src/SUMMARY.md:86 src/generics/trait-bounds.md:1
+#: src/SUMMARY.md src/generics/trait-bounds.md
 msgid "Trait Bounds"
 msgstr "Traits lié"
 
-#: src/SUMMARY.md:87 src/generics/impl-trait.md:1
+#: src/SUMMARY.md src/generics/impl-trait.md
 #, fuzzy
 msgid "`impl Trait`"
 msgstr "`Trait d'implémentation`"
 
-#: src/SUMMARY.md:88 src/generics/exercise.md:1
+#: src/SUMMARY.md src/generics/exercise.md
 msgid "Exercise: Generic `min`"
 msgstr ""
 
-#: src/SUMMARY.md:91
+#: src/SUMMARY.md
 msgid "Day 2: Afternoon"
 msgstr "Jour 2 : Après-midi"
 
-#: src/SUMMARY.md:94 src/std-types.md:1
+#: src/SUMMARY.md src/std-types.md
 #, fuzzy
 msgid "Standard Library Types"
 msgstr "Bibliothèque standard"
 
-#: src/SUMMARY.md:95 src/std-types/std.md:1
+#: src/SUMMARY.md src/std-types/std.md
 msgid "Standard Library"
 msgstr "Bibliothèque standard"
 
-#: src/SUMMARY.md:96 src/std-types/docs.md:1
+#: src/SUMMARY.md src/std-types/docs.md
 #, fuzzy
 msgid "Documentation"
 msgstr "Tests de documentation"
 
-#: src/SUMMARY.md:97
+#: src/SUMMARY.md
 #, fuzzy
 msgid "`Option`"
 msgstr "`Durée`"
 
-#: src/SUMMARY.md:98
+#: src/SUMMARY.md
 #, fuzzy
 msgid "`Result`"
 msgstr "`Option`, `Résultat`"
 
-#: src/SUMMARY.md:99 src/android/interoperability/cpp/type-mapping.md:5
+#: src/SUMMARY.md src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`String`"
 msgstr "String"
 
-#: src/SUMMARY.md:100 src/std-types/vec.md:1
+#: src/SUMMARY.md src/std-types/vec.md
 #, fuzzy
 msgid "`Vec`"
 msgstr "`Vec`"
 
-#: src/SUMMARY.md:101 src/std-types/hashmap.md:1 src/bare-metal/no_std.md:46
+#: src/SUMMARY.md src/std-types/hashmap.md src/bare-metal/no_std.md
 #, fuzzy
 msgid "`HashMap`"
 msgstr "`HashMap`"
 
-#: src/SUMMARY.md:102 src/std-types/exercise.md:1
+#: src/SUMMARY.md src/std-types/exercise.md
 #, fuzzy
 msgid "Exercise: Counter"
 msgstr "Exercices"
 
-#: src/SUMMARY.md:104 src/std-traits.md:1
+#: src/SUMMARY.md src/std-traits.md
 #, fuzzy
 msgid "Standard Library Traits"
 msgstr "Bibliothèque standard"
 
-#: src/SUMMARY.md:105 src/std-traits/comparisons.md:1 src/async.md:17
+#: src/SUMMARY.md src/std-traits/comparisons.md src/async.md
 #, fuzzy
 msgid "Comparisons"
 msgstr "Comparaison"
 
-#: src/SUMMARY.md:106 src/std-traits/operators.md:1
+#: src/SUMMARY.md src/std-traits/operators.md
 #, fuzzy
 msgid "Operators"
 msgstr "Itérateurs"
 
-#: src/SUMMARY.md:107 src/std-traits/from-and-into.md:1
+#: src/SUMMARY.md src/std-traits/from-and-into.md
 #, fuzzy
 msgid "`From` and `Into`"
 msgstr "`De` et `Dans`"
 
-#: src/SUMMARY.md:108 src/std-traits/casting.md:1
+#: src/SUMMARY.md src/std-traits/casting.md
 #, fuzzy
 msgid "Casting"
 msgstr "Tester"
 
-#: src/SUMMARY.md:109 src/std-traits/read-and-write.md:1
+#: src/SUMMARY.md src/std-traits/read-and-write.md
 #, fuzzy
 msgid "`Read` and `Write`"
 msgstr "`Lire` et `Ecrire`"
 
-#: src/SUMMARY.md:110
+#: src/SUMMARY.md
 msgid "`Default`, struct update syntax"
 msgstr ""
 
-#: src/SUMMARY.md:111 src/std-traits/closures.md:1
+#: src/SUMMARY.md src/std-traits/closures.md
 #, fuzzy
 msgid "Closures"
 msgstr "Fermetures"
 
-#: src/SUMMARY.md:112 src/std-traits/exercise.md:1
+#: src/SUMMARY.md src/std-traits/exercise.md
 #, fuzzy
 msgid "Exercise: ROT13"
 msgstr "Exercices"
 
-#: src/SUMMARY.md:117
+#: src/SUMMARY.md
 msgid "Day 3: Morning"
 msgstr "Jour 3 : Matin"
 
-#: src/SUMMARY.md:120 src/memory-management.md:1
+#: src/SUMMARY.md src/memory-management.md
 msgid "Memory Management"
 msgstr "Gestion de la mémoire"
 
-#: src/SUMMARY.md:121 src/memory-management/review.md:1
+#: src/SUMMARY.md src/memory-management/review.md
 msgid "Review of Program Memory"
 msgstr ""
 
-#: src/SUMMARY.md:122 src/memory-management/approaches.md:1
+#: src/SUMMARY.md src/memory-management/approaches.md
 #, fuzzy
 msgid "Approaches to Memory Management"
 msgstr "Gestion automatique de la mémoire"
 
-#: src/SUMMARY.md:123 src/memory-management/ownership.md:1
+#: src/SUMMARY.md src/memory-management/ownership.md
 msgid "Ownership"
 msgstr "Possession"
 
-#: src/SUMMARY.md:124 src/memory-management/move.md:1
+#: src/SUMMARY.md src/memory-management/move.md
 msgid "Move Semantics"
 msgstr "Sémantique de déplacement"
 
-#: src/SUMMARY.md:125
+#: src/SUMMARY.md
 msgid "`Clone`"
 msgstr ""
 
-#: src/SUMMARY.md:126 src/memory-management/copy-types.md:4
+#: src/SUMMARY.md src/memory-management/copy-types.md
 #, fuzzy
 msgid "Copy Types"
 msgstr "Types composés"
 
-#: src/SUMMARY.md:127
+#: src/SUMMARY.md
 #, fuzzy
 msgid "`Drop`"
 msgstr "Drop"
 
-#: src/SUMMARY.md:128 src/memory-management/exercise.md:1
+#: src/SUMMARY.md src/memory-management/exercise.md
 msgid "Exercise: Builder Type"
 msgstr ""
 
-#: src/SUMMARY.md:130 src/smart-pointers.md:1
+#: src/SUMMARY.md src/smart-pointers.md
 msgid "Smart Pointers"
 msgstr ""
 
-#: src/SUMMARY.md:131 src/smart-pointers/box.md:1
-#: src/android/interoperability/cpp/type-mapping.md:9
+#: src/SUMMARY.md src/smart-pointers/box.md
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`Box<T>`"
 msgstr "`Boîte`"
 
-#: src/SUMMARY.md:132 src/smart-pointers/rc.md:1
+#: src/SUMMARY.md src/smart-pointers/rc.md
 #, fuzzy
 msgid "`Rc`"
 msgstr "`Rc`"
 
-#: src/SUMMARY.md:133 src/smart-pointers/exercise.md:1
+#: src/SUMMARY.md src/smart-pointers/exercise.md
 msgid "Exercise: Binary Tree"
 msgstr ""
 
-#: src/SUMMARY.md:136
+#: src/SUMMARY.md
 msgid "Day 3: Afternoon"
 msgstr "Jour 3 : Après-midi"
 
-#: src/SUMMARY.md:139 src/borrowing.md:1
+#: src/SUMMARY.md src/borrowing.md
 msgid "Borrowing"
 msgstr "Emprunts"
 
-#: src/SUMMARY.md:140 src/borrowing/shared.md:1
+#: src/SUMMARY.md src/borrowing/shared.md
 #, fuzzy
 msgid "Borrowing a Value"
 msgstr "Emprunts"
 
-#: src/SUMMARY.md:141 src/borrowing/borrowck.md:1
+#: src/SUMMARY.md src/borrowing/borrowck.md
 #, fuzzy
 msgid "Borrow Checking"
 msgstr "Emprunts"
 
-#: src/SUMMARY.md:142 src/borrowing/interior-mutability.md:4
+#: src/SUMMARY.md src/borrowing/interior-mutability.md
 #, fuzzy
 msgid "Interior Mutability"
 msgstr "Interopérabilité"
 
-#: src/SUMMARY.md:143 src/borrowing/exercise.md:1
+#: src/SUMMARY.md src/borrowing/exercise.md
 #, fuzzy
 msgid "Exercise: Health Statistics"
 msgstr "Statistiques de santé"
 
-#: src/SUMMARY.md:145 src/slices-and-lifetimes.md:1
+#: src/SUMMARY.md src/slices-and-lifetimes.md
 #, fuzzy
 msgid "Slices and Lifetimes"
 msgstr "Durées de vie"
 
-#: src/SUMMARY.md:146
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Slices: `&[T]`"
 msgstr "Tranches"
 
-#: src/SUMMARY.md:147 src/slices-and-lifetimes/str.md:4
+#: src/SUMMARY.md src/slices-and-lifetimes/str.md
 #, fuzzy
 msgid "String References"
 msgstr "Références invalides"
 
-#: src/SUMMARY.md:148
+#: src/SUMMARY.md src/slices-and-lifetimes/lifetime-annotations.md
 #, fuzzy
 msgid "Lifetime Annotations"
 msgstr "Durées de vie dans les appels de fonction"
 
-#: src/SUMMARY.md:149
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Lifetime Elision"
 msgstr "Durées de vie"
 
-#: src/SUMMARY.md:150
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Struct Lifetimes"
 msgstr "Durées de vie"
 
-#: src/SUMMARY.md:151 src/slices-and-lifetimes/exercise.md:1
+#: src/SUMMARY.md src/slices-and-lifetimes/exercise.md
 msgid "Exercise: Protobuf Parsing"
 msgstr ""
 
-#: src/SUMMARY.md:156
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Day 4: Morning"
 msgstr "Jour 1 : Matin"
 
-#: src/SUMMARY.md:159 src/iterators.md:1
+#: src/SUMMARY.md src/iterators.md
 #, fuzzy
 msgid "Iterators"
 msgstr "Itérateurs"
 
-#: src/SUMMARY.md:160 src/iterators/iterator.md:4 src/bare-metal/no_std.md:28
+#: src/SUMMARY.md src/iterators/iterator.md src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Iterator`"
 msgstr "`Itérateur`"
 
-#: src/SUMMARY.md:161 src/iterators/intoiterator.md:1
+#: src/SUMMARY.md src/iterators/intoiterator.md
 #, fuzzy
 msgid "`IntoIterator`"
 msgstr "`IntoIterator`"
 
-#: src/SUMMARY.md:162
+#: src/SUMMARY.md
 #, fuzzy
 msgid "`FromIterator`"
 msgstr "FromIterator"
 
-#: src/SUMMARY.md:163 src/iterators/exercise.md:1
+#: src/SUMMARY.md src/iterators/exercise.md
 msgid "Exercise: Iterator Method Chaining"
 msgstr ""
 
-#: src/SUMMARY.md:165 src/SUMMARY.md:166 src/modules.md:1
-#: src/modules/modules.md:1
+#: src/SUMMARY.md src/modules.md src/modules/modules.md
 msgid "Modules"
 msgstr "Modules"
 
-#: src/SUMMARY.md:167 src/modules/filesystem.md:1
+#: src/SUMMARY.md src/modules/filesystem.md
 msgid "Filesystem Hierarchy"
 msgstr "Hiérarchie du système de fichiers"
 
-#: src/SUMMARY.md:168 src/modules/visibility.md:1
+#: src/SUMMARY.md src/modules/visibility.md
 msgid "Visibility"
 msgstr "Visibilité"
 
-#: src/SUMMARY.md:169
+#: src/SUMMARY.md
 msgid "`use`, `super`, `self`"
 msgstr ""
 
-#: src/SUMMARY.md:170 src/modules/exercise.md:1
-msgid "Exercise: Modules for the GUI Library"
-msgstr ""
+#: src/SUMMARY.md src/modules/exercise.md
+#, fuzzy
+msgid "Exercise: Modules for a GUI Library"
+msgstr "Une bibliothèque d'interface graphique"
 
-#: src/SUMMARY.md:172 src/SUMMARY.md:255 src/testing.md:1
-#: src/chromium/testing.md:1
+#: src/SUMMARY.md src/testing.md src/chromium/testing.md
 msgid "Testing"
 msgstr "Tester"
 
-#: src/SUMMARY.md:173
+#: src/SUMMARY.md
 msgid "Test Modules"
 msgstr "Modules de test"
 
-#: src/SUMMARY.md:174 src/testing/other.md:1
+#: src/SUMMARY.md src/testing/other.md
 #, fuzzy
 msgid "Other Types of Tests"
 msgstr "Autres projets"
 
-#: src/SUMMARY.md:175 src/SUMMARY.md:323 src/testing/useful-crates.md:1
+#: src/SUMMARY.md src/testing/useful-crates.md
 msgid "Useful Crates"
 msgstr "Crates utiles"
 
-#: src/SUMMARY.md:176 src/testing/googletest.md:1
+#: src/SUMMARY.md src/testing/googletest.md
 msgid "GoogleTest"
 msgstr ""
 
-#: src/SUMMARY.md:177 src/testing/mocking.md:1
+#: src/SUMMARY.md src/testing/mocking.md
 msgid "Mocking"
 msgstr ""
 
-#: src/SUMMARY.md:178 src/testing/lints.md:1
+#: src/SUMMARY.md src/testing/lints.md
 msgid "Compiler Lints and Clippy"
 msgstr ""
 
-#: src/SUMMARY.md:179 src/testing/exercise.md:1
+#: src/SUMMARY.md src/testing/exercise.md
 #, fuzzy
 msgid "Exercise: Luhn Algorithm"
 msgstr "Algorithme de Luhn"
 
-#: src/SUMMARY.md:182
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Day 4: Afternoon"
 msgstr "Jour 1 : Après-midi"
 
-#: src/SUMMARY.md:185 src/error-handling.md:1
+#: src/SUMMARY.md src/error-handling.md
 msgid "Error Handling"
 msgstr "Gestion des erreurs"
 
-#: src/SUMMARY.md:186 src/error-handling/panics.md:1
+#: src/SUMMARY.md src/error-handling/panics.md
 msgid "Panics"
 msgstr "Paniques"
 
-#: src/SUMMARY.md:187 src/error-handling/try.md:1
+#: src/SUMMARY.md src/error-handling/try.md
 #, fuzzy
 msgid "Try Operator"
 msgstr "Iterator"
 
-#: src/SUMMARY.md:188 src/error-handling/try-conversions.md:1
+#: src/SUMMARY.md src/error-handling/try-conversions.md
 #, fuzzy
 msgid "Try Conversions"
 msgstr "Conversions implicites"
 
-#: src/SUMMARY.md:189
+#: src/SUMMARY.md
 #, fuzzy
 msgid "`Error` Trait"
 msgstr "\"Erreur\""
 
-#: src/SUMMARY.md:190
+#: src/SUMMARY.md src/error-handling/thiserror-and-anyhow.md
 #, fuzzy
 msgid "`thiserror` and `anyhow`"
 msgstr "`De` et `Dans`"
 
-#: src/SUMMARY.md:191
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Exercise: Rewriting with `Result`"
 msgstr "Gestion structurée des erreurs avec `Result`"
 
-#: src/SUMMARY.md:193 src/unsafe-rust.md:1 src/unsafe-rust/unsafe.md:1
+#: src/SUMMARY.md src/unsafe-rust.md src/unsafe-rust/unsafe.md
 msgid "Unsafe Rust"
 msgstr "Rust non sécurisé (_unsafe_)"
 
-#: src/SUMMARY.md:194
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Unsafe"
 msgstr "Rust non sécurisé (_unsafe_)"
 
-#: src/SUMMARY.md:195 src/unsafe-rust/dereferencing.md:1
+#: src/SUMMARY.md src/unsafe-rust/dereferencing.md
 msgid "Dereferencing Raw Pointers"
 msgstr "Déréférencement des pointeurs nus"
 
-#: src/SUMMARY.md:196 src/unsafe-rust/mutable-static.md:1
+#: src/SUMMARY.md src/unsafe-rust/mutable-static.md
 msgid "Mutable Static Variables"
 msgstr "Variables statiques mutables"
 
-#: src/SUMMARY.md:197 src/unsafe-rust/unions.md:1
+#: src/SUMMARY.md src/unsafe-rust/unions.md
 msgid "Unions"
 msgstr "Unions"
 
-#: src/SUMMARY.md:198 src/unsafe-rust/unsafe-functions.md:1
+#: src/SUMMARY.md src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid "Unsafe Functions"
 msgstr "Appel de fonctions non sécurisées"
 
-#: src/SUMMARY.md:199
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Unsafe Traits"
 msgstr "Implémentation de traits non sécurisés"
 
-#: src/SUMMARY.md:200
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Exercise: FFI Wrapper"
 msgstr "Enveloppe FFI sécurisée"
 
-#: src/SUMMARY.md:203 src/SUMMARY.md:329 src/bare-metal/android.md:1
+#: src/SUMMARY.md src/bare-metal/android.md
 msgid "Android"
 msgstr "Android"
 
-#: src/SUMMARY.md:208 src/SUMMARY.md:247 src/android/setup.md:1
-#: src/chromium/setup.md:1
+#: src/SUMMARY.md src/android/setup.md src/chromium/setup.md
 msgid "Setup"
 msgstr "Installation"
 
-#: src/SUMMARY.md:209 src/SUMMARY.md:250 src/android/build-rules.md:1
+#: src/SUMMARY.md src/android/build-rules.md
 msgid "Build Rules"
 msgstr "Règles de compilation"
 
-#: src/SUMMARY.md:210
+#: src/SUMMARY.md
 msgid "Binary"
 msgstr "Binaire"
 
-#: src/SUMMARY.md:211
+#: src/SUMMARY.md
 msgid "Library"
 msgstr "Bibliothèque"
 
-#: src/SUMMARY.md:212 src/android/aidl.md:1
+#: src/SUMMARY.md src/android/aidl.md
 msgid "AIDL"
 msgstr "AIDL"
 
-#: src/SUMMARY.md:213
+#: src/SUMMARY.md
 msgid "Interface"
 msgstr "Interface"
 
-#: src/SUMMARY.md:214
+#: src/SUMMARY.md
 msgid "Implementation"
 msgstr "Mise en œuvre"
 
-#: src/SUMMARY.md:215
+#: src/SUMMARY.md
 msgid "Server"
 msgstr "Serveur"
 
-#: src/SUMMARY.md:216 src/android/aidl/deploy.md:1
+#: src/SUMMARY.md src/android/aidl/deploy.md
 msgid "Deploy"
 msgstr "Déployer"
 
-#: src/SUMMARY.md:217
+#: src/SUMMARY.md
 msgid "Client"
 msgstr "Client"
 
-#: src/SUMMARY.md:218 src/android/aidl/changing.md:1
+#: src/SUMMARY.md src/android/aidl/changing.md
 msgid "Changing API"
 msgstr "Modification de l'API"
 
-#: src/SUMMARY.md:219 src/SUMMARY.md:319 src/android/logging.md:1
-#: src/bare-metal/aps/logging.md:1
+#: src/SUMMARY.md src/android/logging.md src/bare-metal/aps/logging.md
 msgid "Logging"
 msgstr "Journalisation"
 
-#: src/SUMMARY.md:220 src/android/interoperability.md:1
+#: src/SUMMARY.md src/android/interoperability.md
 msgid "Interoperability"
 msgstr "Interopérabilité"
 
-#: src/SUMMARY.md:221
+#: src/SUMMARY.md
 msgid "With C"
 msgstr "Avec C"
 
-#: src/SUMMARY.md:222
+#: src/SUMMARY.md
 msgid "Calling C with Bindgen"
 msgstr "Appeler C avec Bindgen"
 
-#: src/SUMMARY.md:223
+#: src/SUMMARY.md
 msgid "Calling Rust from C"
 msgstr "Appeler Rust depuis C"
 
-#: src/SUMMARY.md:224
-#, fuzzy
-msgid "With C++)"
+#: src/SUMMARY.md src/android/interoperability/cpp.md
+msgid "With C++"
 msgstr "Avec C++"
 
-#: src/SUMMARY.md:225 src/android/interoperability/cpp/bridge.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/bridge.md
 #, fuzzy
 msgid "The Bridge Module"
 msgstr "Modules de test"
 
-#: src/SUMMARY.md:226
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Rust Bridge"
 msgstr "Binaires Rust"
 
-#: src/SUMMARY.md:227 src/android/interoperability/cpp/generated-cpp.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/generated-cpp.md
 msgid "Generated C++"
 msgstr ""
 
-#: src/SUMMARY.md:228
+#: src/SUMMARY.md
 msgid "C++ Bridge"
 msgstr ""
 
-#: src/SUMMARY.md:229 src/android/interoperability/cpp/shared-types.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/shared-types.md
 #, fuzzy
 msgid "Shared Types"
 msgstr "Types scalaires"
 
-#: src/SUMMARY.md:230 src/android/interoperability/cpp/shared-enums.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/shared-enums.md
 msgid "Shared Enums"
 msgstr ""
 
-#: src/SUMMARY.md:231 src/android/interoperability/cpp/rust-result.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/rust-result.md
 #, fuzzy
 msgid "Rust Error Handling"
 msgstr "Gestion des erreurs"
 
-#: src/SUMMARY.md:232 src/android/interoperability/cpp/cpp-exception.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/cpp-exception.md
 #, fuzzy
 msgid "C++ Error Handling"
 msgstr "Gestion des erreurs"
 
-#: src/SUMMARY.md:233 src/android/interoperability/cpp/type-mapping.md:1
+#: src/SUMMARY.md src/android/interoperability/cpp/type-mapping.md
 msgid "Additional Types"
 msgstr ""
 
-#: src/SUMMARY.md:234
+#: src/SUMMARY.md
 msgid "Building for Android: C++"
 msgstr ""
 
-#: src/SUMMARY.md:235
+#: src/SUMMARY.md
 msgid "Building for Android: Genrules"
 msgstr ""
 
-#: src/SUMMARY.md:236
+#: src/SUMMARY.md
 msgid "Building for Android: Rust"
 msgstr ""
 
-#: src/SUMMARY.md:237
+#: src/SUMMARY.md
 msgid "With Java"
 msgstr "Avec Java"
 
-#: src/SUMMARY.md:238 src/SUMMARY.md:302 src/SUMMARY.md:331 src/SUMMARY.md:354
-#: src/SUMMARY.md:376 src/exercises/android/morning.md:1
-#: src/exercises/bare-metal/morning.md:1
-#: src/exercises/bare-metal/afternoon.md:1
-#: src/exercises/concurrency/morning.md:1
-#: src/exercises/concurrency/afternoon.md:1
+#: src/SUMMARY.md src/exercises/android/morning.md
+#: src/exercises/bare-metal/morning.md src/exercises/bare-metal/afternoon.md
+#: src/exercises/concurrency/morning.md src/exercises/concurrency/afternoon.md
 msgid "Exercises"
 msgstr "Exercices"
 
-#: src/SUMMARY.md:242
+#: src/SUMMARY.md
 msgid "Chromium"
 msgstr ""
 
-#: src/SUMMARY.md:248 src/chromium/cargo.md:1
+#: src/SUMMARY.md src/chromium/cargo.md
 msgid "Comparing Chromium and Cargo Ecosystems"
 msgstr ""
 
-#: src/SUMMARY.md:249
+#: src/SUMMARY.md
 msgid "Policy"
 msgstr ""
 
-#: src/SUMMARY.md:251
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Unsafe Code"
 msgstr "Rust non sécurisé (_unsafe_)"
 
-#: src/SUMMARY.md:252 src/chromium/build-rules/depending.md:1
+#: src/SUMMARY.md src/chromium/build-rules/depending.md
 msgid "Depending on Rust Code from Chromium C++"
 msgstr ""
 
-#: src/SUMMARY.md:253 src/chromium/build-rules/vscode.md:1
+#: src/SUMMARY.md src/chromium/build-rules/vscode.md
 msgid "Visual Studio Code"
 msgstr ""
 
-#: src/SUMMARY.md:254 src/SUMMARY.md:258 src/SUMMARY.md:266 src/SUMMARY.md:279
-#: src/exercises/chromium/third-party.md:1
+#: src/SUMMARY.md src/exercises/chromium/third-party.md
 #, fuzzy
 msgid "Exercise"
 msgstr "Exercices"
 
-#: src/SUMMARY.md:256 src/chromium/testing/rust-gtest-interop.md:1
+#: src/SUMMARY.md src/chromium/testing/rust-gtest-interop.md
 msgid "`rust_gtest_interop` Library"
 msgstr ""
 
-#: src/SUMMARY.md:257 src/chromium/testing/build-gn.md:1
+#: src/SUMMARY.md src/chromium/testing/build-gn.md
 msgid "GN Rules for Rust Tests"
 msgstr ""
 
-#: src/SUMMARY.md:259 src/chromium/interoperability-with-cpp.md:1
+#: src/SUMMARY.md src/chromium/testing/chromium-import-macro.md
+msgid "`chromium::import!` Macro"
+msgstr ""
+
+#: src/SUMMARY.md src/chromium/interoperability-with-cpp.md
 #, fuzzy
 msgid "Interoperability with C++"
 msgstr "Interopérabilité avec C"
 
-#: src/SUMMARY.md:260
-#: src/chromium/interoperability-with-cpp/example-bindings.md:1
+#: src/SUMMARY.md src/chromium/interoperability-with-cpp/example-bindings.md
 #, fuzzy
 msgid "Example Bindings"
 msgstr "Exemples"
 
-#: src/SUMMARY.md:261
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:1
+#: src/SUMMARY.md src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid "Limitations of CXX"
 msgstr ""
 
-#: src/SUMMARY.md:262
-#: src/chromium/interoperability-with-cpp/error-handling.md:1
+#: src/SUMMARY.md src/chromium/interoperability-with-cpp/error-handling.md
 #, fuzzy
 msgid "CXX Error Handling"
 msgstr "Gestion des erreurs"
 
-#: src/SUMMARY.md:263
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Error Handling: QR Example"
 msgstr "Gestion des erreurs"
 
-#: src/SUMMARY.md:264
+#: src/SUMMARY.md
 #, fuzzy
 msgid "Error Handling: PNG Example"
 msgstr "Gestion des erreurs"
 
-#: src/SUMMARY.md:265
+#: src/SUMMARY.md
 msgid "Using CXX in Chromium"
 msgstr ""
 
-#: src/SUMMARY.md:267 src/chromium/adding-third-party-crates.md:1
+#: src/SUMMARY.md src/chromium/adding-third-party-crates.md
 msgid "Adding Third Party Crates"
 msgstr ""
 
-#: src/SUMMARY.md:268
+#: src/SUMMARY.md
 msgid "Configuring Cargo.toml"
 msgstr ""
 
-#: src/SUMMARY.md:269
-#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md:1
+#: src/SUMMARY.md
+#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md
 msgid "Configuring `gnrt_config.toml`"
 msgstr ""
 
-#: src/SUMMARY.md:270
-#: src/chromium/adding-third-party-crates/downloading-crates.md:1
+#: src/SUMMARY.md src/chromium/adding-third-party-crates/downloading-crates.md
 msgid "Downloading Crates"
 msgstr ""
 
-#: src/SUMMARY.md:271
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:1
+#: src/SUMMARY.md
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid "Generating `gn` Build Rules"
 msgstr ""
 
-#: src/SUMMARY.md:272
-#: src/chromium/adding-third-party-crates/resolving-problems.md:1
+#: src/SUMMARY.md src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Resolving Problems"
 msgstr ""
 
-#: src/SUMMARY.md:273
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md:1
+#: src/SUMMARY.md
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md
 msgid "Build Scripts Which Generate Code"
 msgstr ""
 
-#: src/SUMMARY.md:274
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md:1
+#: src/SUMMARY.md
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
 msgid "Build Scripts Which Build C++ or Take Arbitrary Actions"
 msgstr ""
 
-#: src/SUMMARY.md:275
-#: src/chromium/adding-third-party-crates/depending-on-a-crate.md:1
+#: src/SUMMARY.md
+#: src/chromium/adding-third-party-crates/depending-on-a-crate.md
 msgid "Depending on a Crate"
 msgstr ""
 
-#: src/SUMMARY.md:276
+#: src/SUMMARY.md
 msgid "Reviews and Audits"
 msgstr ""
 
-#: src/SUMMARY.md:277
+#: src/SUMMARY.md
 msgid "Checking into Chromium Source Code"
 msgstr ""
 
-#: src/SUMMARY.md:278
-#: src/chromium/adding-third-party-crates/keeping-up-to-date.md:1
+#: src/SUMMARY.md src/chromium/adding-third-party-crates/keeping-up-to-date.md
 msgid "Keeping Crates Up to Date"
 msgstr ""
 
-#: src/SUMMARY.md:280
+#: src/SUMMARY.md
 msgid "Bringing It Together - Exercise"
 msgstr ""
 
-#: src/SUMMARY.md:281 src/exercises/chromium/solutions.md:1
+#: src/SUMMARY.md src/exercises/chromium/solutions.md
 #, fuzzy
 msgid "Exercise Solutions"
 msgstr "Solutions"
 
-#: src/SUMMARY.md:284
+#: src/SUMMARY.md
 msgid "Bare Metal: Morning"
 msgstr "Bare Metal : Matin"
 
-#: src/SUMMARY.md:289 src/bare-metal/no_std.md:1
+#: src/SUMMARY.md src/bare-metal/no_std.md
 #, fuzzy
 msgid "`no_std`"
 msgstr "`no_std`"
 
-#: src/SUMMARY.md:290
+#: src/SUMMARY.md
 msgid "A Minimal Example"
 msgstr "Un exemple minimal"
 
-#: src/SUMMARY.md:291 src/bare-metal/no_std.md:12 src/bare-metal/alloc.md:1
+#: src/SUMMARY.md src/bare-metal/no_std.md src/bare-metal/alloc.md
 #, fuzzy
 msgid "`alloc`"
 msgstr "`allouer`"
 
-#: src/SUMMARY.md:292 src/bare-metal/microcontrollers.md:1
+#: src/SUMMARY.md src/bare-metal/microcontrollers.md
 msgid "Microcontrollers"
 msgstr "Microcontrôleurs"
 
-#: src/SUMMARY.md:293 src/bare-metal/microcontrollers/mmio.md:1
+#: src/SUMMARY.md src/bare-metal/microcontrollers/mmio.md
 msgid "Raw MMIO"
 msgstr "MMIO brut"
 
-#: src/SUMMARY.md:294
+#: src/SUMMARY.md
 msgid "PACs"
 msgstr "PACs"
 
-#: src/SUMMARY.md:295
+#: src/SUMMARY.md
 msgid "HAL Crates"
 msgstr "HAL Crates"
 
-#: src/SUMMARY.md:296
+#: src/SUMMARY.md
 msgid "Board Support Crates"
 msgstr "Board Support Crates"
 
-#: src/SUMMARY.md:297
+#: src/SUMMARY.md
 msgid "The Type State Pattern"
 msgstr "Le modèle d'état de type"
 
-#: src/SUMMARY.md:298 src/bare-metal/microcontrollers/embedded-hal.md:1
+#: src/SUMMARY.md src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "`embedded-hal`"
 msgstr "`embedded-hal`"
 
-#: src/SUMMARY.md:299 src/bare-metal/microcontrollers/probe-rs.md:1
+#: src/SUMMARY.md src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid "`probe-rs` and `cargo-embed`"
 msgstr "`probe-rs`, `cargo-embed`"
 
-#: src/SUMMARY.md:300 src/bare-metal/microcontrollers/debugging.md:1
+#: src/SUMMARY.md src/bare-metal/microcontrollers/debugging.md
 msgid "Debugging"
 msgstr "Débogage"
 
-#: src/SUMMARY.md:301 src/SUMMARY.md:322
+#: src/SUMMARY.md
 msgid "Other Projects"
 msgstr "Autres projets"
 
-#: src/SUMMARY.md:303 src/exercises/bare-metal/compass.md:1
-#: src/exercises/bare-metal/solutions-morning.md:3
+#: src/SUMMARY.md src/exercises/bare-metal/compass.md
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "Compass"
 msgstr "Boussole"
 
-#: src/SUMMARY.md:304 src/SUMMARY.md:333 src/SUMMARY.md:357 src/SUMMARY.md:379
+#: src/SUMMARY.md
 msgid "Solutions"
 msgstr "Solutions"
 
-#: src/SUMMARY.md:306
+#: src/SUMMARY.md
 msgid "Bare Metal: Afternoon"
 msgstr "Bare Metal : Après-midi"
 
-#: src/SUMMARY.md:308
+#: src/SUMMARY.md
 msgid "Application Processors"
 msgstr "Processeurs d'applications"
 
-#: src/SUMMARY.md:309 src/bare-metal/aps/entry-point.md:1
+#: src/SUMMARY.md src/bare-metal/aps/entry-point.md
 msgid "Getting Ready to Rust"
 msgstr ""
 
-#: src/SUMMARY.md:310
+#: src/SUMMARY.md
 msgid "Inline Assembly"
 msgstr "Assembleur en ligne"
 
-#: src/SUMMARY.md:311
+#: src/SUMMARY.md
 msgid "MMIO"
 msgstr "MMIO"
 
-#: src/SUMMARY.md:312
+#: src/SUMMARY.md
 msgid "Let's Write a UART Driver"
 msgstr "Écrivons un pilote UART"
 
-#: src/SUMMARY.md:313
+#: src/SUMMARY.md
 msgid "More Traits"
 msgstr "Plus de traits"
 
-#: src/SUMMARY.md:314
+#: src/SUMMARY.md
 msgid "A Better UART Driver"
 msgstr "Un meilleur pilote UART"
 
-#: src/SUMMARY.md:315 src/bare-metal/aps/better-uart/bitflags.md:1
+#: src/SUMMARY.md src/bare-metal/aps/better-uart/bitflags.md
 msgid "Bitflags"
 msgstr "Bitflags"
 
-#: src/SUMMARY.md:316
+#: src/SUMMARY.md
 msgid "Multiple Registers"
 msgstr "Registres multiples"
 
-#: src/SUMMARY.md:317 src/bare-metal/aps/better-uart/driver.md:1
+#: src/SUMMARY.md src/bare-metal/aps/better-uart/driver.md
 msgid "Driver"
 msgstr "Pilote"
 
-#: src/SUMMARY.md:318 src/SUMMARY.md:320
+#: src/SUMMARY.md
 msgid "Using It"
 msgstr "Utilisation"
 
-#: src/SUMMARY.md:321 src/bare-metal/aps/exceptions.md:1
+#: src/SUMMARY.md src/bare-metal/aps/exceptions.md
 msgid "Exceptions"
 msgstr "Exceptions"
 
-#: src/SUMMARY.md:324 src/bare-metal/useful-crates/zerocopy.md:1
+#: src/SUMMARY.md src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid "`zerocopy`"
 msgstr "`zérocopie`"
 
-#: src/SUMMARY.md:325 src/bare-metal/useful-crates/aarch64-paging.md:1
+#: src/SUMMARY.md src/bare-metal/useful-crates/aarch64-paging.md
 #, fuzzy
 msgid "`aarch64-paging`"
 msgstr "`aarch64-pagination`"
 
-#: src/SUMMARY.md:326 src/bare-metal/useful-crates/buddy_system_allocator.md:1
+#: src/SUMMARY.md src/bare-metal/useful-crates/buddy_system_allocator.md
 #, fuzzy
 msgid "`buddy_system_allocator`"
 msgstr "`buddy_system_allocator`"
 
-#: src/SUMMARY.md:327 src/bare-metal/useful-crates/tinyvec.md:1
+#: src/SUMMARY.md src/bare-metal/useful-crates/tinyvec.md
 #, fuzzy
 msgid "`tinyvec`"
 msgstr "`tinyvec`"
 
-#: src/SUMMARY.md:328 src/bare-metal/useful-crates/spin.md:1
+#: src/SUMMARY.md src/bare-metal/useful-crates/spin.md
 #, fuzzy
 msgid "`spin`"
 msgstr "`tourner`"
 
-#: src/SUMMARY.md:330
+#: src/SUMMARY.md
 #, fuzzy
 msgid "`vmbase`"
 msgstr "vmbase"
 
-#: src/SUMMARY.md:332
+#: src/SUMMARY.md
 msgid "RTC Driver"
 msgstr "Pilote RTC"
 
-#: src/SUMMARY.md:336
+#: src/SUMMARY.md
 msgid "Concurrency: Morning"
 msgstr "Concurrence : Matin"
 
-#: src/SUMMARY.md:341 src/concurrency/threads.md:1
+#: src/SUMMARY.md src/concurrency/threads.md
 msgid "Threads"
 msgstr "Threads"
 
-#: src/SUMMARY.md:342 src/concurrency/scoped-threads.md:1
+#: src/SUMMARY.md src/concurrency/scoped-threads.md
 msgid "Scoped Threads"
 msgstr "Threads délimités"
 
-#: src/SUMMARY.md:343 src/concurrency/channels.md:1
+#: src/SUMMARY.md src/concurrency/channels.md
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/SUMMARY.md:344 src/concurrency/channels/unbounded.md:1
+#: src/SUMMARY.md src/concurrency/channels/unbounded.md
 msgid "Unbounded Channels"
 msgstr "Canaux illimités"
 
-#: src/SUMMARY.md:345 src/concurrency/channels/bounded.md:1
+#: src/SUMMARY.md src/concurrency/channels/bounded.md
 msgid "Bounded Channels"
 msgstr "Canaux limités"
 
-#: src/SUMMARY.md:346 src/concurrency/send-sync.md:1
+#: src/SUMMARY.md src/concurrency/send-sync.md
 #, fuzzy
 msgid "`Send` and `Sync`"
 msgstr "`Envoyer` et `Synchroniser`"
 
-#: src/SUMMARY.md:347 src/concurrency/send-sync/send.md:1
+#: src/SUMMARY.md src/concurrency/send-sync/send.md
 #, fuzzy
 msgid "`Send`"
 msgstr "`Envoyer`"
 
-#: src/SUMMARY.md:348 src/concurrency/send-sync/sync.md:1
+#: src/SUMMARY.md src/concurrency/send-sync/sync.md
 #, fuzzy
 msgid "`Sync`"
 msgstr "`Synchroniser`"
 
-#: src/SUMMARY.md:349 src/concurrency/send-sync/examples.md:1
+#: src/SUMMARY.md src/concurrency/send-sync/examples.md
 msgid "Examples"
 msgstr "Exemples"
 
-#: src/SUMMARY.md:350 src/concurrency/shared_state.md:1
+#: src/SUMMARY.md src/concurrency/shared_state.md
 msgid "Shared State"
 msgstr "État partagé"
 
-#: src/SUMMARY.md:351 src/concurrency/shared_state/arc.md:1
+#: src/SUMMARY.md src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid "`Arc`"
 msgstr "`Arc`"
 
-#: src/SUMMARY.md:352 src/concurrency/shared_state/mutex.md:1
+#: src/SUMMARY.md src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid "`Mutex`"
 msgstr "`Mutex`"
 
-#: src/SUMMARY.md:353 src/memory-management/review.md:16
-#: src/error-handling/try-conversions.md:22
-#: src/concurrency/shared_state/example.md:1
+#: src/SUMMARY.md src/memory-management/review.md
+#: src/error-handling/try-conversions.md
+#: src/concurrency/shared_state/example.md
 msgid "Example"
 msgstr "Exemple"
 
-#: src/SUMMARY.md:355 src/SUMMARY.md:377
-#: src/exercises/concurrency/dining-philosophers.md:1
-#: src/exercises/concurrency/solutions-morning.md:3
+#: src/SUMMARY.md src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "Dining Philosophers"
 msgstr "Dîner des philosophes"
 
-#: src/SUMMARY.md:356 src/exercises/concurrency/link-checker.md:1
+#: src/SUMMARY.md src/exercises/concurrency/link-checker.md
 msgid "Multi-threaded Link Checker"
 msgstr "Vérificateur de liens à plusieurs threads"
 
-#: src/SUMMARY.md:359
+#: src/SUMMARY.md
 msgid "Concurrency: Afternoon"
 msgstr "Concurrence : Après-midi"
 
-#: src/SUMMARY.md:361
+#: src/SUMMARY.md
 msgid "Async Basics"
 msgstr ""
 
-#: src/SUMMARY.md:362 src/async/async-await.md:1
+#: src/SUMMARY.md src/async/async-await.md
 msgid "`async`/`await`"
 msgstr ""
 
-#: src/SUMMARY.md:363 src/async/futures.md:1
+#: src/SUMMARY.md src/async/futures.md
 msgid "Futures"
 msgstr "Fermetures"
 
-#: src/SUMMARY.md:364 src/async/runtimes.md:1
+#: src/SUMMARY.md src/async/runtimes.md
 #, fuzzy
 msgid "Runtimes"
 msgstr "Garanties d'exécution"
 
-#: src/SUMMARY.md:365 src/async/runtimes/tokio.md:1
+#: src/SUMMARY.md src/async/runtimes/tokio.md
 msgid "Tokio"
 msgstr "Tokio"
 
-#: src/SUMMARY.md:366 src/exercises/concurrency/link-checker.md:126
-#: src/async/tasks.md:1 src/exercises/concurrency/chat-app.md:143
+#: src/SUMMARY.md src/exercises/concurrency/link-checker.md src/async/tasks.md
+#: src/exercises/concurrency/chat-app.md
 msgid "Tasks"
 msgstr "Tâches"
 
-#: src/SUMMARY.md:367 src/async/channels.md:1
+#: src/SUMMARY.md src/async/channels.md
 msgid "Async Channels"
 msgstr "Canaux asynchrones"
 
-#: src/SUMMARY.md:368
+#: src/SUMMARY.md
 msgid "Control Flow"
 msgstr "Flux de contrôle"
 
-#: src/SUMMARY.md:369 src/async/control-flow/join.md:1
+#: src/SUMMARY.md src/async/control-flow/join.md
 msgid "Join"
 msgstr ""
 
-#: src/SUMMARY.md:370 src/async/control-flow/select.md:1
+#: src/SUMMARY.md src/async/control-flow/select.md
 msgid "Select"
 msgstr "Select"
 
-#: src/SUMMARY.md:371
+#: src/SUMMARY.md
 msgid "Pitfalls"
 msgstr "Pièges"
 
-#: src/SUMMARY.md:372
+#: src/SUMMARY.md
 msgid "Blocking the Executor"
 msgstr "Bloquer l'exécuteur"
 
-#: src/SUMMARY.md:373 src/async/pitfalls/pin.md:1
+#: src/SUMMARY.md src/async/pitfalls/pin.md
 msgid "`Pin`"
 msgstr ""
 
-#: src/SUMMARY.md:374 src/async/pitfalls/async-traits.md:1
+#: src/SUMMARY.md src/async/pitfalls/async-traits.md
 msgid "Async Traits"
 msgstr "Traits asynchrones"
 
-#: src/SUMMARY.md:375 src/async/pitfalls/cancellation.md:1
+#: src/SUMMARY.md src/async/pitfalls/cancellation.md
 msgid "Cancellation"
 msgstr "Annulation"
 
-#: src/SUMMARY.md:378 src/exercises/concurrency/chat-app.md:1
-#: src/exercises/concurrency/solutions-afternoon.md:95
+#: src/SUMMARY.md src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "Broadcast Chat Application"
 msgstr ""
 
-#: src/SUMMARY.md:382
+#: src/SUMMARY.md
 msgid "Final Words"
 msgstr "Derniers mots"
 
-#: src/SUMMARY.md:386 src/thanks.md:1
+#: src/SUMMARY.md src/thanks.md
 msgid "Thanks!"
 msgstr "Merci!"
 
-#: src/SUMMARY.md:387 src/glossary.md:1
+#: src/SUMMARY.md src/glossary.md
 msgid "Glossary"
 msgstr ""
 
-#: src/SUMMARY.md:388
+#: src/SUMMARY.md
 msgid "Other Resources"
 msgstr "Autres ressources"
 
-#: src/SUMMARY.md:389 src/credits.md:1
+#: src/SUMMARY.md src/credits.md
 msgid "Credits"
 msgstr "Crédits"
 
-#: src/index.md:3
+#: src/index.md
 #, fuzzy
 msgid ""
 "[![Build workflow](https://img.shields.io/github/actions/workflow/status/"
@@ -1298,7 +1277,7 @@ msgstr ""
 "contributors/google/comprehensive-rust?style=flat-square)](https://github."
 "com/google/comprehensive-rust/graphs/contributors)"
 
-#: src/index.md:7
+#: src/index.md
 msgid ""
 "This is a free Rust course developed by the Android team at Google. The "
 "course covers the full spectrum of Rust, from basic syntax to advanced "
@@ -1308,7 +1287,7 @@ msgstr ""
 "cours couvre l'ensemble du langage Rust, de la syntaxe de base aux sujets "
 "avancés comme les génériques et la gestion des erreurs."
 
-#: src/index.md:11
+#: src/index.md
 msgid ""
 "The latest version of the course can be found at <https://google.github.io/"
 "comprehensive-rust/>. If you are reading somewhere else, please check there "
@@ -1319,7 +1298,7 @@ msgstr ""
 "depuis une autre adresse, n'hésitez pas à suivre ce lien pour accéder à la "
 "dernière version."
 
-#: src/index.md:15
+#: src/index.md
 msgid ""
 "The goal of the course is to teach you Rust. We assume you don't know "
 "anything about Rust and hope to:"
@@ -1327,36 +1306,36 @@ msgstr ""
 "Le but du cours est de vous apprendre Rust. Nous supposons que vous "
 "découvrez ce langage et espérons :"
 
-#: src/index.md:18
+#: src/index.md
 msgid "Give you a comprehensive understanding of the Rust syntax and language."
 msgstr ""
 "Vous donner une compréhension complète de la syntaxe et du langage Rust."
 
-#: src/index.md:19
+#: src/index.md
 msgid "Enable you to modify existing programs and write new programs in Rust."
 msgstr ""
 "Vous permettre de modifier des programmes existants et d'écrire de nouveaux "
 "programmes en Rust."
 
-#: src/index.md:20
+#: src/index.md
 msgid "Show you common Rust idioms."
 msgstr "Vous montrer les constructions fréquentes (idiomes) en Rust."
 
-#: src/index.md:22
+#: src/index.md
 #, fuzzy
 msgid "We call the first four course days Rust Fundamentals."
 msgstr ""
 "Nous appelons les trois premiers jours de ce cours les «Fondamentaux de "
 "Rust»."
 
-#: src/index.md:24
+#: src/index.md
 msgid ""
 "Building on this, you're invited to dive into one or more specialized topics:"
 msgstr ""
 "Au-delà de ces trois premiers jours de cours, nous vous invitons à "
 "approfondir un ou plusieurs des sujets suivant:"
 
-#: src/index.md:26
+#: src/index.md
 msgid ""
 "[Android](android.md): a half-day course on using Rust for Android platform "
 "development (AOSP). This includes interoperability with C, C++, and Java."
@@ -1365,7 +1344,7 @@ msgstr ""
 "de Rust dans le cadre du développement pour la plate-forme Android. Ce cours "
 "couvre également l'interopérabilité avec les langages C, C++ et Java."
 
-#: src/index.md:28
+#: src/index.md
 #, fuzzy
 msgid ""
 "[Chromium](chromium.md): a half-day course on using Rust within Chromium "
@@ -1376,7 +1355,7 @@ msgstr ""
 "de Rust dans le cadre du développement pour la plate-forme Android. Ce cours "
 "couvre également l'interopérabilité avec les langages C, C++ et Java."
 
-#: src/index.md:31
+#: src/index.md
 msgid ""
 "[Bare-metal](bare-metal.md): a whole-day class on using Rust for bare-metal "
 "(embedded) development. Both microcontrollers and application processors are "
@@ -1386,7 +1365,7 @@ msgstr ""
 "de Rust pour le développement embarqué. Le cours touche à la fois aux "
 "microcontrôleurs et aux processeurs d'applications."
 
-#: src/index.md:34
+#: src/index.md
 msgid ""
 "[Concurrency](concurrency.md): a whole-day class on concurrency in Rust. We "
 "cover both classical concurrency (preemptively scheduling using threads and "
@@ -1398,11 +1377,11 @@ msgstr ""
 "classique (planification à base de threads et mutex) ainsi que la "
 "concurrence async/await (multitâche coopératif à base de _futures_)."
 
-#: src/index.md:40
+#: src/index.md
 msgid "Non-Goals"
 msgstr "Non-objectifs"
 
-#: src/index.md:42
+#: src/index.md
 msgid ""
 "Rust is a large language and we won't be able to cover all of it in a few "
 "days. Some non-goals of this course are:"
@@ -1410,7 +1389,7 @@ msgstr ""
 "Rust est un vaste langage et nous ne pourrons pas tout couvrir en quelques "
 "jours. Certains non-objectifs de ce cours sont :"
 
-#: src/index.md:45
+#: src/index.md
 msgid ""
 "Learning how to develop macros: please see [Chapter 19.5 in the Rust Book]"
 "(https://doc.rust-lang.org/book/ch19-06-macros.html) and [Rust by Example]"
@@ -1423,11 +1402,11 @@ msgstr ""
 "[le Chapitre 19.5 dans la traduction non-officielle du Rust Book](https://"
 "jimskapt.github.io/rust-book-fr/ch19-06-macros.html) en français."
 
-#: src/index.md:49
+#: src/index.md
 msgid "Assumptions"
 msgstr "Prérequis"
 
-#: src/index.md:51
+#: src/index.md
 msgid ""
 "The course assumes that you already know how to program. Rust is a "
 "statically-typed language and we will sometimes make comparisons with C and "
@@ -1437,7 +1416,7 @@ msgstr ""
 "statiquement typé et nous ferons parfois des comparaisons avec C et C++ pour "
 "mieux expliquer ou contraster l'approche de Rust."
 
-#: src/index.md:55
+#: src/index.md
 msgid ""
 "If you know how to program in a dynamically-typed language such as Python or "
 "JavaScript, then you will be able to follow along just fine too."
@@ -1445,7 +1424,7 @@ msgstr ""
 "Si vous savez programmer dans un langage à typage dynamique tel que Python "
 "ou JavaScript, vous pourrez également suivre ce cours sans problème."
 
-#: src/index.md:60
+#: src/index.md
 msgid ""
 "This is an example of a _speaker note_. We will use these to add additional "
 "information to the slides. This could be key points which the instructor "
@@ -1456,11 +1435,11 @@ msgstr ""
 "points clés que l'instructeur devrait couvrir, ainsi que des réponses aux "
 "questions typiques posées en classe."
 
-#: src/running-the-course.md:3 src/running-the-course/course-structure.md:3
+#: src/running-the-course.md src/running-the-course/course-structure.md
 msgid "This page is for the course instructor."
 msgstr "Cette page est destinée au formateur."
 
-#: src/running-the-course.md:5
+#: src/running-the-course.md
 msgid ""
 "Here is a bit of background information about how we've been running the "
 "course internally at Google."
@@ -1468,7 +1447,7 @@ msgstr ""
 "Voici quelques informations générales sur la façon dont nous avons organisé "
 "le cours en interne chez Google."
 
-#: src/running-the-course.md:8
+#: src/running-the-course.md
 #, fuzzy
 msgid ""
 "We typically run classes from 9:00 am to 4:00 pm, with a 1 hour lunch break "
@@ -1484,12 +1463,12 @@ msgstr ""
 "L'inconvénient de sessions plus longues est une fatigue importante en fin de "
 "journée."
 
-#: src/running-the-course.md:13
+#: src/running-the-course.md
 msgid "Before you run the course, you will want to:"
 msgstr ""
 "Avant de présenter le cours, nous vous recommandons les choses suivantes :"
 
-#: src/running-the-course.md:15
+#: src/running-the-course.md
 msgid ""
 "Make yourself familiar with the course material. We've included speaker "
 "notes to help highlight the key points (please help us by contributing more "
@@ -1505,7 +1484,7 @@ msgstr ""
 "cette façon, vous affichez le cours sans les notes à la classe, et pouvez "
 "suivre les notes séparément."
 
-#: src/running-the-course.md:21
+#: src/running-the-course.md
 #, fuzzy
 msgid ""
 "Decide on the dates. Since the course takes four days, we recommend that you "
@@ -1519,7 +1498,7 @@ msgstr ""
 "précédentes ont en effet indiqué qu'il est utile d'espacer les jours de "
 "classe afin de mieux absorber le contenu."
 
-#: src/running-the-course.md:26
+#: src/running-the-course.md
 msgid ""
 "Find a room large enough for your in-person participants. We recommend a "
 "class size of 15-25 people. That's small enough that people are comfortable "
@@ -1540,7 +1519,7 @@ msgstr ""
 "programmation en direct en tant qu'instructeur, donc un simple pupitre ne "
 "serait pas très pratique pour vous."
 
-#: src/running-the-course.md:34
+#: src/running-the-course.md
 msgid ""
 "On the day of your course, show up to the room a little early to set things "
 "up. We recommend presenting directly using `mdbook serve` running on your "
@@ -1557,7 +1536,7 @@ msgstr ""
 "L'utilisation de votre ordinateur portable vous permettra également de "
 "corriger les éventuelles fautes de frappe."
 
-#: src/running-the-course.md:40
+#: src/running-the-course.md
 msgid ""
 "Let people solve the exercises by themselves or in small groups. We "
 "typically spend 30-45 minutes on exercises in the morning and in the "
@@ -1575,7 +1554,7 @@ msgstr ""
 "et proposez une solution, par exemple en montrant aux participants où "
 "trouver les informations pertinentes dans la bibliothèque standard."
 
-#: src/running-the-course.md:48
+#: src/running-the-course.md
 msgid ""
 "That is all, good luck running the course! We hope it will be as much fun "
 "for you as it has been for us!"
@@ -1583,7 +1562,7 @@ msgstr ""
 "C'est tout, bonne chance pour la présentation du cours ! Nous espérons que "
 "vous y prendrez autant de plaisir que nous !"
 
-#: src/running-the-course.md:51
+#: src/running-the-course.md
 msgid ""
 "Please [provide feedback](https://github.com/google/comprehensive-rust/"
 "discussions/86) afterwards so that we can keep improving the course. We "
@@ -1598,29 +1577,162 @@ msgstr ""
 "peuvent également [envoyer des commentaires](https://github.com/google/"
 "comprehensive-rust/discussions/100). Merci !"
 
-#: src/running-the-course/course-structure.md:5
+#: src/running-the-course/course-structure.md
 msgid "Rust Fundamentals"
 msgstr "Fondamentaux de Rust"
 
-#: src/running-the-course/course-structure.md:7
+#: src/running-the-course/course-structure.md
 #, fuzzy
 msgid ""
-"The first four days make up [Rust Fundaments](../welcome-day-1.md). The days "
-"are fast paced and we cover a lot of ground!"
+"The first four days make up [Rust Fundamentals](../welcome-day-1.md). The "
+"days are fast paced and we cover a lot of ground!"
 msgstr ""
 "Les trois premiers jours constituent les [Fondamentaux de Rust](../welcome-"
 "day-1.md). Le rythme est soutenu et nous couvrons beaucoup de sujets:"
 
-#: src/running-the-course/course-structure.md:10
+#: src/running-the-course/course-structure.md
 #, fuzzy
-msgid "{{%course outline Fundamentals}}"
-msgstr "Fondamentaux de Rust"
+msgid "Course schedule:"
+msgstr "Structure du cours"
 
-#: src/running-the-course/course-structure.md:12
+#: src/running-the-course/course-structure.md
+msgid "Day 1 Morning (3 hours, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Welcome](../welcome-day-1.md) (5 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Hello, World](../hello-world.md) (20 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Types and Values](../types-and-values.md) (1 hour and 5 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Control Flow Basics](../control-flow-basics.md) (1 hour)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "Day 1 Afternoon (2 hours and 55 minutes, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Tuples and Arrays](../tuples-and-arrays.md) (1 hour)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[References](../references.md) (50 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[User-Defined Types](../user-defined-types.md) (50 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "Day 2 Morning (3 hours and 5 minutes, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Welcome](../welcome-day-2.md) (3 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+#, fuzzy
+msgid "[Pattern Matching](../pattern-matching.md) (50 minutes)"
+msgstr ""
+"Voir [Filtrage par motif](../pattern-matching.md) pour plus de détails sur "
+"les motifs avec Rust."
+
+#: src/running-the-course/course-structure.md
+msgid "[Methods and Traits](../methods-and-traits.md) (55 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Generics](../generics.md) (45 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+#, fuzzy
+msgid "Day 2 Afternoon (3 hours, including breaks)"
+msgstr "Exercices de l'après-midi du jour 2"
+
+#: src/running-the-course/course-structure.md
+msgid "[Standard Library Types](../std-types.md) (1 hour and 10 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Standard Library Traits](../std-traits.md) (1 hour and 40 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "Day 3 Morning (2 hours and 15 minutes, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Welcome](../welcome-day-3.md) (3 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Memory Management](../memory-management.md) (1 hour and 10 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Smart Pointers](../smart-pointers.md) (45 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "Day 3 Afternoon (2 hours and 20 minutes, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Borrowing](../borrowing.md) (1 hour)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid ""
+"[Slices and Lifetimes](../slices-and-lifetimes.md) (1 hour and 10 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "Day 4 Morning (3 hours and 5 minutes, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Welcome](../welcome-day-4.md) (3 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Iterators](../iterators.md) (45 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Modules](../modules.md) (40 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Testing](../testing.md) (1 hour and 5 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "Day 4 Afternoon (2 hours, including breaks)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Error Handling](../error-handling.md) (45 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
+msgid "[Unsafe Rust](../unsafe-rust.md) (1 hour and 5 minutes)"
+msgstr ""
+
+#: src/running-the-course/course-structure.md
 msgid "Deep Dives"
 msgstr "Approfondissements"
 
-#: src/running-the-course/course-structure.md:14
+#: src/running-the-course/course-structure.md
 #, fuzzy
 msgid ""
 "In addition to the 4-day class on Rust Fundamentals, we cover some more "
@@ -1629,11 +1741,11 @@ msgstr ""
 "Au delà des trois jours portant sur les Fondamentaux de Rust, nous couvrons "
 "également des sujets spécifiques:"
 
-#: src/running-the-course/course-structure.md:17
+#: src/running-the-course/course-structure.md
 msgid "Rust in Android"
 msgstr "Rust pour Android"
 
-#: src/running-the-course/course-structure.md:19
+#: src/running-the-course/course-structure.md
 msgid ""
 "The [Rust in Android](../android.md) deep dive is a half-day course on using "
 "Rust for Android platform development. This includes interoperability with "
@@ -1644,7 +1756,7 @@ msgstr ""
 "Android. Ce cours couvre également l'interopérabilité avec les langages C, C+"
 "+ et Java."
 
-#: src/running-the-course/course-structure.md:23
+#: src/running-the-course/course-structure.md
 msgid ""
 "You will need an [AOSP checkout](https://source.android.com/docs/setup/"
 "download/downloading). Make a checkout of the [course repository](https://"
@@ -1659,7 +1771,7 @@ msgstr ""
 "assurera que le système de construction d'Android a accès aux fichiers "
 "`Android.bp` dans `src/android/`."
 
-#: src/running-the-course/course-structure.md:28
+#: src/running-the-course/course-structure.md
 msgid ""
 "Ensure that `adb sync` works with your emulator or real device and pre-build "
 "all Android examples using `src/android/build_all.sh`. Read the script to "
@@ -1670,12 +1782,12 @@ msgstr ""
 "android/build_all.sh`. Lisez le script pour voir les commandes éxécutées et "
 "assurez-vous qu'elles fonctionnent lorsque vous les exécutez à la main."
 
-#: src/running-the-course/course-structure.md:35
+#: src/running-the-course/course-structure.md
 #, fuzzy
 msgid "Rust in Chromium"
 msgstr "Rust pour Android"
 
-#: src/running-the-course/course-structure.md:37
+#: src/running-the-course/course-structure.md
 msgid ""
 "The [Rust in Chromium](../chromium.md) deep dive is a half-day course on "
 "using Rust as part of the Chromium browser. It includes using Rust in "
@@ -1683,18 +1795,18 @@ msgid ""
 "and C++ interoperability."
 msgstr ""
 
-#: src/running-the-course/course-structure.md:42
+#: src/running-the-course/course-structure.md
 msgid ""
 "You will need to be able to build Chromium --- a debug, component build is "
 "[recommended](../chromium/setup.md) for speed but any build will work. "
 "Ensure that you can run the Chromium browser that you've built."
 msgstr ""
 
-#: src/running-the-course/course-structure.md:46
+#: src/running-the-course/course-structure.md
 msgid "Bare-Metal Rust"
 msgstr "Bare-Metal Rust"
 
-#: src/running-the-course/course-structure.md:48
+#: src/running-the-course/course-structure.md
 msgid ""
 "The [Bare-Metal Rust](../bare-metal.md) deep dive is a full day class on "
 "using Rust for bare-metal (embedded) development. Both microcontrollers and "
@@ -1704,7 +1816,7 @@ msgstr ""
 "l'utilisation de Rust pour le développement embarqué. Le cours touche à la "
 "fois aux microcontrôleurs et aux processeurs d'applications."
 
-#: src/running-the-course/course-structure.md:52
+#: src/running-the-course/course-structure.md
 msgid ""
 "For the microcontroller part, you will need to buy the [BBC micro:bit]"
 "(https://microbit.org/) v2 development board ahead of time. Everybody will "
@@ -1716,11 +1828,11 @@ msgstr ""
 "Tous les participants à ce cours devront installer les paquets listés sur "
 "[la page de bienvenue](../bare-metal.md) du cours."
 
-#: src/running-the-course/course-structure.md:57
+#: src/running-the-course/course-structure.md
 msgid "Concurrency in Rust"
 msgstr "Programmation concurrente en Rust"
 
-#: src/running-the-course/course-structure.md:59
+#: src/running-the-course/course-structure.md
 msgid ""
 "The [Concurrency in Rust](../concurrency.md) deep dive is a full day class "
 "on classical as well as `async`/`await` concurrency."
@@ -1729,7 +1841,7 @@ msgstr ""
 "journée portant sur la programmation concurrente classique ainsi que `async`/"
 "`await`."
 
-#: src/running-the-course/course-structure.md:62
+#: src/running-the-course/course-structure.md
 msgid ""
 "You will need a fresh crate set up and the dependencies downloaded and ready "
 "to go. You can then copy/paste the examples into `src/main.rs` to experiment "
@@ -1739,11 +1851,11 @@ msgstr ""
 "et installé les dépendances. Vous pourrez ensuite copier/coller les exemples "
 "dans `src/main.rs` et les modifier:"
 
-#: src/running-the-course/course-structure.md:73
+#: src/running-the-course/course-structure.md
 msgid "Format"
 msgstr "Format du cours"
 
-#: src/running-the-course/course-structure.md:75
+#: src/running-the-course/course-structure.md
 msgid ""
 "The course is meant to be very interactive and we recommend letting the "
 "questions drive the exploration of Rust!"
@@ -1751,43 +1863,43 @@ msgstr ""
 "Le cours se veut très interactif et nous recommandons de laisser les "
 "questions guider l'exploration de Rust !"
 
-#: src/running-the-course/keyboard-shortcuts.md:3
+#: src/running-the-course/keyboard-shortcuts.md
 msgid "There are several useful keyboard shortcuts in mdBook:"
 msgstr "Il existe plusieurs raccourcis clavier utiles dans mdBook :"
 
-#: src/running-the-course/keyboard-shortcuts.md:5
+#: src/running-the-course/keyboard-shortcuts.md
 msgid "Arrow-Left"
 msgstr "Flèche vers la gauche"
 
-#: src/running-the-course/keyboard-shortcuts.md:5
+#: src/running-the-course/keyboard-shortcuts.md
 msgid ": Navigate to the previous page."
 msgstr " : Navigue à la page précédente."
 
-#: src/running-the-course/keyboard-shortcuts.md:6
+#: src/running-the-course/keyboard-shortcuts.md
 msgid "Arrow-Right"
 msgstr "Flèche vers la droite"
 
-#: src/running-the-course/keyboard-shortcuts.md:6
+#: src/running-the-course/keyboard-shortcuts.md
 msgid ": Navigate to the next page."
 msgstr " : Navigue à la page suivante."
 
-#: src/running-the-course/keyboard-shortcuts.md:7 src/cargo/code-samples.md:19
+#: src/running-the-course/keyboard-shortcuts.md src/cargo/code-samples.md
 msgid "Ctrl + Enter"
 msgstr "Ctrl + Entrée"
 
-#: src/running-the-course/keyboard-shortcuts.md:7
+#: src/running-the-course/keyboard-shortcuts.md
 msgid ": Execute the code sample that has focus."
 msgstr " : Exécute l'exemple de code qui a le focus."
 
-#: src/running-the-course/keyboard-shortcuts.md:8
+#: src/running-the-course/keyboard-shortcuts.md
 msgid "s"
 msgstr "s"
 
-#: src/running-the-course/keyboard-shortcuts.md:8
+#: src/running-the-course/keyboard-shortcuts.md
 msgid ": Activate the search bar."
 msgstr " : Active la barre de recherche."
 
-#: src/running-the-course/translations.md:3
+#: src/running-the-course/translations.md
 msgid ""
 "The course has been translated into other languages by a set of wonderful "
 "volunteers:"
@@ -1795,7 +1907,7 @@ msgstr ""
 "Le cours a été traduit dans d'autres langues par un ensemble de merveilleux "
 "bénévoles:"
 
-#: src/running-the-course/translations.md:6
+#: src/running-the-course/translations.md
 #, fuzzy
 msgid ""
 "[Brazilian Portuguese](https://google.github.io/comprehensive-rust/pt-BR/) "
@@ -1807,7 +1919,7 @@ msgstr ""
 "par [@rastringer](https://github.com/rastringer) et [@hugojacob](https://"
 "github.com/hugojacob)."
 
-#: src/running-the-course/translations.md:7
+#: src/running-the-course/translations.md
 msgid ""
 "[Chinese (Simplified)](https://google.github.io/comprehensive-rust/zh-CN/) "
 "by [@suetfei](https://github.com/suetfei), [@wnghl](https://github.com/"
@@ -1817,7 +1929,7 @@ msgid ""
 "(https://github.com/nodmp)."
 msgstr ""
 
-#: src/running-the-course/translations.md:8
+#: src/running-the-course/translations.md
 #, fuzzy
 msgid ""
 "[Chinese (Traditional)](https://google.github.io/comprehensive-rust/zh-TW/) "
@@ -1830,7 +1942,7 @@ msgstr ""
 "par [@rastringer](https://github.com/rastringer) et [@hugojacob](https://"
 "github.com/hugojacob)."
 
-#: src/running-the-course/translations.md:9
+#: src/running-the-course/translations.md
 #, fuzzy
 msgid ""
 "[Korean](https://google.github.io/comprehensive-rust/ko/) by [@keispace]"
@@ -1841,56 +1953,56 @@ msgstr ""
 "(https://github.com/keispace), [@jiyongp](https://github.com/jiyongp) et "
 "[@jooyunghan](https://github.com/jooyunghan)."
 
-#: src/running-the-course/translations.md:10
+#: src/running-the-course/translations.md
 msgid ""
 "[Spanish](https://google.github.io/comprehensive-rust/es/) by [@deavid]"
 "(https://github.com/deavid)."
 msgstr ""
 
-#: src/running-the-course/translations.md:12
+#: src/running-the-course/translations.md
 msgid ""
 "Use the language picker in the top-right corner to switch between languages."
 msgstr ""
 "Utilisez le sélecteur de langue dans le coin supérieur droit pour basculer "
 "entre les langues."
 
-#: src/running-the-course/translations.md:14
+#: src/running-the-course/translations.md
 #, fuzzy
 msgid "Incomplete Translations"
 msgstr "Traductions"
 
-#: src/running-the-course/translations.md:16
+#: src/running-the-course/translations.md
 msgid ""
 "There is a large number of in-progress translations. We link to the most "
 "recently updated translations:"
 msgstr ""
 
-#: src/running-the-course/translations.md:19
+#: src/running-the-course/translations.md
 msgid ""
 "[Bengali](https://google.github.io/comprehensive-rust/bn/) by [@raselmandol]"
 "(https://github.com/raselmandol)."
 msgstr ""
 
-#: src/running-the-course/translations.md:20
+#: src/running-the-course/translations.md
 msgid ""
 "[French](https://google.github.io/comprehensive-rust/fr/) by [@KookaS]"
 "(https://github.com/KookaS) and [@vcaen](https://github.com/vcaen)."
 msgstr ""
 
-#: src/running-the-course/translations.md:21
+#: src/running-the-course/translations.md
 msgid ""
 "[German](https://google.github.io/comprehensive-rust/de/) by [@Throvn]"
 "(https://github.com/Throvn) and [@ronaldfw](https://github.com/ronaldfw)."
 msgstr ""
 
-#: src/running-the-course/translations.md:22
+#: src/running-the-course/translations.md
 msgid ""
 "[Japanese](https://google.github.io/comprehensive-rust/ja/) by [@CoinEZ-JPN]"
 "(https://github.com/CoinEZ) and [@momotaro1105](https://github.com/"
 "momotaro1105)."
 msgstr ""
 
-#: src/running-the-course/translations.md:24
+#: src/running-the-course/translations.md
 msgid ""
 "If you want to help with this effort, please see [our instructions](https://"
 "github.com/google/comprehensive-rust/blob/main/TRANSLATIONS.md) for how to "
@@ -1901,7 +2013,7 @@ msgstr ""
 "instructions\\] pour savoir comment se lancer. Les traductions sont "
 "coordonnées sur le \\[traqueur de problèmes\\]."
 
-#: src/cargo.md:3
+#: src/cargo.md
 msgid ""
 "When you start reading about Rust, you will soon meet [Cargo](https://doc."
 "rust-lang.org/cargo/), the standard tool used in the Rust ecosystem to build "
@@ -1915,15 +2027,15 @@ msgstr ""
 "voulons donner un bref aperçu de ce qu'est Cargo et comment il s'intègre "
 "dans le large écosystème et comment cela s'inscrit dans cette formation."
 
-#: src/cargo.md:8
+#: src/cargo.md
 msgid "Installation"
 msgstr "Installation"
 
-#: src/cargo.md:10
+#: src/cargo.md
 msgid "**Please follow the instructions on <https://rustup.rs/>.**"
 msgstr ""
 
-#: src/cargo.md:12
+#: src/cargo.md
 #, fuzzy
 msgid ""
 "This will give you the Cargo build tool (`cargo`) and the Rust compiler "
@@ -1934,7 +2046,7 @@ msgstr ""
 "commande que vous pourrez utiliser pour installer/changer de chaînes "
 "d'outils, configurer une compilation croisée, etc."
 
-#: src/cargo.md:14
+#: src/cargo.md
 msgid ""
 "After installing Rust, you should configure your editor or IDE to work with "
 "Rust. Most editors do this by talking to [rust-analyzer](https://rust-"
@@ -1945,7 +2057,7 @@ msgid ""
 "different IDE available called [RustRover](https://www.jetbrains.com/rust/)."
 msgstr ""
 
-#: src/cargo.md:18
+#: src/cargo.md
 #, fuzzy
 msgid ""
 "On Debian/Ubuntu, you can also install Cargo, the Rust source and the [Rust "
@@ -1956,18 +2068,18 @@ msgstr ""
 "Sur Debian/Ubuntu, vous pouvez installer Cargo, la source Rust et le "
 "[formateur Rust](https://github.com/rust-lang/rustfmt) avec"
 
-#: src/cargo/rust-ecosystem.md:1
+#: src/cargo/rust-ecosystem.md
 msgid "The Rust Ecosystem"
 msgstr "L'écosystème de Rust"
 
-#: src/cargo/rust-ecosystem.md:3
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "The Rust ecosystem consists of a number of tools, of which the main ones are:"
 msgstr ""
 "L'écosystème de Rust est composé d'un certain nombre d'outils, dont les "
 "principaux sont :"
 
-#: src/cargo/rust-ecosystem.md:5
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "`rustc`: the Rust compiler which turns `.rs` files into binaries and other "
 "intermediate formats."
@@ -1975,7 +2087,7 @@ msgstr ""
 "`rustc` : le compilateur Rust qui transforme les fichiers `.rs` en binaires "
 "et autres formats intermédiaires."
 
-#: src/cargo/rust-ecosystem.md:8
+#: src/cargo/rust-ecosystem.md
 #, fuzzy
 msgid ""
 "`cargo`: the Rust dependency manager and build tool. Cargo knows how to "
@@ -1989,7 +2101,7 @@ msgstr ""
 "Cargo est également livré avec un exécuteur de test qui est utilisé pour "
 "exécuter des tests unitaires."
 
-#: src/cargo/rust-ecosystem.md:13
+#: src/cargo/rust-ecosystem.md
 #, fuzzy
 msgid ""
 "`rustup`: the Rust toolchain installer and updater. This tool is used to "
@@ -2005,15 +2117,15 @@ msgstr ""
 "standard. Vous pouvez avoir plusieurs versions de Rust installées à la fois "
 "et `rustup` vous permettra de basculer entre elles au besoin."
 
-#: src/cargo/rust-ecosystem.md:21 src/hello-world/hello-world.md:25
-#: src/tuples-and-arrays/tuples-and-arrays.md:36 src/references/exclusive.md:18
-#: src/pattern-matching/destructuring.md:67 src/memory-management/move.md:146
-#: src/error-handling/try.md:52 src/android/setup.md:17
-#: src/concurrency/threads.md:30 src/async/async-await.md:25
+#: src/cargo/rust-ecosystem.md src/hello-world/hello-world.md
+#: src/tuples-and-arrays/tuples-and-arrays.md src/references/exclusive.md
+#: src/pattern-matching/destructuring.md src/memory-management/move.md
+#: src/error-handling/try.md src/android/setup.md src/concurrency/threads.md
+#: src/async/async-await.md
 msgid "Key points:"
 msgstr "Points clés:"
 
-#: src/cargo/rust-ecosystem.md:23
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "Rust has a rapid release schedule with a new release coming out every six "
 "weeks. New releases maintain backwards compatibility with old releases --- "
@@ -2024,13 +2136,13 @@ msgstr ""
 "rétrocompatibilité avec les anciennes versions --- en plus, elles activent "
 "de nouvelles fonctionnalités."
 
-#: src/cargo/rust-ecosystem.md:27
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "There are three release channels: \"stable\", \"beta\", and \"nightly\"."
 msgstr ""
 "Il existe trois canaux de sortie : \"stable\", \"beta\" et \"nightly\"."
 
-#: src/cargo/rust-ecosystem.md:29
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "New features are being tested on \"nightly\", \"beta\" is what becomes "
 "\"stable\" every six weeks."
@@ -2038,13 +2150,13 @@ msgstr ""
 "De nouvelles fonctionnalités sont testées sur \"nightly\", \"beta\" est ce "
 "qui devient \"stable\" toutes les six semaines."
 
-#: src/cargo/rust-ecosystem.md:32
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "Dependencies can also be resolved from alternative [registries](https://doc."
 "rust-lang.org/cargo/reference/registries.html), git, folders, and more."
 msgstr ""
 
-#: src/cargo/rust-ecosystem.md:34
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "Rust also has [editions](https://doc.rust-lang.org/edition-guide/): the "
 "current edition is Rust 2021. Previous editions were Rust 2015 and Rust 2018."
@@ -2052,7 +2164,7 @@ msgstr ""
 "Rust a également des \\[éditions\\] : l'édition actuelle est Rust 2021. Les "
 "éditions passées étaient Rust 2015 et Rust 2018."
 
-#: src/cargo/rust-ecosystem.md:37
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "The editions are allowed to make backwards incompatible changes to the "
 "language."
@@ -2060,7 +2172,7 @@ msgstr ""
 "Les éditions sont autorisées à apporter des modifications rétrocompatibles à "
 "la langue."
 
-#: src/cargo/rust-ecosystem.md:40
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "To prevent breaking code, editions are opt-in: you select the edition for "
 "your crate via the `Cargo.toml` file."
@@ -2068,7 +2180,7 @@ msgstr ""
 "Pour éviter de casser le code, les éditions sont opt-in : vous sélectionnez "
 "l'édition pour votre crate via le fichier `Cargo.toml`."
 
-#: src/cargo/rust-ecosystem.md:43
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "To avoid splitting the ecosystem, Rust compilers can mix code written for "
 "different editions."
@@ -2076,7 +2188,7 @@ msgstr ""
 "Pour éviter de diviser l'écosystème, les compilateurs Rust peuvent mélanger "
 "le code écrit pour différentes éditions."
 
-#: src/cargo/rust-ecosystem.md:46
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "Mention that it is quite rare to ever use the compiler directly not through "
 "`cargo` (most users never do)."
@@ -2084,43 +2196,44 @@ msgstr ""
 "Veuillez noter qu'il est assez rare d'utiliser le compilateur directement et "
 "non via `cargo` (la plupart des utilisateurs ne le font jamais)."
 
-#: src/cargo/rust-ecosystem.md:48
+#: src/cargo/rust-ecosystem.md
+#, fuzzy
 msgid ""
 "It might be worth alluding that Cargo itself is an extremely powerful and "
-"comprehensive tool.  It is capable of many advanced features including but "
-"not limited to: "
+"comprehensive tool. It is capable of many advanced features including but "
+"not limited to:"
 msgstr ""
 "Il peut être utile de mentionner que Cargo lui-même est un outil extrêmement "
 "puissant et complet. Il est capable de nombreuses fonctionnalités avancées, "
 "y compris, mais sans s'y limiter :"
 
-#: src/cargo/rust-ecosystem.md:49
+#: src/cargo/rust-ecosystem.md
 msgid "Project/package structure"
 msgstr "Structure du projet/paquets"
 
-#: src/cargo/rust-ecosystem.md:50
+#: src/cargo/rust-ecosystem.md
 msgid "[workspaces](https://doc.rust-lang.org/cargo/reference/workspaces.html)"
 msgstr "\\[espaces de travail\\]"
 
-#: src/cargo/rust-ecosystem.md:51
+#: src/cargo/rust-ecosystem.md
 msgid "Dev Dependencies and Runtime Dependency management/caching"
 msgstr ""
 "Gestion/mise en cache des dépendances de développement et des dépendances "
 "d'exécution"
 
-#: src/cargo/rust-ecosystem.md:52
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "[build scripting](https://doc.rust-lang.org/cargo/reference/build-scripts."
 "html)"
 msgstr "\\[créer des scripts\\]"
 
-#: src/cargo/rust-ecosystem.md:53
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "[global installation](https://doc.rust-lang.org/cargo/commands/cargo-install."
 "html)"
 msgstr "\\[installation globale\\]"
 
-#: src/cargo/rust-ecosystem.md:54
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "It is also extensible with sub command plugins as well (such as [cargo "
 "clippy](https://github.com/rust-lang/rust-clippy))."
@@ -2128,16 +2241,16 @@ msgstr ""
 "Il est également extensible avec des plugins de sous-commande (tels que "
 "[cargo clippy](https://github.com/rust-lang/rust-clippy))."
 
-#: src/cargo/rust-ecosystem.md:55
+#: src/cargo/rust-ecosystem.md
 msgid ""
 "Read more from the [official Cargo Book](https://doc.rust-lang.org/cargo/)"
 msgstr "En savoir plus sur le \\[livre officiel de Cargo\\]"
 
-#: src/cargo/code-samples.md:1
+#: src/cargo/code-samples.md
 msgid "Code Samples in This Training"
 msgstr "Échantillons de code dans cette formation"
 
-#: src/cargo/code-samples.md:3
+#: src/cargo/code-samples.md
 msgid ""
 "For this training, we will mostly explore the Rust language through examples "
 "which can be executed through your browser. This makes the setup much easier "
@@ -2148,7 +2261,7 @@ msgstr ""
 "configuration beaucoup plus facile et assure une expérience cohérente pour "
 "chacun."
 
-#: src/cargo/code-samples.md:7
+#: src/cargo/code-samples.md
 msgid ""
 "Installing Cargo is still encouraged: it will make it easier for you to do "
 "the exercises. On the last day, we will do a larger exercise which shows you "
@@ -2159,23 +2272,23 @@ msgstr ""
 "qui vous montrera comment travailler avec des dépendances et pour cela vous "
 "avez besoin de Cargo."
 
-#: src/cargo/code-samples.md:11
+#: src/cargo/code-samples.md
 msgid "The code blocks in this course are fully interactive:"
 msgstr "Les blocs de code de ce cours sont entièrement interactifs :"
 
-#: src/cargo/code-samples.md:15 src/cargo/running-locally.md:45
+#: src/cargo/code-samples.md src/cargo/running-locally.md
 msgid "\"Edit me!\""
 msgstr ""
 
-#: src/cargo/code-samples.md:19
+#: src/cargo/code-samples.md
 msgid "You can use "
 msgstr "Vous pouvez utiliser "
 
-#: src/cargo/code-samples.md:19
+#: src/cargo/code-samples.md
 msgid " to execute the code when focus is in the text box."
 msgstr " pour exécuter le code lorsque le focus est dans la zone de texte."
 
-#: src/cargo/code-samples.md:24
+#: src/cargo/code-samples.md
 msgid ""
 "Most code samples are editable like shown above. A few code samples are not "
 "editable for various reasons:"
@@ -2183,7 +2296,7 @@ msgstr ""
 "La plupart des exemples de code sont modifiables comme indiqué ci-dessus. "
 "Quelques exemples de code ne sont pas modifiables pour diverses raisons :"
 
-#: src/cargo/code-samples.md:27
+#: src/cargo/code-samples.md
 msgid ""
 "The embedded playgrounds cannot execute unit tests. Copy-paste the code and "
 "open it in the real Playground to demonstrate unit tests."
@@ -2192,7 +2305,7 @@ msgstr ""
 "Copiez-collez le code et ouvrez-le dans le vrai terrain de jeu pour "
 "démontrer les tests unitaires."
 
-#: src/cargo/code-samples.md:30
+#: src/cargo/code-samples.md
 msgid ""
 "The embedded playgrounds lose their state the moment you navigate away from "
 "the page! This is the reason that the students should solve the exercises "
@@ -2203,11 +2316,11 @@ msgstr ""
 "les exercices en utilisant une installation Rust locale ou via le terrain de "
 "jeu."
 
-#: src/cargo/running-locally.md:1
+#: src/cargo/running-locally.md
 msgid "Running Code Locally with Cargo"
 msgstr "Exécuter le code localement avec Cargo"
 
-#: src/cargo/running-locally.md:3
+#: src/cargo/running-locally.md
 msgid ""
 "If you want to experiment with the code on your own system, then you will "
 "need to first install Rust. Do this by following the [instructions in the "
@@ -2222,13 +2335,13 @@ msgstr ""
 "fonctionnels. Au moment de l'écriture, la dernière version stable de Rust a "
 "ces numéros de version:"
 
-#: src/cargo/running-locally.md:15
+#: src/cargo/running-locally.md
 msgid ""
 "You can use any later version too since Rust maintains backwards "
 "compatibility."
 msgstr ""
 
-#: src/cargo/running-locally.md:17
+#: src/cargo/running-locally.md
 #, fuzzy
 msgid ""
 "With this in place, follow these steps to build a Rust binary from one of "
@@ -2237,31 +2350,31 @@ msgstr ""
 "Une fois cela en place, suivez ces étapes pour créer un binaire Rust à "
 "partir d'un des exemples dans cette formation :"
 
-#: src/cargo/running-locally.md:20
+#: src/cargo/running-locally.md
 msgid "Click the \"Copy to clipboard\" button on the example you want to copy."
 msgstr ""
 
-#: src/cargo/running-locally.md:22
+#: src/cargo/running-locally.md
 msgid ""
 "Use `cargo new exercise` to create a new `exercise/` directory for your code:"
 msgstr ""
 
-#: src/cargo/running-locally.md:29
+#: src/cargo/running-locally.md
 msgid ""
 "Navigate into `exercise/` and use `cargo run` to build and run your binary:"
 msgstr ""
 
-#: src/cargo/running-locally.md:40
+#: src/cargo/running-locally.md
 msgid ""
 "Replace the boiler-plate code in `src/main.rs` with your own code. For "
 "example, using the example on the previous page, make `src/main.rs` look like"
 msgstr ""
 
-#: src/cargo/running-locally.md:49
+#: src/cargo/running-locally.md
 msgid "Use `cargo run` to build and run your updated binary:"
 msgstr ""
 
-#: src/cargo/running-locally.md:59
+#: src/cargo/running-locally.md
 msgid ""
 "Use `cargo check` to quickly check your project for errors, use `cargo "
 "build` to compile it without running it. You will find the output in `target/"
@@ -2269,14 +2382,14 @@ msgid ""
 "optimized release build in `target/release/`."
 msgstr ""
 
-#: src/cargo/running-locally.md:64
+#: src/cargo/running-locally.md
 msgid ""
 "You can add dependencies for your project by editing `Cargo.toml`. When you "
 "run `cargo` commands, it will automatically download and compile missing "
 "dependencies for you."
 msgstr ""
 
-#: src/cargo/running-locally.md:72
+#: src/cargo/running-locally.md
 msgid ""
 "Try to encourage the class participants to install Cargo and use a local "
 "editor. It will make their life easier since they will have a normal "
@@ -2286,11 +2399,11 @@ msgstr ""
 "éditeur local. Cela leur facilitera la vie puisqu'ils auront un "
 "environnement de développement normal."
 
-#: src/welcome-day-1.md:1
+#: src/welcome-day-1.md
 msgid "Welcome to Day 1"
 msgstr "Bienvenue au jour 1"
 
-#: src/welcome-day-1.md:3
+#: src/welcome-day-1.md
 #, fuzzy
 msgid ""
 "This is the first day of Rust Fundamentals. We will cover a lot of ground "
@@ -2299,7 +2412,7 @@ msgstr ""
 "C'est le premier jour de Comprehensive Rust(le guide complet de Rust). Nous "
 "couvrirons beaucoup de terrain aujourd'hui:"
 
-#: src/welcome-day-1.md:6
+#: src/welcome-day-1.md
 msgid ""
 "Basic Rust syntax: variables, scalar and compound types, enums, structs, "
 "references, functions, and methods."
@@ -2307,43 +2420,63 @@ msgstr ""
 "Syntaxe de base de Rust : variables, types scalaires et composés, "
 "énumérations, structures, références, fonctions et méthodes."
 
-#: src/welcome-day-1.md:8
+#: src/welcome-day-1.md
 #, fuzzy
 msgid "Types and type inference."
 msgstr "Inférence de type"
 
-#: src/welcome-day-1.md:9
+#: src/welcome-day-1.md
 msgid "Control flow constructs: loops, conditionals, and so on."
 msgstr ""
 
-#: src/welcome-day-1.md:10
+#: src/welcome-day-1.md
 msgid "User-defined types: structs and enums."
 msgstr ""
 
-#: src/welcome-day-1.md:11
+#: src/welcome-day-1.md
 #, fuzzy
 msgid "Pattern matching: destructuring enums, structs, and arrays."
 msgstr ""
 "Filtrage par motif : déstructuration des énumérations, des structures et des "
 "tableaux."
 
-#: src/welcome-day-1.md:13 src/welcome-day-2.md:12 src/welcome-day-3.md:8
-#: src/welcome-day-4.md:11
+#: src/welcome-day-1.md src/welcome-day-2.md src/welcome-day-3.md
+#: src/welcome-day-4.md
 msgid "Schedule"
 msgstr ""
 
-#: src/welcome-day-1.md:15 src/welcome-day-1-afternoon.md:3
-#: src/welcome-day-2.md:14 src/welcome-day-2-afternoon.md:3
-#: src/welcome-day-3.md:10 src/welcome-day-3-afternoon.md:3
-#: src/welcome-day-4.md:13 src/welcome-day-4-afternoon.md:3
-msgid "{{%session outline}}"
+#: src/welcome-day-1.md src/welcome-day-1-afternoon.md src/welcome-day-2.md
+#: src/welcome-day-2-afternoon.md src/welcome-day-3.md
+#: src/welcome-day-3-afternoon.md src/welcome-day-4.md
+#: src/welcome-day-4-afternoon.md
+msgid "In this session:"
 msgstr ""
 
-#: src/welcome-day-1.md:19
+#: src/welcome-day-1.md
+msgid "[Welcome](./welcome-day-1.md) (5 minutes)"
+msgstr ""
+
+#: src/welcome-day-1.md
+msgid "[Hello, World](./hello-world.md) (20 minutes)"
+msgstr ""
+
+#: src/welcome-day-1.md
+msgid "[Types and Values](./types-and-values.md) (1 hour and 5 minutes)"
+msgstr ""
+
+#: src/welcome-day-1.md
+msgid "[Control Flow Basics](./control-flow-basics.md) (1 hour)"
+msgstr ""
+
+#: src/welcome-day-1.md src/welcome-day-2-afternoon.md
+msgid "Including 10 minute breaks, this session should take about 3 hours"
+msgstr ""
+
+#: src/welcome-day-1.md
 msgid "Please remind the students that:"
 msgstr "Veuillez rappeler aux élèves que :"
 
-#: src/welcome-day-1.md:21
+#: src/welcome-day-1.md
 #, fuzzy
 msgid ""
 "They should ask questions when they get them, don't save them to the end."
@@ -2351,7 +2484,7 @@ msgstr ""
 "Ils doivent poser des questions lorsqu'ils les reçoivent, ne les enregistrez "
 "pas jusqu'à la fin."
 
-#: src/welcome-day-1.md:22
+#: src/welcome-day-1.md
 #, fuzzy
 msgid ""
 "The class is meant to be interactive and discussions are very much "
@@ -2359,7 +2492,7 @@ msgid ""
 msgstr ""
 "Le cours se veut interactif et les discussions sont vivement encouragées !"
 
-#: src/welcome-day-1.md:23
+#: src/welcome-day-1.md
 #, fuzzy
 msgid ""
 "As an instructor, you should try to keep the discussions relevant, i.e., "
@@ -2373,7 +2506,7 @@ msgstr ""
 "bon équilibre, mais privilégiez les discussions car elles engagent les gens "
 "bien plus que la communication à sens unique."
 
-#: src/welcome-day-1.md:27
+#: src/welcome-day-1.md
 #, fuzzy
 msgid ""
 "The questions will likely mean that we talk about things ahead of the slides."
@@ -2381,7 +2514,7 @@ msgstr ""
 "Les questions signifieront probablement que nous parlons de choses avant les "
 "diapositives."
 
-#: src/welcome-day-1.md:28
+#: src/welcome-day-1.md
 #, fuzzy
 msgid ""
 "This is perfectly okay! Repetition is an important part of learning. "
@@ -2392,14 +2525,14 @@ msgstr ""
 "l'apprentissage. N'oubliez pas que les diapositives ne sont qu'un support et "
 "que vous êtes libre de les sauter si vous le souhaitez."
 
-#: src/welcome-day-1.md:32
+#: src/welcome-day-1.md
 msgid ""
 "The idea for the first day is to show the \"basic\" things in Rust that "
 "should have immediate parallels in other languages. The more advanced parts "
 "of Rust come on the subsequent days."
 msgstr ""
 
-#: src/welcome-day-1.md:36
+#: src/welcome-day-1.md
 msgid ""
 "If you're teaching this in a classroom, this is a good place to go over the "
 "schedule. Note that there is an exercise at the end of each segment, "
@@ -2408,17 +2541,37 @@ msgid ""
 "schedule. Feel free to be flexible and adjust as necessary!"
 msgstr ""
 
-#: src/hello-world.md:3 src/types-and-values.md:3 src/control-flow-basics.md:3
-#: src/tuples-and-arrays.md:3 src/references.md:3 src/user-defined-types.md:3
-#: src/pattern-matching.md:3 src/methods-and-traits.md:3 src/generics.md:3
-#: src/std-types.md:3 src/std-traits.md:3 src/memory-management.md:3
-#: src/smart-pointers.md:3 src/borrowing.md:3 src/slices-and-lifetimes.md:3
-#: src/iterators.md:3 src/modules.md:3 src/testing.md:3 src/error-handling.md:3
-#: src/unsafe-rust.md:3
-msgid "{{%segment outline}}"
+#: src/hello-world.md src/types-and-values.md src/control-flow-basics.md
+#: src/tuples-and-arrays.md src/references.md src/user-defined-types.md
+#: src/pattern-matching.md src/methods-and-traits.md src/generics.md
+#: src/std-types.md src/std-traits.md src/memory-management.md
+#: src/smart-pointers.md src/borrowing.md src/slices-and-lifetimes.md
+#: src/iterators.md src/modules.md src/testing.md src/error-handling.md
+#: src/unsafe-rust.md
+msgid "In this segment:"
 msgstr ""
 
-#: src/hello-world/what-is-rust.md:3
+#: src/hello-world.md
+msgid "[What is Rust?](./hello-world/what-is-rust.md) (10 minutes)"
+msgstr ""
+
+#: src/hello-world.md
+msgid "[Hello, World](./hello-world/hello-world.md) (5 minutes)"
+msgstr ""
+
+#: src/hello-world.md
+msgid "[Benefits of Rust](./hello-world/benefits.md) (3 minutes)"
+msgstr ""
+
+#: src/hello-world.md
+msgid "[Playground](./hello-world/playground.md) (2 minutes)"
+msgstr ""
+
+#: src/hello-world.md
+msgid "This segment should take about 20 minutes"
+msgstr ""
+
+#: src/hello-world/what-is-rust.md
 msgid ""
 "Rust is a new programming language which had its [1.0 release in 2015]"
 "(https://blog.rust-lang.org/2015/05/15/Rust-1.0.html):"
@@ -2426,17 +2579,17 @@ msgstr ""
 "Rust est un nouveau langage de programmation qui a eu sa [version 1.0 en "
 "2015](https://blog.rust-lang.org/2015/05/15/Rust-1.0.html) :"
 
-#: src/hello-world/what-is-rust.md:5
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "Rust is a statically compiled language in a similar role as C++"
 msgstr "Rust est un langage compilé statiquement dans un rôle similaire à C++"
 
-#: src/hello-world/what-is-rust.md:6
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "`rustc` uses LLVM as its backend."
 msgstr "`rustc` utilise LLVM comme backend."
 
-#: src/hello-world/what-is-rust.md:7
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid ""
 "Rust supports many [platforms and architectures](https://doc.rust-lang.org/"
@@ -2445,74 +2598,74 @@ msgstr ""
 "Rust prend en charge de nombreuses [plates-formes et architectures](https://"
 "doc.rust-lang.org/nightly/rustc/platform-support.html):"
 
-#: src/hello-world/what-is-rust.md:9
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "x86, ARM, WebAssembly, ..."
 msgstr "x86, ARM, WebAssembly, ... \\*Linux, Mac, Windows, ..."
 
-#: src/hello-world/what-is-rust.md:10
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "Linux, Mac, Windows, ..."
 msgstr "Rust est utilisé pour une large gamme d'appareils :"
 
-#: src/hello-world/what-is-rust.md:11
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "Rust is used for a wide range of devices:"
 msgstr "firmware et chargeurs de démarrage,"
 
-#: src/hello-world/what-is-rust.md:12
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "firmware and boot loaders,"
 msgstr "écrans intelligents,"
 
-#: src/hello-world/what-is-rust.md:13
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "smart displays,"
 msgstr "téléphones portables,"
 
-#: src/hello-world/what-is-rust.md:14
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "mobile phones,"
 msgstr "ordinateurs de bureau,"
 
-#: src/hello-world/what-is-rust.md:15
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid "desktops,"
 msgstr "serveurs."
 
-#: src/hello-world/what-is-rust.md:16
+#: src/hello-world/what-is-rust.md
 msgid "servers."
 msgstr ""
 
-#: src/hello-world/what-is-rust.md:21
+#: src/hello-world/what-is-rust.md
 msgid "Rust fits in the same area as C++:"
 msgstr "Rust s'inscrit dans le même domaine que C++ :"
 
-#: src/hello-world/what-is-rust.md:23
+#: src/hello-world/what-is-rust.md
 msgid "High flexibility."
 msgstr "Grande flexibilité."
 
-#: src/hello-world/what-is-rust.md:24
+#: src/hello-world/what-is-rust.md
 msgid "High level of control."
 msgstr "Haut niveau de contrôle."
 
-#: src/hello-world/what-is-rust.md:25
+#: src/hello-world/what-is-rust.md
 #, fuzzy
 msgid ""
 "Can be scaled down to very constrained devices such as microcontrollers."
 msgstr ""
 "Peut être réduit à des appareils très limités comme les téléphones mobiles."
 
-#: src/hello-world/what-is-rust.md:26
+#: src/hello-world/what-is-rust.md
 msgid "Has no runtime or garbage collection."
 msgstr "N'a pas de temps d'exécution ou de récupération d'ordures."
 
-#: src/hello-world/what-is-rust.md:27
+#: src/hello-world/what-is-rust.md
 msgid "Focuses on reliability and safety without sacrificing performance."
 msgstr ""
 "Se concentre sur la fiabilité et la sécurité sans sacrifier les performances."
 
-#: src/hello-world/hello-world.md:3
+#: src/hello-world/hello-world.md
 msgid ""
 "Let us jump into the simplest possible Rust program, a classic Hello World "
 "program:"
@@ -2520,37 +2673,37 @@ msgstr ""
 "Passons au programme Rust le plus simple possible, un Bonjour Monde "
 "classique programme:"
 
-#: src/hello-world/hello-world.md:8
+#: src/hello-world/hello-world.md
 msgid "\"Hello 🌍!\""
 msgstr ""
 
-#: src/hello-world/hello-world.md:12
+#: src/hello-world/hello-world.md
 msgid "What you see:"
 msgstr "Ce que tu vois:"
 
-#: src/hello-world/hello-world.md:14
+#: src/hello-world/hello-world.md
 msgid "Functions are introduced with `fn`."
 msgstr "Les fonctions sont introduites avec `fn`."
 
-#: src/hello-world/hello-world.md:15
+#: src/hello-world/hello-world.md
 msgid "Blocks are delimited by curly braces like in C and C++."
 msgstr "Les blocs sont délimités par des accolades comme en C et C++."
 
-#: src/hello-world/hello-world.md:16
+#: src/hello-world/hello-world.md
 msgid "The `main` function is the entry point of the program."
 msgstr "La fonction `main` est le point d'entrée du programme."
 
-#: src/hello-world/hello-world.md:17
+#: src/hello-world/hello-world.md
 msgid "Rust has hygienic macros, `println!` is an example of this."
 msgstr "Rust a des macros hygiéniques, `println!` en est un exemple."
 
-#: src/hello-world/hello-world.md:18
+#: src/hello-world/hello-world.md
 msgid "Rust strings are UTF-8 encoded and can contain any Unicode character."
 msgstr ""
 "Les strings Rust sont encodées en UTF-8 et peuvent contenir n'importe quel "
 "caractère Unicode."
 
-#: src/hello-world/hello-world.md:22
+#: src/hello-world/hello-world.md
 #, fuzzy
 msgid ""
 "This slide tries to make the students comfortable with Rust code. They will "
@@ -2561,7 +2714,7 @@ msgstr ""
 "Ils en verront une tonne durant les quatre prochains jours, alors nous "
 "commençons petit avec quelque chose de familier."
 
-#: src/hello-world/hello-world.md:27
+#: src/hello-world/hello-world.md
 #, fuzzy
 msgid ""
 "Rust is very much like other languages in the C/C++/Java tradition. It is "
@@ -2571,23 +2724,23 @@ msgstr ""
 "impératif (non fonctionnel) et il n'essaie pas de réinventer les choses à "
 "moins qu'absolument nécessaire."
 
-#: src/hello-world/hello-world.md:31
+#: src/hello-world/hello-world.md
 #, fuzzy
 msgid "Rust is modern with full support for things like Unicode."
 msgstr ""
 "Rust est moderne avec un support complet pour des choses comme Unicode."
 
-#: src/hello-world/hello-world.md:33
+#: src/hello-world/hello-world.md
 #, fuzzy
 msgid ""
 "Rust uses macros for situations where you want to have a variable number of "
-"arguments (no function [overloading](basic-syntax/functions-interlude.md))."
+"arguments (no function [overloading](../control-flow-basics/functions.md))."
 msgstr ""
 "Rust utilise des macros pour les situations où vous souhaitez avoir un "
 "nombre variable d'arguments (pas de fonction [surchargées](basic-syntax/"
 "functions-interlude.md))."
 
-#: src/hello-world/hello-world.md:36
+#: src/hello-world/hello-world.md
 #, fuzzy
 msgid ""
 "Macros being 'hygienic' means they don't accidentally capture identifiers "
@@ -2600,7 +2753,7 @@ msgstr ""
 "Rust ne sont en fait que [partiellement hygiénique](https://veykril.github."
 "io/tlborm/decl-macros/minutiae/hygiene.html)."
 
-#: src/hello-world/hello-world.md:40
+#: src/hello-world/hello-world.md
 msgid ""
 "Rust is multi-paradigm. For example, it has powerful [object-oriented "
 "programming features](https://doc.rust-lang.org/book/ch17-00-oop.html), and, "
@@ -2608,113 +2761,113 @@ msgid ""
 "concepts](https://doc.rust-lang.org/book/ch13-00-functional-features.html)."
 msgstr ""
 
-#: src/hello-world/benefits.md:3
+#: src/hello-world/benefits.md
 msgid "Some unique selling points of Rust:"
 msgstr "Quelques arguments de vente uniques à Rust :"
 
-#: src/hello-world/benefits.md:5
+#: src/hello-world/benefits.md
 msgid ""
 "_Compile time memory safety_ - whole classes of memory bugs are prevented at "
 "compile time"
 msgstr ""
 
-#: src/hello-world/benefits.md:6
+#: src/hello-world/benefits.md
 msgid "No uninitialized variables."
 msgstr "Aucune variable non initialisée."
 
-#: src/hello-world/benefits.md:7
+#: src/hello-world/benefits.md
 msgid "No double-frees."
 msgstr "Pas de double libération de mémoire."
 
-#: src/hello-world/benefits.md:8
+#: src/hello-world/benefits.md
 msgid "No use-after-free."
 msgstr "Aucune utilisation après la libération."
 
-#: src/hello-world/benefits.md:9
+#: src/hello-world/benefits.md
 msgid "No `NULL` pointers."
 msgstr "Pas de pointeurs `NULL`."
 
-#: src/hello-world/benefits.md:10
+#: src/hello-world/benefits.md
 msgid "No forgotten locked mutexes."
 msgstr "Pas de mutex verrouillés oubliés."
 
-#: src/hello-world/benefits.md:11
+#: src/hello-world/benefits.md
 msgid "No data races between threads."
 msgstr "Pas de courses de données entre les threads."
 
-#: src/hello-world/benefits.md:12
+#: src/hello-world/benefits.md
 msgid "No iterator invalidation."
 msgstr "Aucune invalidation d'itérateur."
 
-#: src/hello-world/benefits.md:14
+#: src/hello-world/benefits.md
 msgid ""
 "_No undefined runtime behavior_ - what a Rust statement does is never left "
 "unspecified"
 msgstr ""
 
-#: src/hello-world/benefits.md:16
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Array access is bounds checked."
 msgstr "L'accès au tableau est vérifié dans les limites."
 
-#: src/hello-world/benefits.md:17
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Integer overflow is defined (panic or wrap-around)."
 msgstr "Le débordement d'entier est défini."
 
-#: src/hello-world/benefits.md:19
+#: src/hello-world/benefits.md
 msgid ""
 "_Modern language features_ - as expressive and ergonomic as higher-level "
 "languages"
 msgstr ""
 
-#: src/hello-world/benefits.md:21
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Enums and pattern matching."
 msgstr "Énumérations et filtrage par motif."
 
-#: src/hello-world/benefits.md:22
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Generics."
 msgstr "Génériques."
 
-#: src/hello-world/benefits.md:23
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "No overhead FFI."
 msgstr "Pas de frais généraux FFI."
 
-#: src/hello-world/benefits.md:24
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Zero-cost abstractions."
 msgstr "Abstractions à coût zéro."
 
-#: src/hello-world/benefits.md:25
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Great compiler errors."
 msgstr "Grandes erreurs de compilation."
 
-#: src/hello-world/benefits.md:26
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Built-in dependency manager."
 msgstr "Gestionnaire de dépendances intégré."
 
-#: src/hello-world/benefits.md:27
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Built-in support for testing."
 msgstr "Support intégré pour les tests."
 
-#: src/hello-world/benefits.md:28
+#: src/hello-world/benefits.md
 #, fuzzy
 msgid "Excellent Language Server Protocol support."
 msgstr "Excellente prise en charge du protocole de serveur de langue."
 
-#: src/hello-world/benefits.md:32
+#: src/hello-world/benefits.md
 msgid ""
 "Do not spend much time here. All of these points will be covered in more "
 "depth later."
 msgstr ""
 
-#: src/hello-world/benefits.md:35
+#: src/hello-world/benefits.md
 msgid ""
 "Make sure to ask the class which languages they have experience with. "
 "Depending on the answer you can highlight different features of Rust:"
@@ -2723,7 +2876,7 @@ msgstr ""
 "l'expérience. Selon la réponse, vous pouvez mettre en évidence différentes "
 "fonctionnalités de Rust :"
 
-#: src/hello-world/benefits.md:38
+#: src/hello-world/benefits.md
 msgid ""
 "Experience with C or C++: Rust eliminates a whole class of _runtime errors_ "
 "via the borrow checker. You get performance like in C and C++, but you don't "
@@ -2736,7 +2889,7 @@ msgstr ""
 "Rust est un langage moderne avec des constructions telles que le filtrage "
 "par motif et la gestion intégrée des dépendances."
 
-#: src/hello-world/benefits.md:43
+#: src/hello-world/benefits.md
 msgid ""
 "Experience with Java, Go, Python, JavaScript...: You get the same memory "
 "safety as in those languages, plus a similar high-level language feeling. In "
@@ -2749,43 +2902,71 @@ msgstr ""
 "prévisibles comme C et C++ (pas de ramassage d'ordures) ainsi que l'accès au "
 "matériel de bas niveau (si l'on en a besoin)."
 
-#: src/hello-world/playground.md:3
+#: src/hello-world/playground.md
 msgid ""
 "The [Rust Playground](https://play.rust-lang.org/) provides an easy way to "
 "run short Rust programs, and is the basis for the examples and exercises in "
-"this course.  Try running the \"hello-world\" program it starts with. It "
+"this course. Try running the \"hello-world\" program it starts with. It "
 "comes with a few handy features:"
 msgstr ""
 
-#: src/hello-world/playground.md:8
+#: src/hello-world/playground.md
 msgid ""
 "Under \"Tools\", use the `rustfmt` option to format your code in the "
 "\"standard\" way."
 msgstr ""
 
-#: src/hello-world/playground.md:11
+#: src/hello-world/playground.md
 msgid ""
 "Rust has two main \"profiles\" for generating code: Debug (extra runtime "
 "checks, less optimization) and Release (fewer runtime checks, lots of "
 "optimization). These are accessible under \"Debug\" at the top."
 msgstr ""
 
-#: src/hello-world/playground.md:15
+#: src/hello-world/playground.md
 msgid ""
 "If you're interested, use \"ASM\" under \"...\" to see the generated "
 "assembly code."
 msgstr ""
 
-#: src/hello-world/playground.md:20
+#: src/hello-world/playground.md
 msgid ""
 "As students head into the break, encourage them to open up the playground "
 "and experiment a little. Encourage them to keep the tab open and try things "
 "out during the rest of the course. This is particularly helpful for advanced "
-"students who want to know more about Rust's optimzations or generated "
+"students who want to know more about Rust's optimizations or generated "
 "assembly."
 msgstr ""
 
-#: src/types-and-values/variables.md:3
+#: src/types-and-values.md
+msgid "[Variables](./types-and-values/variables.md) (5 minutes)"
+msgstr ""
+
+#: src/types-and-values.md
+msgid "[Values](./types-and-values/values.md) (10 minutes)"
+msgstr ""
+
+#: src/types-and-values.md
+msgid "[Arithmetic](./types-and-values/arithmetic.md) (5 minutes)"
+msgstr ""
+
+#: src/types-and-values.md
+msgid "[Strings](./types-and-values/strings.md) (10 minutes)"
+msgstr ""
+
+#: src/types-and-values.md
+msgid "[Type Inference](./types-and-values/inference.md) (5 minutes)"
+msgstr ""
+
+#: src/types-and-values.md
+msgid "[Exercise: Fibonacci](./types-and-values/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/types-and-values.md src/testing.md src/unsafe-rust.md
+msgid "This segment should take about 1 hour and 5 minutes"
+msgstr ""
+
+#: src/types-and-values/variables.md
 #, fuzzy
 msgid ""
 "Rust provides type safety via static typing. Variable bindings are made with "
@@ -2794,120 +2975,119 @@ msgstr ""
 "Rust fournit une sécurité de type via le typage statique. Les liaisons "
 "variables sont immuables par défaut:"
 
-#: src/types-and-values/variables.md:9 src/control-flow-basics/loops.md:29
-#: src/control-flow-basics/break-continue.md:33
-#: src/control-flow-basics/blocks-and-scopes.md:17
+#: src/types-and-values/variables.md src/control-flow-basics/loops.md
+#: src/control-flow-basics/break-continue.md
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "\"x: {x}\""
 msgstr ""
 
-#: src/types-and-values/variables.md:10
+#: src/types-and-values/variables.md
 msgid ""
 "// x = 20;\n"
 "    // println!(\"x: {x}\");\n"
 msgstr ""
 
-#: src/types-and-values/variables.md:17
+#: src/types-and-values/variables.md
 msgid ""
 "Uncomment the `x = 20` to demonstrate that variables are immutable by "
 "default. Add the `mut` keyword to allow changes."
 msgstr ""
 
-#: src/types-and-values/variables.md:20
+#: src/types-and-values/variables.md
 msgid ""
 "The `i32` here is the type of the variable. This must be known at compile "
 "time, but type inference (covered later) allows the programmer to omit it in "
 "many cases."
 msgstr ""
 
-#: src/types-and-values/values.md:3
+#: src/types-and-values/values.md
 msgid ""
 "Here are some basic built-in types, and the syntax for literal values of "
 "each type."
 msgstr ""
 
-#: src/types-and-values/values.md:5
-#: src/tuples-and-arrays/tuples-and-arrays.md:7 src/unsafe-rust/exercise.md:16
+#: src/types-and-values/values.md src/tuples-and-arrays/tuples-and-arrays.md
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid "Types"
 msgstr "Types"
 
-#: src/types-and-values/values.md:5
-#: src/tuples-and-arrays/tuples-and-arrays.md:7
+#: src/types-and-values/values.md src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Literals"
 msgstr "Littéraux"
 
-#: src/types-and-values/values.md:7
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "Signed integers"
 msgstr "Entiers signés"
 
-#: src/types-and-values/values.md:7
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`i8`, `i16`, `i32`, `i64`, `i128`, `isize`"
 msgstr "`i8`, `i16`, `i32`, `i64`, `i128`, `isize`"
 
-#: src/types-and-values/values.md:7
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`-10`, `0`, `1_000`, `123_i64`"
 msgstr "`-10`, `0`, `1_000`, `123i64`"
 
-#: src/types-and-values/values.md:8
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "Unsigned integers"
 msgstr "Entiers non signés"
 
-#: src/types-and-values/values.md:8
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`u8`, `u16`, `u32`, `u64`, `u128`, `usize`"
 msgstr "`u8`, `u16`, `u32`, `u64`, `u128`, `usize`"
 
-#: src/types-and-values/values.md:8
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`0`, `123`, `10_u16`"
 msgstr "`0`, `123`, `10u16`"
 
-#: src/types-and-values/values.md:9
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "Floating point numbers"
 msgstr "Nombres à virgule flottante"
 
-#: src/types-and-values/values.md:9
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`f32`, `f64`"
 msgstr "`f32`, `f64`"
 
-#: src/types-and-values/values.md:9
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`3.14`, `-10.0e20`, `2_f32`"
 msgstr "`3.14`, `-10.0e20`, `2f32`"
 
-#: src/types-and-values/values.md:10
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "Unicode scalar values"
 msgstr "Valeurs scalaires Unicode"
 
-#: src/types-and-values/values.md:10
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`char`"
 msgstr "`car`"
 
-#: src/types-and-values/values.md:10
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`'a'`, `'α'`, `'∞'`"
 msgstr "`'a'`, `'α'`, `'∞'`"
 
-#: src/types-and-values/values.md:11
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "Booleans"
 msgstr "Chaînes d'octets"
 
-#: src/types-and-values/values.md:11
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`bool`"
 msgstr "`&[u8]`"
 
-#: src/types-and-values/values.md:11
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`true`, `false`"
 msgstr ""
@@ -2919,162 +3099,162 @@ msgstr ""
 "\n"
 "'vrai', 'faux'"
 
-#: src/types-and-values/values.md:13
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "The types have widths as follows:"
 msgstr "Les types ont des largeurs comme suit :"
 
-#: src/types-and-values/values.md:15
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`iN`, `uN`, and `fN` are _N_ bits wide,"
 msgstr "`iN`, `uN` et `fN` ont une largeur de _N_ bits,"
 
-#: src/types-and-values/values.md:16
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`isize` and `usize` are the width of a pointer,"
 msgstr "`isize` et `usize` sont la largeur d'un pointeur,"
 
-#: src/types-and-values/values.md:17
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`char` is 32 bits wide,"
 msgstr "`char` a une largeur de 32 bits,"
 
-#: src/types-and-values/values.md:18
+#: src/types-and-values/values.md
 #, fuzzy
 msgid "`bool` is 8 bits wide."
 msgstr "`bool` a une largeur de 8 bits."
 
-#: src/types-and-values/values.md:22
+#: src/types-and-values/values.md
 msgid "There are a few syntaxes which are not shown above:"
 msgstr ""
 
-#: src/types-and-values/values.md:24
+#: src/types-and-values/values.md
 msgid ""
 "All underscores in numbers can be left out, they are for legibility only. So "
 "`1_000` can be written as `1000` (or `10_00`), and `123_i64` can be written "
 "as `123i64`."
 msgstr ""
 
-#: src/types-and-values/arithmetic.md:9
+#: src/types-and-values/arithmetic.md
 msgid "\"result: {}\""
 msgstr ""
 
-#: src/types-and-values/arithmetic.md:15
+#: src/types-and-values/arithmetic.md
 msgid ""
 "This is the first time we've seen a function other than `main`, but the "
 "meaning should be clear: it takes three integers, and returns an integer. "
 "Functions will be covered in more detail later."
 msgstr ""
 
-#: src/types-and-values/arithmetic.md:19
+#: src/types-and-values/arithmetic.md
 msgid "Arithmetic is very similar to other languages, with similar precedence."
 msgstr ""
 
-#: src/types-and-values/arithmetic.md:21
+#: src/types-and-values/arithmetic.md
 msgid ""
 "What about integer overflow? In C and C++ overflow of _signed_ integers is "
 "actually undefined, and might do different things on different platforms or "
 "compilers. In Rust, it's defined."
 msgstr ""
 
-#: src/types-and-values/arithmetic.md:25
+#: src/types-and-values/arithmetic.md
 msgid ""
 "Change the `i32`'s to `i16` to see an integer overflow, which panics "
-"(checked) in a debug build and wraps in a release build.  There are other "
-"options, such as overflowing, saturating, and carrying.  These are accessed "
+"(checked) in a debug build and wraps in a release build. There are other "
+"options, such as overflowing, saturating, and carrying. These are accessed "
 "with method syntax, e.g., `(a * b).saturating_add(b * c).saturating_add(c * "
 "a)`."
 msgstr ""
 
-#: src/types-and-values/arithmetic.md:30
+#: src/types-and-values/arithmetic.md
 msgid ""
 "In fact, the compiler will detect overflow of constant expressions, which is "
 "why the example requires a separate function."
 msgstr ""
 
-#: src/types-and-values/strings.md:3
+#: src/types-and-values/strings.md
 msgid ""
 "Rust has two types to represent strings, both of which will be covered in "
-"more depth later.  Both _always_ store UTF-8 encoded strings."
+"more depth later. Both _always_ store UTF-8 encoded strings."
 msgstr ""
 
-#: src/types-and-values/strings.md:6
+#: src/types-and-values/strings.md
 #, fuzzy
 msgid "`String` - a modifiable, owned string."
 msgstr "`String` un tampon de chaîne mutable."
 
-#: src/types-and-values/strings.md:7
+#: src/types-and-values/strings.md
 msgid "`&str` - a read-only string. String literals have this type."
 msgstr ""
 
-#: src/types-and-values/strings.md:11
+#: src/types-and-values/strings.md
 msgid "\"Greetings\""
 msgstr ""
 
-#: src/types-and-values/strings.md:12
+#: src/types-and-values/strings.md
 msgid "\"🪐\""
 msgstr ""
 
-#: src/types-and-values/strings.md:15
+#: src/types-and-values/strings.md
 msgid "\", \""
 msgstr ""
 
-#: src/types-and-values/strings.md:17
+#: src/types-and-values/strings.md
 msgid "\"final sentence: {}\""
 msgstr ""
 
-#: src/types-and-values/strings.md:18 src/async/control-flow/join.md:30
+#: src/types-and-values/strings.md src/async/control-flow/join.md
 msgid "\"{:?}\""
 msgstr ""
 
-#: src/types-and-values/strings.md:19
+#: src/types-and-values/strings.md
 msgid "//println!(\"{:?}\", &sentence[12..13]);\n"
 msgstr ""
 
-#: src/types-and-values/strings.md:25
+#: src/types-and-values/strings.md
 msgid ""
 "This slide introduces strings. Everything here will be covered in more depth "
 "later, but this is enough for subsequent slides and exercises to use strings."
 msgstr ""
 
-#: src/types-and-values/strings.md:28
+#: src/types-and-values/strings.md
 msgid "Invalid UTF-8 in a string is UB, and this not allowed in safe Rust."
 msgstr ""
 
-#: src/types-and-values/strings.md:30
+#: src/types-and-values/strings.md
 msgid ""
 "`String` is a user-defined type with a constructor (`::new()`) and methods "
 "like `s.push_str(..)`."
 msgstr ""
 
-#: src/types-and-values/strings.md:32
+#: src/types-and-values/strings.md
 msgid ""
 "The `&` in `&str` indicates that this is a reference. We will cover "
 "references later, so for now just think of `&str` as a unit meaning \"a read-"
 "only string\"."
 msgstr ""
 
-#: src/types-and-values/strings.md:35
+#: src/types-and-values/strings.md
 msgid ""
 "The commented-out line is indexing into the string by byte position. "
 "`12..13` does not end on a character boundary, so the program panics. Adjust "
 "it to a range that does, based on the error message."
 msgstr ""
 
-#: src/types-and-values/strings.md:39
+#: src/types-and-values/strings.md
 msgid ""
 "Raw strings allow you to create a `&str` value with escapes disabled: "
 "`r\"\\n\" == \"\\\\n\"`. You can embed double-quotes by using an equal "
 "amount of `#` on either side of the quotes:"
 msgstr ""
 
-#: src/types-and-values/inference.md:3
+#: src/types-and-values/inference.md
 #, fuzzy
 msgid "Rust will look at how the variable is _used_ to determine the type:"
 msgstr ""
 "Rust examinera comment la variable est _utilisée_ pour déterminer le type :"
 
-#: src/types-and-values/inference.md:27
+#: src/types-and-values/inference.md
 #, fuzzy
 msgid ""
 "This slide demonstrates how the Rust compiler infers types based on "
@@ -3084,7 +3264,7 @@ msgstr ""
 "fonction des contraintes données par les déclarations et les utilisations "
 "des variables."
 
-#: src/types-and-values/inference.md:29
+#: src/types-and-values/inference.md
 #, fuzzy
 msgid ""
 "It is very important to emphasize that variables declared like this are not "
@@ -3099,62 +3279,95 @@ msgstr ""
 "à la déclaration explicite d'un type. Le compilateur fait le travail pour "
 "nous et nous aide à écrire un code plus concis."
 
-#: src/types-and-values/inference.md:33
+#: src/types-and-values/inference.md
 msgid ""
 "When nothing constrains the type of an integer literal, Rust defaults to "
 "`i32`. This sometimes appears as `{integer}` in error messages. Similarly, "
 "floating-point literals default to `f64`."
 msgstr ""
 
-#: src/types-and-values/inference.md:42
+#: src/types-and-values/inference.md
 msgid "// ERROR: no implementation for `{float} == {integer}`\n"
 msgstr ""
 
-#: src/types-and-values/exercise.md:3
+#: src/types-and-values/exercise.md
 msgid ""
-"The first and second Fibonacci numbers are both `1`.  For n>2, he n'th "
+"The first and second Fibonacci numbers are both `1`. For n>2, the n'th "
 "Fibonacci number is calculated recursively as the sum of the n-1'th and "
 "n-2'th Fibonacci numbers."
 msgstr ""
 
-#: src/types-and-values/exercise.md:7
+#: src/types-and-values/exercise.md
 msgid ""
-"Write a function `fib(n)` that calculates the n'th Fibonacci number.  When "
+"Write a function `fib(n)` that calculates the n'th Fibonacci number. When "
 "will this function panic?"
 msgstr ""
 
-#: src/types-and-values/exercise.md:13
+#: src/types-and-values/exercise.md
 msgid "// The base case.\n"
 msgstr ""
 
-#: src/types-and-values/exercise.md:14 src/types-and-values/exercise.md:17
-#: src/control-flow-basics/exercise.md:26
-#: src/control-flow-basics/exercise.md:30
+#: src/types-and-values/exercise.md src/control-flow-basics/exercise.md
 #, fuzzy
 msgid "\"Implement this\""
 msgstr "Mise en œuvre"
 
-#: src/types-and-values/exercise.md:16
+#: src/types-and-values/exercise.md
 msgid "// The recursive case.\n"
 msgstr ""
 
-#: src/types-and-values/exercise.md:23 src/types-and-values/solution.md:14
+#: src/types-and-values/exercise.md src/types-and-values/solution.md
 msgid "\"fib(n) = {}\""
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:3
+#: src/control-flow-basics.md
+msgid "[Conditionals](./control-flow-basics/conditionals.md) (5 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md
+msgid "[Loops](./control-flow-basics/loops.md) (5 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md
+msgid ""
+"[break and continue](./control-flow-basics/break-continue.md) (5 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md
+msgid ""
+"[Blocks and Scopes](./control-flow-basics/blocks-and-scopes.md) (10 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md
+msgid "[Functions](./control-flow-basics/functions.md) (3 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md
+msgid "[Macros](./control-flow-basics/macros.md) (2 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md
+msgid ""
+"[Exercise: Collatz Sequence](./control-flow-basics/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/control-flow-basics.md src/tuples-and-arrays.md src/borrowing.md
+msgid "This segment should take about 1 hour"
+msgstr ""
+
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid "Much of the Rust syntax will be familiar to you from C, C++ or Java:"
 msgstr ""
 "Une grande partie de la syntaxe de Rust vous sera familière en C, C++ ou "
 "Java :"
 
-#: src/control-flow-basics/conditionals.md:5
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid "Blocks are delimited by curly braces."
 msgstr "Les blocs et les portées sont délimités par des accolades."
 
-#: src/control-flow-basics/conditionals.md:6
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid ""
 "Line comments are started with `//`, block comments are delimited by `/* ... "
@@ -3163,43 +3376,42 @@ msgstr ""
 "Les commentaires de ligne commencent par `//`, les commentaires de bloc sont "
 "délimités par `/* ... */`."
 
-#: src/control-flow-basics/conditionals.md:8
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid "Keywords like `if` and `while` work the same."
 msgstr "Des mots-clés comme `if` et `while` fonctionnent de la même manière."
 
-#: src/control-flow-basics/conditionals.md:9
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid "Variable assignment is done with `=`, comparison is done with `==`."
 msgstr ""
 "L'affectation des variables se fait avec `=`, la comparaison se fait avec "
 "`==`."
 
-#: src/control-flow-basics/conditionals.md:11
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid "`if` expressions"
 msgstr "expressions \"si\""
 
-#: src/control-flow-basics/conditionals.md:13
+#: src/control-flow-basics/conditionals.md
 msgid ""
 "You use [`if` expressions](https://doc.rust-lang.org/reference/expressions/"
 "if-expr.html#if-expressions) exactly like `if` statements in other languages:"
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:21
-#: src/control-flow-basics/conditionals.md:38
+#: src/control-flow-basics/conditionals.md
 msgid "\"small\""
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:23
+#: src/control-flow-basics/conditionals.md
 msgid "\"biggish\""
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:25
+#: src/control-flow-basics/conditionals.md
 msgid "\"huge\""
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:30
+#: src/control-flow-basics/conditionals.md
 #, fuzzy
 msgid ""
 "In addition, you can use `if` as an expression. The last expression of each "
@@ -3208,38 +3420,38 @@ msgstr ""
 "De plus, vous pouvez l'utiliser comme expression. Cela fait la même chose "
 "que ci-dessus:"
 
-#: src/control-flow-basics/conditionals.md:40
+#: src/control-flow-basics/conditionals.md
 msgid "\"large\""
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:42
+#: src/control-flow-basics/conditionals.md
 msgid "\"number size: {}\""
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:48
+#: src/control-flow-basics/conditionals.md
 msgid ""
 "Because `if` is an expression and must have a particular type, both of its "
 "branch blocks must have the same type. Show what happens if you add `;` "
 "after `\"small\"` in the second example."
 msgstr ""
 
-#: src/control-flow-basics/conditionals.md:50
+#: src/control-flow-basics/conditionals.md
 msgid ""
 "When `if` is used in an expression, the expression must have a `;` to "
 "separate it from the next statement. Remove the `;` before `println!` to see "
 "the compiler error."
 msgstr ""
 
-#: src/control-flow-basics/loops.md:3
+#: src/control-flow-basics/loops.md
 msgid "There are three looping keywords in Rust: `while`, `loop`, and `for`:"
 msgstr ""
 
-#: src/control-flow-basics/loops.md:5
+#: src/control-flow-basics/loops.md
 #, fuzzy
 msgid "`while`"
 msgstr "Expressions `while`"
 
-#: src/control-flow-basics/loops.md:7
+#: src/control-flow-basics/loops.md
 #, fuzzy
 msgid ""
 "The [`while` keyword](https://doc.rust-lang.org/reference/expressions/loop-"
@@ -3249,16 +3461,16 @@ msgstr ""
 "Comme avec `if`, il existe une variante `while let` qui teste à plusieurs "
 "reprises une valeur contre un modèle :"
 
-#: src/control-flow-basics/loops.md:17
+#: src/control-flow-basics/loops.md
 msgid "\"Final x: {x}\""
 msgstr ""
 
-#: src/control-flow-basics/loops.md:21
+#: src/control-flow-basics/loops.md
 #, fuzzy
 msgid "`for`"
 msgstr "Boucles `for`"
 
-#: src/control-flow-basics/loops.md:23
+#: src/control-flow-basics/loops.md
 #, fuzzy
 msgid ""
 "The [`for` loop](https://doc.rust-lang.org/std/keyword.for.html) iterates "
@@ -3267,11 +3479,11 @@ msgstr ""
 "[`Drop`](https://doc.rust-lang.org/std/ops/trait.Drop.html) utilisé pour "
 "définir les destructeurs."
 
-#: src/control-flow-basics/loops.md:34
+#: src/control-flow-basics/loops.md
 msgid "`loop`"
 msgstr ""
 
-#: src/control-flow-basics/loops.md:36
+#: src/control-flow-basics/loops.md
 #, fuzzy
 msgid ""
 "The [`loop` statement](https://doc.rust-lang.org/std/keyword.loop.html) just "
@@ -3280,22 +3492,22 @@ msgstr ""
 "[`Drop`](https://doc.rust-lang.org/std/ops/trait.Drop.html) utilisé pour "
 "définir les destructeurs."
 
-#: src/control-flow-basics/loops.md:44
+#: src/control-flow-basics/loops.md
 msgid "\"{i}\""
 msgstr ""
 
-#: src/control-flow-basics/loops.md:54
+#: src/control-flow-basics/loops.md
 msgid ""
 "We will discuss iteration later; for now, just stick to range expressions."
 msgstr ""
 
-#: src/control-flow-basics/loops.md:55
+#: src/control-flow-basics/loops.md
 msgid ""
 "Note that the `for` loop only iterates to `4`. Show the `1..=5` syntax for "
 "an inclusive range."
 msgstr ""
 
-#: src/control-flow-basics/break-continue.md:3
+#: src/control-flow-basics/break-continue.md
 msgid ""
 "If you want to exit any kind of loop early, use [`break`](https://doc.rust-"
 "lang.org/reference/expressions/loop-expr.html#break-expressions). For "
@@ -3303,17 +3515,17 @@ msgid ""
 "`loop` expression."
 msgstr ""
 
-#: src/control-flow-basics/break-continue.md:7
+#: src/control-flow-basics/break-continue.md
 msgid ""
 "If you want to immediately start the next iteration use [`continue`](https://"
 "doc.rust-lang.org/reference/expressions/loop-expr.html#continue-expressions)."
 msgstr ""
 
-#: src/control-flow-basics/break-continue.md:23
+#: src/control-flow-basics/break-continue.md
 msgid "\"{result}\""
 msgstr ""
 
-#: src/control-flow-basics/break-continue.md:27
+#: src/control-flow-basics/break-continue.md
 #, fuzzy
 msgid ""
 "Both `continue` and `break` can optionally take a label argument which is "
@@ -3324,11 +3536,11 @@ msgstr ""
 "`continue` et `break` peuvent éventuellement prenez un argument d'étiquette "
 "qui est utilisé pour sortir des boucles imbriquées :"
 
-#: src/control-flow-basics/break-continue.md:36
+#: src/control-flow-basics/break-continue.md
 msgid "\"x: {x}, i: {i}\""
 msgstr ""
 
-#: src/control-flow-basics/break-continue.md:46
+#: src/control-flow-basics/break-continue.md
 #, fuzzy
 msgid ""
 "In this case we break the outer loop after 3 iterations of the inner loop."
@@ -3336,45 +3548,46 @@ msgstr ""
 "Dans ce cas, nous cassons la boucle externe après 3 itérations de la boucle "
 "interne."
 
-#: src/control-flow-basics/break-continue.md:50
+#: src/control-flow-basics/break-continue.md
 msgid ""
 "Note that `loop` is the only looping construct which returns a non-trivial "
 "value. This is because it's guaranteed to be entered at least once (unlike "
 "`while` and `for` loops)."
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:3
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "Blocks"
 msgstr "Blocs"
 
-#: src/control-flow-basics/blocks-and-scopes.md:5
+#: src/control-flow-basics/blocks-and-scopes.md
 #, fuzzy
 msgid ""
-"A block in Rust contains a sequence of expressions. Each block has a value "
-"and a type, which are those of the last expression of the block:"
+"A block in Rust contains a sequence of expressions, enclosed by braces `{}`. "
+"Each block has a value and a type, which are those of the last expression of "
+"the block:"
 msgstr ""
 "Un bloc en Rust a une valeur et un type : la valeur est la dernière "
 "expression du bloc:"
 
-#: src/control-flow-basics/blocks-and-scopes.md:14
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "\"y: {y}\""
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:21
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid ""
 "If the last expression ends with `;`, then the resulting value and type is "
 "`()`."
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:23
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "Scopes and Shadowing"
 msgstr "Portée et masquage"
 
-#: src/control-flow-basics/blocks-and-scopes.md:25
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "A variable's scope is limited to the enclosing block."
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:27
+#: src/control-flow-basics/blocks-and-scopes.md
 #, fuzzy
 msgid ""
 "You can shadow variables, both those from outer scopes and variables from "
@@ -3383,29 +3596,28 @@ msgstr ""
 "Vous pouvez masquer des variables, à la fois celles des portées externes et "
 "celles des même périmètre :"
 
-#: src/control-flow-basics/blocks-and-scopes.md:33
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "\"before: {a}\""
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:35
-#: src/std-traits/from-and-into.md:7 src/std-traits/from-and-into.md:19
-#: src/slices-and-lifetimes/solution.md:216
+#: src/control-flow-basics/blocks-and-scopes.md src/std-traits/from-and-into.md
+#: src/slices-and-lifetimes/solution.md
 msgid "\"hello\""
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:36
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "\"inner scope: {a}\""
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:39
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "\"shadowed in inner scope: {a}\""
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:42
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid "\"after: {a}\""
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:48
+#: src/control-flow-basics/blocks-and-scopes.md
 #, fuzzy
 msgid ""
 "You can show how the value of the block changes by changing the last line in "
@@ -3415,13 +3627,13 @@ msgstr ""
 "dernière ligne du bloc. Par exemple, ajouter/supprimer un point-virgule ou "
 "utiliser un \"retour\"."
 
-#: src/control-flow-basics/blocks-and-scopes.md:49
+#: src/control-flow-basics/blocks-and-scopes.md
 msgid ""
 "Show that a variable's scope is limited by adding a `b` in the inner block "
 "in the last example, and then trying to access it outside that block."
 msgstr ""
 
-#: src/control-flow-basics/blocks-and-scopes.md:50
+#: src/control-flow-basics/blocks-and-scopes.md
 #, fuzzy
 msgid ""
 "Shadowing is different from mutation, because after shadowing both "
@@ -3433,12 +3645,12 @@ msgstr ""
 "même temps. Les deux sont disponibles sous le même nom, selon l'endroit où "
 "vous l'utilisez dans le code."
 
-#: src/control-flow-basics/blocks-and-scopes.md:51
+#: src/control-flow-basics/blocks-and-scopes.md
 #, fuzzy
 msgid "A shadowing variable can have a different type."
 msgstr "Une variable d'occultation peut avoir un type différent."
 
-#: src/control-flow-basics/blocks-and-scopes.md:52
+#: src/control-flow-basics/blocks-and-scopes.md
 #, fuzzy
 msgid ""
 "Shadowing looks obscure at first, but is convenient for holding on to values "
@@ -3447,13 +3659,13 @@ msgstr ""
 "L'ombrage semble obscur au début, mais est pratique pour conserver les "
 "valeurs après `.unwrap()`."
 
-#: src/control-flow-basics/functions.md:20
+#: src/control-flow-basics/functions.md
 msgid ""
 "Declaration parameters are followed by a type (the reverse of some "
 "programming languages), then a return type."
 msgstr ""
 
-#: src/control-flow-basics/functions.md:21
+#: src/control-flow-basics/functions.md
 msgid ""
 "The last expression in a function body (or any block) becomes the return "
 "value. Simply omit the `;` at the end of the expression. The `return` "
@@ -3461,39 +3673,39 @@ msgid ""
 "idiomatic at the end of a function (refactor `gcd` to use a `return`)."
 msgstr ""
 
-#: src/control-flow-basics/functions.md:23
+#: src/control-flow-basics/functions.md
 msgid ""
 "Some functions have no return value, and return the 'unit type', `()`. The "
 "compiler will infer this if the `-> ()` return type is omitted."
 msgstr ""
 
-#: src/control-flow-basics/functions.md:24
+#: src/control-flow-basics/functions.md
 #, fuzzy
 msgid ""
 "Overloading is not supported -- each function has a single implementation."
 msgstr "Chaque fonction a une seule implémentation :"
 
-#: src/control-flow-basics/functions.md:25
+#: src/control-flow-basics/functions.md
 msgid ""
 "Always takes a fixed number of parameters. Default arguments are not "
 "supported. Macros can be used to support variadic functions."
 msgstr ""
 
-#: src/control-flow-basics/functions.md:26
+#: src/control-flow-basics/functions.md
 #, fuzzy
 msgid ""
 "Always takes a single set of parameter types. These types can be generic, "
 "which will be covered later."
 msgstr "Prend toujours un seul ensemble de types de paramètres."
 
-#: src/control-flow-basics/macros.md:3
+#: src/control-flow-basics/macros.md
 msgid ""
 "Macros are expanded into Rust code during compilation, and can take a "
 "variable number of arguments. They are distinguished by a `!` at the end. "
 "The Rust standard library includes an assortment of useful macros."
 msgstr ""
 
-#: src/control-flow-basics/macros.md:7
+#: src/control-flow-basics/macros.md
 #, fuzzy
 msgid ""
 "`println!(format, ..)` prints a line to standard output, applying formatting "
@@ -3502,279 +3714,313 @@ msgstr ""
 "La surcharge d'opérateur est implémentée via des traits dans [`std::ops`]"
 "(https://doc.rust-lang.org/std/ops/index.html) :"
 
-#: src/control-flow-basics/macros.md:8
+#: src/control-flow-basics/macros.md
 msgid ""
 "`format!(format, ..)` works just like `println!` but returns the result as a "
 "string."
 msgstr ""
 
-#: src/control-flow-basics/macros.md:9
+#: src/control-flow-basics/macros.md
 msgid "`dbg!(expression)` logs the value of the expression and returns it."
 msgstr ""
 
-#: src/control-flow-basics/macros.md:10
+#: src/control-flow-basics/macros.md
 msgid ""
 "`todo!()` marks a bit of code as not-yet-implemented. If executed, it will "
 "panic."
 msgstr ""
 
-#: src/control-flow-basics/macros.md:11
+#: src/control-flow-basics/macros.md
 msgid ""
 "`unreachable!()` marks a bit of code as unreachable. If executed, it will "
 "panic."
 msgstr ""
 
-#: src/control-flow-basics/macros.md:28
+#: src/control-flow-basics/macros.md
 msgid "\"{n}! = {}\""
 msgstr ""
 
-#: src/control-flow-basics/macros.md:34
+#: src/control-flow-basics/macros.md
 msgid ""
 "The takeaway from this section is that these common conveniences exist, and "
 "how to use them. Why they are defined as macros, and what they expand to, is "
 "not especially critical."
 msgstr ""
 
-#: src/control-flow-basics/macros.md:38
+#: src/control-flow-basics/macros.md
 msgid ""
 "The course does not cover defining macros, but a later section will describe "
 "use of derive macros."
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:3
+#: src/control-flow-basics/exercise.md
 msgid ""
 "The [Collatz Sequence](https://en.wikipedia.org/wiki/Collatz_conjecture) is "
 "defined as follows, for an arbitrary n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:4 src/control-flow-basics/exercise.md:10
+#: src/control-flow-basics/exercise.md
 #, fuzzy
 msgid "1"
 msgstr "12"
 
-#: src/control-flow-basics/exercise.md:4
+#: src/control-flow-basics/exercise.md
 msgid " greater than zero:"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:6 src/control-flow-basics/exercise.md:7
-#: src/control-flow-basics/exercise.md:8
+#: src/control-flow-basics/exercise.md
 msgid "If _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:6 src/control-flow-basics/exercise.md:7
-#: src/control-flow-basics/exercise.md:8
+#: src/control-flow-basics/exercise.md
 msgid "i"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:6
+#: src/control-flow-basics/exercise.md
 msgid "_ is 1, then the sequence terminates at _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:6
+#: src/control-flow-basics/exercise.md
 msgid "_."
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:7
+#: src/control-flow-basics/exercise.md
 msgid "_ is even, then _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:7 src/control-flow-basics/exercise.md:8
+#: src/control-flow-basics/exercise.md
 msgid "i+1"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:7
+#: src/control-flow-basics/exercise.md
 msgid " = n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:7
+#: src/control-flow-basics/exercise.md
 msgid " / 2_."
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:8
+#: src/control-flow-basics/exercise.md
 msgid "_ is odd, then _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:8
+#: src/control-flow-basics/exercise.md
 msgid " = 3 * n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:8
+#: src/control-flow-basics/exercise.md
 msgid " + 1_."
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:10
+#: src/control-flow-basics/exercise.md
 msgid "For example, beginning with _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:10
+#: src/control-flow-basics/exercise.md
 msgid "_ = 3:"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:11
-msgid "3 is odd, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "3 is odd, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:11
+#: src/control-flow-basics/exercise.md
 #, fuzzy
 msgid "2"
 msgstr "12"
 
-#: src/control-flow-basics/exercise.md:11
+#: src/control-flow-basics/exercise.md
 msgid "_ = 3 * 3 + 1 = 10;"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:12
-msgid "10 is even, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "10 is even, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:12 src/bare-metal/aps/better-uart.md:22
+#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "3"
 msgstr "3"
 
-#: src/control-flow-basics/exercise.md:12
+#: src/control-flow-basics/exercise.md
 msgid "_ = 10 / 2 = 5;"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:13
-msgid "5 is odd, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "5 is odd, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:13 src/bare-metal/aps/better-uart.md:10
+#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "4"
 msgstr "4"
 
-#: src/control-flow-basics/exercise.md:13
-msgid "_ = 3 * 15 + 1 = 16;"
+#: src/control-flow-basics/exercise.md
+msgid "_ = 3 * 5 + 1 = 16;"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:14
-msgid "16 is even, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "16 is even, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:14
+#: src/control-flow-basics/exercise.md
 msgid "5"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:14
-msgid "_ = 16 / 2  = 8;"
+#: src/control-flow-basics/exercise.md
+msgid "_ = 16 / 2 = 8;"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:15
-msgid "8 is even, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "8 is even, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:15 src/bare-metal/aps/better-uart.md:14
-#: src/bare-metal/aps/better-uart.md:17
+#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "6"
 msgstr "6"
 
-#: src/control-flow-basics/exercise.md:15
-msgid "_ = 8 / 2  = 4;"
+#: src/control-flow-basics/exercise.md
+msgid "_ = 8 / 2 = 4;"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:16
-msgid "4 is even, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "4 is even, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:16
+#: src/control-flow-basics/exercise.md
 msgid "7"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:16
-msgid "_ = 4 / 2  = 2;"
+#: src/control-flow-basics/exercise.md
+msgid "_ = 4 / 2 = 2;"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:17
-msgid "2 is even, so  _n"
+#: src/control-flow-basics/exercise.md
+msgid "2 is even, so _n"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:17 src/bare-metal/aps/better-uart.md:12
-#: src/bare-metal/aps/better-uart.md:15
+#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "8"
 msgstr "8"
 
-#: src/control-flow-basics/exercise.md:17
+#: src/control-flow-basics/exercise.md
 msgid "_ = 1; and"
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:18
+#: src/control-flow-basics/exercise.md
 msgid "the sequence terminates."
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:20
+#: src/control-flow-basics/exercise.md
 msgid ""
 "Write a function to calculate the length of the collatz sequence for a given "
 "initial `n`."
 msgstr ""
 
-#: src/control-flow-basics/exercise.md:24 src/control-flow-basics/solution.md:4
+#: src/control-flow-basics/exercise.md src/control-flow-basics/solution.md
 msgid "/// Determine the length of the collatz sequence beginning at `n`.\n"
 msgstr ""
 
-#: src/control-flow-basics/solution.md:20 src/concurrency/scoped-threads.md:11
-#: src/concurrency/scoped-threads.md:30
+#: src/control-flow-basics/solution.md src/concurrency/scoped-threads.md
 msgid "\"Length: {}\""
 msgstr ""
 
-#: src/welcome-day-1-afternoon.md:1 src/welcome-day-2-afternoon.md:1
-#: src/welcome-day-3-afternoon.md:1 src/welcome-day-4-afternoon.md:1
+#: src/welcome-day-1-afternoon.md src/welcome-day-2-afternoon.md
+#: src/welcome-day-3-afternoon.md src/welcome-day-4-afternoon.md
 #, fuzzy
 msgid "Welcome Back"
 msgstr "Bienvenue"
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:3
+#: src/welcome-day-1-afternoon.md
+msgid "[Tuples and Arrays](./tuples-and-arrays.md) (1 hour)"
+msgstr ""
+
+#: src/welcome-day-1-afternoon.md
+msgid "[References](./references.md) (50 minutes)"
+msgstr ""
+
+#: src/welcome-day-1-afternoon.md
+msgid "[User-Defined Types](./user-defined-types.md) (50 minutes)"
+msgstr ""
+
+#: src/welcome-day-1-afternoon.md
+msgid ""
+"Including 10 minute breaks, this session should take about 2 hours and 55 "
+"minutes"
+msgstr ""
+
+#: src/tuples-and-arrays.md
+msgid ""
+"[Tuples and Arrays](./tuples-and-arrays/tuples-and-arrays.md) (10 minutes)"
+msgstr ""
+
+#: src/tuples-and-arrays.md
+msgid "[Array Iteration](./tuples-and-arrays/iteration.md) (3 minutes)"
+msgstr ""
+
+#: src/tuples-and-arrays.md
+msgid "[Pattern Matching](./tuples-and-arrays/match.md) (10 minutes)"
+msgstr ""
+
+#: src/tuples-and-arrays.md
+msgid "[Destructuring](./tuples-and-arrays/destructuring.md) (5 minutes)"
+msgstr ""
+
+#: src/tuples-and-arrays.md
+msgid "[Exercise: Nested Arrays](./tuples-and-arrays/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid ""
 "Tuples and arrays are the first \"compound\" types we have seen. All "
 "elements of an array have the same type, while tuples can accommodate "
 "different types. Both types have a size fixed at compile time."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:9
-#: src/tuples-and-arrays/destructuring.md:27
+#: src/tuples-and-arrays/tuples-and-arrays.md
+#: src/tuples-and-arrays/destructuring.md
 msgid "Arrays"
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:9
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid "`[T; N]`"
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:9
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid "`[20, 30, 40]`, `[0; 3]`"
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:10
-#: src/tuples-and-arrays/destructuring.md:9
+#: src/tuples-and-arrays/tuples-and-arrays.md
+#: src/tuples-and-arrays/destructuring.md
 msgid "Tuples"
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:10
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid "`()`, `(T,)`, `(T1, T2)`, ..."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:10
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid "`()`, `('x',)`, `('x', 1.2)`, ..."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:12
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Array assignment and access:"
 msgstr "Affectation et accès aux baies :"
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:23
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Tuple assignment and access:"
 msgstr "Affectation et accès aux tuples :"
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:38
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Arrays:"
 msgstr "Tableaux :"
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:40
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid ""
 "A value of the array type `[T; N]` holds `N` (a compile-time constant) "
 "elements of the same type `T`. Note that the length of the array is _part of "
@@ -3783,18 +4029,18 @@ msgid ""
 "covered later."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:45
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid ""
 "Try accessing an out-of-bounds array element. Array accesses are checked at "
 "runtime. Rust can usually optimize these checks away, and they can be "
 "avoided using unsafe Rust."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:49
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid "We can use literals to assign values to arrays."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:51
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid ""
 "The `println!` macro asks for the debug implementation with the `?` format "
 "parameter: `{}` gives the default output, `{:?}` gives the debug output. "
@@ -3803,29 +4049,29 @@ msgid ""
 "here."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:56
+#: src/tuples-and-arrays/tuples-and-arrays.md
 msgid ""
 "Adding `#`, eg `{a:#?}`, invokes a \"pretty printing\" format, which can be "
 "easier to read."
 msgstr ""
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:58
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Tuples:"
 msgstr "Tuples :"
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:60
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Like arrays, tuples have a fixed length."
 msgstr "Comme les tableaux, les tuples ont une longueur fixe."
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:62
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid "Tuples group together values of different types into a compound type."
 msgstr ""
 "Les tuples regroupent des valeurs de différents types dans un type composé."
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:64
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid ""
 "Fields of a tuple can be accessed by the period and the index of the value, "
@@ -3834,7 +4080,7 @@ msgstr ""
 "Les champs d'un tuple sont accessibles par le point et l'index de la valeur, "
 "par ex. `t.0`, `t.1`."
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:66
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid ""
 "The empty tuple `()` is also known as the \"unit type\". It is both a type, "
@@ -3848,7 +4094,7 @@ msgstr ""
 "exemple, qu'une fonction ou expression n'a pas de valeur de retour, comme "
 "nous le verrons dans une prochaine diapositive."
 
-#: src/tuples-and-arrays/tuples-and-arrays.md:70
+#: src/tuples-and-arrays/tuples-and-arrays.md
 #, fuzzy
 msgid ""
 "You can think of it as `void` that can be familiar to you from other "
@@ -3857,24 +4103,24 @@ msgstr ""
 "Vous pouvez le considérer comme un \"vide\" qui peut vous être familier "
 "d'autres langages de programmation."
 
-#: src/tuples-and-arrays/iteration.md:3
+#: src/tuples-and-arrays/iteration.md
 msgid "The `for` statement supports iterating over arrays (but not tuples)."
 msgstr ""
 
-#: src/tuples-and-arrays/iteration.md:18
+#: src/tuples-and-arrays/iteration.md
 msgid ""
 "This functionality uses the `IntoIterator` trait, but we haven't covered "
 "that yet."
 msgstr ""
 
-#: src/tuples-and-arrays/iteration.md:20
+#: src/tuples-and-arrays/iteration.md
 msgid ""
 "The `assert_ne!` macro is new here. There are also `assert_eq!` and `assert!"
 "` macros. These are always checked while, debug-only variants like "
 "`debug_assert!` compile to nothing in release builds."
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:3
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid ""
 "The `match` keyword lets you match a value against one or more _patterns_. "
@@ -3884,108 +4130,103 @@ msgstr ""
 "plusieurs _patterns_. Le les comparaisons se font de haut en bas et le "
 "premier match l'emporte."
 
-#: src/tuples-and-arrays/match.md:6
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid "The patterns can be simple values, similarly to `switch` in C and C++:"
 msgstr ""
 "Les modèles peuvent être des valeurs simples, de la même manière que "
 "`switch` en C et C++ :"
 
-#: src/tuples-and-arrays/match.md:10
+#: src/tuples-and-arrays/match.md
 msgid "'x'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:12
+#: src/tuples-and-arrays/match.md
 msgid "'q'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:12
+#: src/tuples-and-arrays/match.md
 msgid "\"Quitting\""
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:13 src/std-traits/solution.md:16
-#: src/error-handling/exercise.md:64 src/error-handling/exercise.md:66
-#: src/error-handling/solution.md:63 src/error-handling/solution.md:65
+#: src/tuples-and-arrays/match.md src/std-traits/solution.md
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "'a'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:13
+#: src/tuples-and-arrays/match.md
 msgid "'s'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:13
+#: src/tuples-and-arrays/match.md
 msgid "'w'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:13
+#: src/tuples-and-arrays/match.md
 msgid "'d'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:13
+#: src/tuples-and-arrays/match.md
 msgid "\"Moving around\""
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:14 src/error-handling/exercise.md:56
-#: src/error-handling/exercise.md:58 src/error-handling/exercise.md:66
-#: src/error-handling/solution.md:55 src/error-handling/solution.md:57
-#: src/error-handling/solution.md:65
+#: src/tuples-and-arrays/match.md src/error-handling/exercise.md
+#: src/error-handling/solution.md
 msgid "'0'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:14 src/error-handling/exercise.md:56
-#: src/error-handling/exercise.md:58 src/error-handling/exercise.md:66
-#: src/error-handling/solution.md:55 src/error-handling/solution.md:57
-#: src/error-handling/solution.md:65
+#: src/tuples-and-arrays/match.md src/error-handling/exercise.md
+#: src/error-handling/solution.md
 msgid "'9'"
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:14
+#: src/tuples-and-arrays/match.md
 msgid "\"Number input\""
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:15
+#: src/tuples-and-arrays/match.md
 msgid "\"Lowercase: {key}\""
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:16
+#: src/tuples-and-arrays/match.md
 msgid "\"Something else\""
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:21
+#: src/tuples-and-arrays/match.md
 msgid ""
 "The `_` pattern is a wildcard pattern which matches any value. The "
 "expressions _must_ be irrefutable, meaning that it covers every possibility, "
 "so `_` is often used as the final catch-all case."
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:25
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid ""
-"Match can be used as an expression. Just like like `if`, each match arm must "
-"have the same type. The type is the last expression of the block, if any. In "
-"the example above, the type is `()`."
+"Match can be used as an expression. Just like `if`, each match arm must have "
+"the same type. The type is the last expression of the block, if any. In the "
+"example above, the type is `()`."
 msgstr ""
 "Comme `if let`, chaque bras de correspondance doit avoir le même type. Le "
 "type est le dernier expression du bloc, le cas échéant. Dans l'exemple ci-"
 "dessus, le type est `()`."
 
-#: src/tuples-and-arrays/match.md:28
+#: src/tuples-and-arrays/match.md
 msgid ""
 "A variable in the pattern (`key` in this example) will create a binding that "
 "can be used within the match arm."
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:31
+#: src/tuples-and-arrays/match.md
 msgid "A match guard causes the arm to match only if the condition is true."
 msgstr ""
 
-#: src/tuples-and-arrays/match.md:35 src/user-defined-types/named-structs.md:40
-#: src/user-defined-types/enums.md:28 src/methods-and-traits/methods.md:64
+#: src/tuples-and-arrays/match.md src/user-defined-types/named-structs.md
+#: src/user-defined-types/enums.md src/methods-and-traits/methods.md
 #, fuzzy
 msgid "Key Points:"
 msgstr "Points clés:"
 
-#: src/tuples-and-arrays/match.md:36
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid ""
 "You might point out how some specific characters are being used when in a "
@@ -3994,27 +4235,27 @@ msgstr ""
 "Vous pouvez indiquer comment certains caractères spécifiques sont utilisés "
 "dans un modèle"
 
-#: src/tuples-and-arrays/match.md:37
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid "`|` as an `or`"
 msgstr "`|` comme un `ou`"
 
-#: src/tuples-and-arrays/match.md:38
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid "`..` can expand as much as it needs to be"
 msgstr "`..` peut s'étendre autant que nécessaire"
 
-#: src/tuples-and-arrays/match.md:39
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid "`1..=5` represents an inclusive range"
 msgstr "`1..=5` représente une plage inclusive"
 
-#: src/tuples-and-arrays/match.md:40
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid "`_` is a wild card"
 msgstr "`_` est un joker"
 
-#: src/tuples-and-arrays/match.md:42
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid ""
 "Match guards as a separate syntax feature are important and necessary when "
@@ -4025,7 +4266,7 @@ msgstr ""
 "sont importants et nécessaires lorsque nous souhaitons exprimer de manière "
 "concise des idées plus complexes que ne le permettraient les modèles seuls."
 
-#: src/tuples-and-arrays/match.md:43
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid ""
 "They are not the same as separate `if` expression inside of the match arm. "
@@ -4039,7 +4280,7 @@ msgstr ""
 "condition \"si\" à l'intérieur de ce bloc n'entraînera pas d'autres bras de "
 "l'expression \"match\" d'origine considérée."
 
-#: src/tuples-and-arrays/match.md:45
+#: src/tuples-and-arrays/match.md
 #, fuzzy
 msgid ""
 "The condition defined in the guard applies to every expression in a pattern "
@@ -4048,84 +4289,84 @@ msgstr ""
 "La condition définie dans la garde s'applique à chaque expression dans un "
 "modèle avec un `|`."
 
-#: src/tuples-and-arrays/destructuring.md:3
+#: src/tuples-and-arrays/destructuring.md
 msgid ""
 "Destructuring is a way of extracting data from a data structure by writing a "
 "pattern that is matched up to the data structure, binding variables to "
 "subcomponents of the data structure."
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:7
+#: src/tuples-and-arrays/destructuring.md
 #, fuzzy
 msgid "You can destructure tuples and arrays by matching on their elements:"
 msgstr ""
 "Vous pouvez déstructurer des tableaux, des tuples et des tranches en faisant "
 "correspondre leurs éléments :"
 
-#: src/tuples-and-arrays/destructuring.md:18
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"on Y axis\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:19
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"on X axis\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:20
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"left of Y axis\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:21
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"below X axis\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:22
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"first quadrant\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:33
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"Tell me about {triple:?}\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:35
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"First is 0, y = {y}, and z = {z}\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:36
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"First is 1 and the rest were ignored\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:37
+#: src/tuples-and-arrays/destructuring.md
 msgid "\"All elements were ignored\""
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:44
+#: src/tuples-and-arrays/destructuring.md
 msgid "Create a new array pattern using `_` to represent an element."
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:45
+#: src/tuples-and-arrays/destructuring.md
 msgid "Add more values to the array."
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:46
+#: src/tuples-and-arrays/destructuring.md
 msgid ""
 "Point out that how `..` will expand to account for different number of "
 "elements."
 msgstr ""
 
-#: src/tuples-and-arrays/destructuring.md:47
+#: src/tuples-and-arrays/destructuring.md
 msgid "Show matching against the tail with patterns `[.., b]` and `[a@..,b]`"
 msgstr ""
 
-#: src/tuples-and-arrays/exercise.md:3
+#: src/tuples-and-arrays/exercise.md
 msgid "Arrays can contain other arrays:"
 msgstr ""
 
-#: src/tuples-and-arrays/exercise.md:9
+#: src/tuples-and-arrays/exercise.md
 #, fuzzy
 msgid "What is the type of this variable?"
 msgstr "Quel est le type de \"mot\" dans chaque boucle ?"
 
-#: src/tuples-and-arrays/exercise.md:11
+#: src/tuples-and-arrays/exercise.md
 #, fuzzy
 msgid ""
 "Use an array such as the above to write a function `transpose` which will "
@@ -4135,14 +4376,14 @@ msgstr ""
 "joliment une matrice et une fonction `transpose` qui va transposer une "
 "matrice (transformer les lignes en colonnes):"
 
-#: src/tuples-and-arrays/exercise.md:21
+#: src/tuples-and-arrays/exercise.md
 #, fuzzy
 msgid "Hard-code both functions to operate on 3 × 3 matrices."
 msgstr ""
 "Codez en dur les deux fonctions pour qu'elles fonctionnent sur des matrices "
 "3 × 3."
 
-#: src/tuples-and-arrays/exercise.md:23
+#: src/tuples-and-arrays/exercise.md
 #, fuzzy
 msgid ""
 "Copy the code below to <https://play.rust-lang.org/> and implement the "
@@ -4151,47 +4392,63 @@ msgstr ""
 "Copiez le code ci-dessous sur <https://play.rust-lang.org/> et implémentez "
 "le les fonctions:"
 
-#: src/tuples-and-arrays/exercise.md:27 src/methods-and-traits/exercise.md:20
-#: src/borrowing/exercise.md:14 src/unsafe-rust/exercise.md:49
+#: src/tuples-and-arrays/exercise.md src/borrowing/exercise.md
+#: src/unsafe-rust/exercise.md
 msgid "// TODO: remove this when you're done with your implementation.\n"
 msgstr ""
 
-#: src/tuples-and-arrays/exercise.md:36 src/tuples-and-arrays/solution.md:34
+#: src/tuples-and-arrays/exercise.md src/tuples-and-arrays/solution.md
 msgid "// <-- the comment makes rustfmt add a newline\n"
 msgstr ""
 
-#: src/tuples-and-arrays/exercise.md:41 src/tuples-and-arrays/solution.md:39
+#: src/tuples-and-arrays/exercise.md src/tuples-and-arrays/solution.md
 msgid "\"matrix: {:#?}\""
 msgstr ""
 
-#: src/tuples-and-arrays/exercise.md:43 src/tuples-and-arrays/solution.md:41
+#: src/tuples-and-arrays/exercise.md src/tuples-and-arrays/solution.md
 msgid "\"transposed: {:#?}\""
 msgstr ""
 
-#: src/tuples-and-arrays/solution.md:17 src/tuples-and-arrays/solution.md:25
+#: src/tuples-and-arrays/solution.md
 msgid "//\n"
 msgstr ""
 
-#: src/references/shared.md:3
+#: src/references.md
+msgid "[Shared References](./references/shared.md) (10 minutes)"
+msgstr ""
+
+#: src/references.md
+msgid "[Exclusive References](./references/exclusive.md) (10 minutes)"
+msgstr ""
+
+#: src/references.md
+msgid "[Exercise: Geometry](./references/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/references.md src/user-defined-types.md src/pattern-matching.md
+msgid "This segment should take about 50 minutes"
+msgstr ""
+
+#: src/references/shared.md
 msgid ""
 "A reference provides a way to access another value without taking "
 "responsibility for the value, and is also called \"borrowing\". Shared "
 "references are read-only, and the referenced data cannot change."
 msgstr ""
 
-#: src/references/shared.md:19
+#: src/references/shared.md
 msgid ""
 "A shared reference to a type `T` has type `&T`. A reference value is made "
 "with the `&` operator. The `*` operator \"dereferences\" a reference, "
 "yielding its value."
 msgstr ""
 
-#: src/references/shared.md:22
+#: src/references/shared.md
 #, fuzzy
 msgid "Rust will statically forbid dangling references:"
 msgstr "Rust interdira statiquement les références pendantes :"
 
-#: src/references/shared.md:34
+#: src/references/shared.md
 msgid ""
 "A reference is said to \"borrow\" the value it refers to, and this is a good "
 "model for students not familiar with pointers: code can use the reference to "
@@ -4199,7 +4456,7 @@ msgid ""
 "course will get into more detail on ownership in day 3."
 msgstr ""
 
-#: src/references/shared.md:39
+#: src/references/shared.md
 msgid ""
 "References are implemented as pointers, and a key advantage is that they can "
 "be much smaller than the thing they point to. Students familiar with C or C+"
@@ -4208,13 +4465,13 @@ msgid ""
 "pointers."
 msgstr ""
 
-#: src/references/shared.md:44
+#: src/references/shared.md
 msgid ""
 "Rust does not automatically create references for you - the `&` is always "
 "required."
 msgstr ""
 
-#: src/references/shared.md:47
+#: src/references/shared.md
 #, fuzzy
 msgid ""
 "Rust will auto-dereference in some cases, in particular when invoking "
@@ -4224,7 +4481,7 @@ msgstr ""
 "Rust déréférencera automatiquement dans certains cas, en particulier lors de "
 "l'appel méthodes (essayez `ref_x.count_ones()`)."
 
-#: src/references/shared.md:51
+#: src/references/shared.md
 msgid ""
 "In this example, `r` is mutable so that it can be reassigned (`r = &b`). "
 "Note that this re-binds `r`, so that it refers to something else. This is "
@@ -4232,13 +4489,13 @@ msgid ""
 "value."
 msgstr ""
 
-#: src/references/shared.md:56
+#: src/references/shared.md
 msgid ""
 "A shared reference does not allow modifying the value it refers to, even if "
 "that value was mutable. Try `*r = 'X'`."
 msgstr ""
 
-#: src/references/shared.md:59
+#: src/references/shared.md
 msgid ""
 "Rust is tracking the lifetimes of all references to ensure they live long "
 "enough. Dangling references cannot occur in safe Rust. `x_axis` would return "
@@ -4246,19 +4503,19 @@ msgid ""
 "returns, so this will not compile."
 msgstr ""
 
-#: src/references/shared.md:64
+#: src/references/shared.md
 #, fuzzy
 msgid "We will talk more about borrowing when we get to ownership."
 msgstr ""
 "Nous parlerons davantage de l'emprunt lorsque nous arriverons à la propriété."
 
-#: src/references/exclusive.md:3
+#: src/references/exclusive.md
 msgid ""
 "Exclusive references, also known as mutable references, allow changing the "
 "value they refer to. They have type `&mut T`."
 msgstr ""
 
-#: src/references/exclusive.md:20
+#: src/references/exclusive.md
 msgid ""
 "\"Exclusive\" means that only this reference can be used to access the "
 "value. No other references (shared or exclusive) can exist at the same time, "
@@ -4267,7 +4524,7 @@ msgid ""
 "alive."
 msgstr ""
 
-#: src/references/exclusive.md:25
+#: src/references/exclusive.md
 #, fuzzy
 msgid ""
 "Be sure to note the difference between `let mut x_coord: &i32` and `let "
@@ -4280,14 +4537,14 @@ msgstr ""
 "liée à différentes valeurs, tandis que la seconde représente une référence à "
 "une valeur modifiable."
 
-#: src/references/exercise.md:3
+#: src/references/exercise.md
 msgid ""
 "We will create a few utility functions for 3-dimensional geometry, "
 "representing a point as `[f64;3]`. It is up to you to determine the function "
 "signatures."
 msgstr ""
 
-#: src/references/exercise.md:7
+#: src/references/exercise.md
 msgid ""
 "// Calculate the magnitude of a vector by summing the squares of its "
 "coordinates\n"
@@ -4296,92 +4553,118 @@ msgid ""
 "// root, like `v.sqrt()`.\n"
 msgstr ""
 
-#: src/references/exercise.md:15
+#: src/references/exercise.md
 msgid ""
 "// Normalize a vector by calculating its magnitude and dividing all of its\n"
 "// coordinates by that magnitude.\n"
 msgstr ""
 
-#: src/references/exercise.md:23
+#: src/references/exercise.md
 msgid "// Use the following `main` to test your work.\n"
 msgstr ""
 
-#: src/references/exercise.md:28 src/references/solution.md:23
+#: src/references/exercise.md src/references/solution.md
 msgid "\"Magnitude of a unit vector: {}\""
 msgstr ""
 
-#: src/references/exercise.md:33 src/references/solution.md:28
+#: src/references/exercise.md src/references/solution.md
 msgid "\"Magnitude of {v:?}: {}\""
 msgstr ""
 
-#: src/references/exercise.md:35 src/references/solution.md:30
+#: src/references/exercise.md src/references/solution.md
 msgid "\"Magnitude of {v:?} after normalization: {}\""
 msgstr ""
 
-#: src/references/solution.md:4
+#: src/references/solution.md
 msgid "/// Calculate the magnitude of the given vector.\n"
 msgstr ""
 
-#: src/references/solution.md:12
+#: src/references/solution.md
 msgid ""
 "/// Change the magnitude of the vector to 1.0 without changing its "
 "direction.\n"
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:3
+#: src/user-defined-types.md
+msgid "[Named Structs](./user-defined-types/named-structs.md) (10 minutes)"
+msgstr ""
+
+#: src/user-defined-types.md
+msgid "[Tuple Structs](./user-defined-types/tuple-structs.md) (10 minutes)"
+msgstr ""
+
+#: src/user-defined-types.md
+msgid "[Enums](./user-defined-types/enums.md) (5 minutes)"
+msgstr ""
+
+#: src/user-defined-types.md
+msgid ""
+"[Static and Const](./user-defined-types/static-and-const.md) (5 minutes)"
+msgstr ""
+
+#: src/user-defined-types.md
+msgid "[Type Aliases](./user-defined-types/aliases.md) (2 minutes)"
+msgstr ""
+
+#: src/user-defined-types.md
+msgid ""
+"[Exercise: Elevator Events](./user-defined-types/exercise.md) (15 minutes)"
+msgstr ""
+
+#: src/user-defined-types/named-structs.md
 #, fuzzy
 msgid "Like C and C++, Rust has support for custom structs:"
 msgstr "Comme C et C++, Rust prend en charge les structures personnalisées :"
 
-#: src/user-defined-types/named-structs.md:12
+#: src/user-defined-types/named-structs.md
 msgid "\"{} is {} years old\""
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:17
-#: src/android/interoperability/with-c/bindgen.md:87
+#: src/user-defined-types/named-structs.md
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"Peter\""
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:25
+#: src/user-defined-types/named-structs.md
 msgid "\"Avery\""
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:31
+#: src/user-defined-types/named-structs.md
 msgid "\"Jackie\""
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:42
+#: src/user-defined-types/named-structs.md
 msgid "Structs work like in C or C++."
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:43
+#: src/user-defined-types/named-structs.md
 msgid "Like in C++, and unlike in C, no typedef is needed to define a type."
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:44
+#: src/user-defined-types/named-structs.md
 msgid "Unlike in C++, there is no inheritance between structs."
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:45
+#: src/user-defined-types/named-structs.md
 msgid ""
 "This may be a good time to let people know there are different types of "
 "structs."
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:46
+#: src/user-defined-types/named-structs.md
 msgid ""
 "Zero-sized structs (e.g. `struct Foo;`) might be used when implementing a "
 "trait on some type but don’t have any data that you want to store in the "
 "value itself."
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:47
+#: src/user-defined-types/named-structs.md
 msgid ""
 "The next slide will introduce Tuple structs, used when the field names are "
 "not important."
 msgstr ""
 
-#: src/user-defined-types/named-structs.md:48
+#: src/user-defined-types/named-structs.md
 #, fuzzy
 msgid ""
 "If you already have variables with the right names, then you can create the "
@@ -4390,42 +4673,42 @@ msgstr ""
 "Si vous avez déjà des variables avec les bons noms, vous pouvez créer le "
 "struct en utilisant un raccourci :"
 
-#: src/user-defined-types/named-structs.md:50
+#: src/user-defined-types/named-structs.md
 msgid ""
 "The syntax `..avery` allows us to copy the majority of the fields from the "
 "old struct without having to explicitly type it all out. It must always be "
 "the last element."
 msgstr ""
 
-#: src/user-defined-types/tuple-structs.md:6
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid "If the field names are unimportant, you can use a tuple struct:"
 msgstr ""
 "Si les noms de champ ne sont pas importants, vous pouvez utiliser une "
 "structure tuple :"
 
-#: src/user-defined-types/tuple-structs.md:13
+#: src/user-defined-types/tuple-structs.md
 msgid "\"({}, {})\""
 msgstr ""
 
-#: src/user-defined-types/tuple-structs.md:17
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid "This is often used for single-field wrappers (called newtypes):"
 msgstr ""
 "Ceci est souvent utilisé pour les wrappers à champ unique (appelés newtypes):"
 
-#: src/user-defined-types/tuple-structs.md:24
+#: src/user-defined-types/tuple-structs.md
 msgid "\"Ask a rocket scientist at NASA\""
 msgstr ""
 
-#: src/user-defined-types/tuple-structs.md:28
-#: src/android/interoperability/cpp/cpp-bridge.md:50
-#: src/bare-metal/microcontrollers/type-state.md:14
-#: src/async/pitfalls/cancellation.md:96 src/async/pitfalls/cancellation.md:99
+#: src/user-defined-types/tuple-structs.md
+#: src/android/interoperability/cpp/cpp-bridge.md
+#: src/bare-metal/microcontrollers/type-state.md
+#: src/async/pitfalls/cancellation.md
 msgid "// ...\n"
 msgstr ""
 
-#: src/user-defined-types/tuple-structs.md:40
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid ""
 "Newtypes are a great way to encode additional information about the value in "
@@ -4434,14 +4717,14 @@ msgstr ""
 "Les nouveaux types sont un excellent moyen d'encoder des informations "
 "supplémentaires sur la valeur dans un type primitif, par exemple :"
 
-#: src/user-defined-types/tuple-structs.md:41
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid "The number is measured in some units: `Newtons` in the example above."
 msgstr ""
 "Le nombre est mesuré dans certaines unités : `Newtons` dans l'exemple ci-"
 "dessus."
 
-#: src/user-defined-types/tuple-structs.md:42
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid ""
 "The value passed some validation when it was created, so you no longer have "
@@ -4450,7 +4733,7 @@ msgstr ""
 "La valeur a été validée lors de sa création, vous n'avez donc plus besoin de "
 "la valider à chaque utilisation : 'PhoneNumber(String)`ou`OddNumber(u32)\\`."
 
-#: src/user-defined-types/tuple-structs.md:43
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid ""
 "Demonstrate how to add a `f64` value to a `Newtons` type by accessing the "
@@ -4459,7 +4742,7 @@ msgstr ""
 "Montrez comment ajouter une valeur `f64` à un type `Newtons` en accédant au "
 "champ unique dans le nouveau type."
 
-#: src/user-defined-types/tuple-structs.md:44
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid ""
 "Rust generally doesn’t like inexplicit things, like automatic unwrapping or "
@@ -4468,18 +4751,18 @@ msgstr ""
 "Rust n'aime généralement pas les choses inexplicites, comme le déballage "
 "automatique ou, par exemple, l'utilisation de booléens comme entiers."
 
-#: src/user-defined-types/tuple-structs.md:45
+#: src/user-defined-types/tuple-structs.md
 #, fuzzy
 msgid "Operator overloading is discussed on Day 3 (generics)."
 msgstr "La surcharge des opérateurs est discutée le jour 3 (génériques)."
 
-#: src/user-defined-types/tuple-structs.md:46
+#: src/user-defined-types/tuple-structs.md
 msgid ""
 "The example is a subtle reference to the [Mars Climate Orbiter](https://en."
 "wikipedia.org/wiki/Mars_Climate_Orbiter) failure."
 msgstr ""
 
-#: src/user-defined-types/enums.md:3
+#: src/user-defined-types/enums.md
 #, fuzzy
 msgid ""
 "The `enum` keyword allows the creation of a type which has a few different "
@@ -4488,48 +4771,48 @@ msgstr ""
 "Le mot clé `enum` permet la création d'un type qui a quelques différentes "
 "variantes :"
 
-#: src/user-defined-types/enums.md:15
+#: src/user-defined-types/enums.md
 msgid "// Simple variant\n"
 msgstr ""
 
-#: src/user-defined-types/enums.md:16
+#: src/user-defined-types/enums.md
 msgid "// Tuple variant\n"
 msgstr ""
 
-#: src/user-defined-types/enums.md:17
+#: src/user-defined-types/enums.md
 msgid "// Struct variant\n"
 msgstr ""
 
-#: src/user-defined-types/enums.md:22
+#: src/user-defined-types/enums.md
 msgid "\"On this turn: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/enums.md:30
+#: src/user-defined-types/enums.md
 #, fuzzy
 msgid "Enumerations allow you to collect a set of values under one type."
 msgstr ""
 "Les énumérations vous permettent de collecter un ensemble de valeurs sous un "
 "type"
 
-#: src/user-defined-types/enums.md:31
+#: src/user-defined-types/enums.md
 msgid ""
 "`Direction` is a type with variants. There are two values of `Direction`: "
 "`Direction::Left` and `Direction::Right`."
 msgstr ""
 
-#: src/user-defined-types/enums.md:32
+#: src/user-defined-types/enums.md
 msgid ""
 "`PlayerMove` is a type with three variants. In addition to the payloads, "
 "Rust will store a discriminant so that it knows at runtime which variant is "
 "in a `PlayerMove` value."
 msgstr ""
 
-#: src/user-defined-types/enums.md:33
+#: src/user-defined-types/enums.md
 #, fuzzy
 msgid "This might be a good time to compare structs and enums:"
 msgstr "C'est peut-être le bon moment pour comparer Structs et Enums :"
 
-#: src/user-defined-types/enums.md:34
+#: src/user-defined-types/enums.md
 #, fuzzy
 msgid ""
 "In both, you can have a simple version without fields (unit struct) or one "
@@ -4539,7 +4822,7 @@ msgstr ""
 "(structure d'unité) ou une version avec différents types de champs (charges "
 "utiles variantes)."
 
-#: src/user-defined-types/enums.md:35
+#: src/user-defined-types/enums.md
 #, fuzzy
 msgid ""
 "You could even implement the different variants of an enum with separate "
@@ -4550,15 +4833,15 @@ msgstr ""
 "avec des structures distinctes, mais elles ne seraient alors pas du même "
 "type que si elles étaient toutes définies dans une énumération."
 
-#: src/user-defined-types/enums.md:36
+#: src/user-defined-types/enums.md
 msgid "Rust uses minimal space to store the discriminant."
 msgstr ""
 
-#: src/user-defined-types/enums.md:37
+#: src/user-defined-types/enums.md
 msgid "If necessary, it stores an integer of the smallest required size"
 msgstr ""
 
-#: src/user-defined-types/enums.md:38
+#: src/user-defined-types/enums.md
 msgid ""
 "If the allowed variant values do not cover all bit patterns, it will use "
 "invalid bit patterns to encode the discriminant (the \"niche "
@@ -4566,63 +4849,62 @@ msgid ""
 "integer or `NULL` for the `None` variant."
 msgstr ""
 
-#: src/user-defined-types/enums.md:42
+#: src/user-defined-types/enums.md
 msgid ""
 "You can control the discriminant if needed (e.g., for compatibility with C):"
 msgstr ""
 
-#: src/user-defined-types/enums.md:60
+#: src/user-defined-types/enums.md
 msgid ""
 "Without `repr`, the discriminant type takes 2 bytes, because 10001 fits 2 "
 "bytes."
 msgstr ""
 
-#: src/user-defined-types/enums.md:63
-#: src/user-defined-types/static-and-const.md:67
-#: src/memory-management/review.md:47 src/memory-management/move.md:91
-#: src/smart-pointers/box.md:72 src/borrowing/shared.md:31
+#: src/user-defined-types/enums.md src/user-defined-types/static-and-const.md
+#: src/memory-management/review.md src/memory-management/move.md
+#: src/smart-pointers/box.md src/borrowing/shared.md
 msgid "More to Explore"
 msgstr ""
 
-#: src/user-defined-types/enums.md:65
+#: src/user-defined-types/enums.md
 msgid ""
 "Rust has several optimizations it can employ to make enums take up less "
 "space."
 msgstr ""
 
-#: src/user-defined-types/enums.md:67
+#: src/user-defined-types/enums.md
 msgid ""
 "Null pointer optimization: For [some types](https://doc.rust-lang.org/std/"
 "option/#representation), Rust guarantees that `size_of::<T>()` equals "
 "`size_of::<Option<T>>()`."
 msgstr ""
 
-#: src/user-defined-types/enums.md:71
+#: src/user-defined-types/enums.md
 msgid ""
 "Example code if you want to show how the bitwise representation _may_ look "
 "like in practice. It's important to note that the compiler provides no "
 "guarantees regarding this representation, therefore this is totally unsafe."
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:3
+#: src/user-defined-types/static-and-const.md
 msgid ""
 "Static and constant variables are two different ways to create globally-"
 "scoped values that cannot be moved or reallocated during the execution of "
 "the program."
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:6
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "`const`"
 msgstr "`const`"
 
-#: src/user-defined-types/static-and-const.md:8
+#: src/user-defined-types/static-and-const.md
 msgid ""
 "Constant variables are evaluated at compile time and their values are "
 "inlined wherever they are used:"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:30
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid ""
 "According to the [Rust RFC Book](https://rust-lang.github.io/rfcs/0246-const-"
@@ -4631,39 +4913,39 @@ msgstr ""
 "Selon le \\[Rust RFC Book\\] [1](https://rust-lang.github.io/rfcs/0246-const-"
 "vs-static.html), ceux-ci sont intégrés lors de l'utilisation."
 
-#: src/user-defined-types/static-and-const.md:32
+#: src/user-defined-types/static-and-const.md
 msgid ""
 "Only functions marked `const` can be called at compile time to generate "
 "`const` values. `const` functions can however be called at runtime."
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:34
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "`static`"
 msgstr "`statique`"
 
-#: src/user-defined-types/static-and-const.md:36
+#: src/user-defined-types/static-and-const.md
 msgid ""
 "Static variables will live during the whole execution of the program, and "
 "therefore will not move:"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:39
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "\"Welcome to RustOS 3.14\""
 msgstr "Bienvenue au jour 1"
 
-#: src/user-defined-types/static-and-const.md:42
+#: src/user-defined-types/static-and-const.md
 msgid "\"{BANNER}\""
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:46
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid ""
 "As noted in the [Rust RFC Book](https://rust-lang.github.io/rfcs/0246-const-"
 "vs-static.html), these are not inlined upon use and have an actual "
-"associated memory location.  This is useful for unsafe and embedded code, "
-"and the variable lives through the entirety of the program execution. When a "
+"associated memory location. This is useful for unsafe and embedded code, and "
+"the variable lives through the entirety of the program execution. When a "
 "globally-scoped value does not have a reason to need object identity, "
 "`const` is generally preferred."
 msgstr ""
@@ -4673,14 +4955,14 @@ msgstr ""
 "pour le code non sécurisé et intégré, et la variable vit tout au long de "
 "l'exécution du programme."
 
-#: src/user-defined-types/static-and-const.md:52
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "Mention that `const` behaves semantically similar to C++'s `constexpr`."
 msgstr ""
 "Mentionnez que `const` se comporte sémantiquement de la même manière que "
 "`constexpr` de C++."
 
-#: src/user-defined-types/static-and-const.md:53
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid ""
 "`static`, on the other hand, is much more similar to a `const` or mutable "
@@ -4689,13 +4971,13 @@ msgstr ""
 "`static`, d'autre part, ressemble beaucoup plus à une variable globale "
 "`const` ou mutable en C++."
 
-#: src/user-defined-types/static-and-const.md:54
+#: src/user-defined-types/static-and-const.md
 msgid ""
 "`static` provides object identity: an address in memory and state as "
 "required by types with interior mutability such as `Mutex<T>`."
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:55
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid ""
 "It isn't super common that one would need a runtime evaluated constant, but "
@@ -4704,102 +4986,94 @@ msgstr ""
 "Il n'est pas très courant d'avoir besoin d'une constante évaluée à "
 "l'exécution, mais c'est utile et plus sûr que d'utiliser un statique."
 
-#: src/user-defined-types/static-and-const.md:57
+#: src/user-defined-types/static-and-const.md
 msgid "Properties table:"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:59
-#: src/chromium/adding-third-party-crates.md:6
+#: src/user-defined-types/static-and-const.md
+#: src/chromium/adding-third-party-crates.md
 msgid "Property"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:59
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "Static"
 msgstr "`statique`"
 
-#: src/user-defined-types/static-and-const.md:59
+#: src/user-defined-types/static-and-const.md
 msgid "Constant"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:61
+#: src/user-defined-types/static-and-const.md
 msgid "Has an address in memory"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:61
-#: src/user-defined-types/static-and-const.md:62
-#: src/user-defined-types/static-and-const.md:64
-#: src/user-defined-types/static-and-const.md:65
-#: src/chromium/adding-third-party-crates/resolving-problems.md:12
-#: src/chromium/adding-third-party-crates/resolving-problems.md:13
-#: src/chromium/adding-third-party-crates/resolving-problems.md:14
+#: src/user-defined-types/static-and-const.md
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Yes"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:61
+#: src/user-defined-types/static-and-const.md
 msgid "No (inlined)"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:62
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "Lives for the entire duration of the program"
 msgstr "La fonction `main` est le point d'entrée du programme."
 
-#: src/user-defined-types/static-and-const.md:62
-#: src/user-defined-types/static-and-const.md:63
-#: src/user-defined-types/static-and-const.md:65
-#: src/chromium/adding-third-party-crates/resolving-problems.md:15
-#: src/chromium/adding-third-party-crates/resolving-problems.md:16
+#: src/user-defined-types/static-and-const.md
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "No"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:63
+#: src/user-defined-types/static-and-const.md
 msgid "Can be mutable"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:63
+#: src/user-defined-types/static-and-const.md
 msgid "Yes (unsafe)"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:64
+#: src/user-defined-types/static-and-const.md
 #, fuzzy
 msgid "Evaluated at compile time"
 msgstr "Les valeurs ont des tailles fixes connues au moment de la compilation."
 
-#: src/user-defined-types/static-and-const.md:64
+#: src/user-defined-types/static-and-const.md
 msgid "Yes (initialised at compile time)"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:65
+#: src/user-defined-types/static-and-const.md
 msgid "Inlined wherever it is used"
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:69
+#: src/user-defined-types/static-and-const.md
 msgid ""
 "Because `static` variables are accessible from any thread, they must be "
 "`Sync`. Interior mutability is possible through a [`Mutex`](https://doc.rust-"
 "lang.org/std/sync/struct.Mutex.html), atomic or similar."
 msgstr ""
 
-#: src/user-defined-types/static-and-const.md:73
+#: src/user-defined-types/static-and-const.md
 msgid "Thread-local data can be created with the macro `std::thread_local`."
 msgstr ""
 
-#: src/user-defined-types/aliases.md:3
+#: src/user-defined-types/aliases.md
 msgid ""
 "A type alias creates a name for another type. The two types can be used "
 "interchangeably."
 msgstr ""
 
-#: src/user-defined-types/aliases.md:12
+#: src/user-defined-types/aliases.md
 msgid "// Aliases are more useful with long, complex types:\n"
 msgstr ""
 
-#: src/user-defined-types/aliases.md:20
+#: src/user-defined-types/aliases.md
 msgid "C programmers will recognize this as similar to a `typedef`."
 msgstr ""
 
-#: src/user-defined-types/exercise.md:3
+#: src/user-defined-types/exercise.md
 msgid ""
 "We will create a data structure to represent an event in an elevator control "
 "system. It is up to you to define the types and functions to construct "
@@ -4807,105 +5081,110 @@ msgid ""
 "with `{:?}`."
 msgstr ""
 
-#: src/user-defined-types/exercise.md:8 src/user-defined-types/solution.md:39
+#: src/user-defined-types/exercise.md
+msgid ""
+"This exercise only requires creating and populating data structures so that "
+"`main` runs without errors. The next part of the course will cover getting "
+"data out of these structures."
+msgstr ""
+
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
+msgid ""
+"/// An event in the elevator system that the controller must react to.\n"
+msgstr ""
+
+#: src/user-defined-types/exercise.md
+msgid "// TODO: add required variants\n"
+msgstr ""
+
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
+msgid "/// A direction of travel.\n"
+msgstr ""
+
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "/// The car has arrived on the given floor.\n"
 msgstr ""
 
-#: src/user-defined-types/exercise.md:12 src/user-defined-types/solution.md:44
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "/// The car doors have opened.\n"
 msgstr ""
 
-#: src/user-defined-types/exercise.md:17 src/user-defined-types/solution.md:49
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "/// The car doors have closed.\n"
 msgstr ""
 
-#: src/user-defined-types/exercise.md:22 src/user-defined-types/solution.md:54
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid ""
 "/// A directional button was pressed in an elevator lobby on the given "
 "floor.\n"
 msgstr ""
 
-#: src/user-defined-types/exercise.md:27 src/user-defined-types/solution.md:59
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "/// A floor button was pressed in the elevator car.\n"
 msgstr ""
 
-#: src/user-defined-types/exercise.md:35 src/user-defined-types/solution.md:67
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "\"A ground floor passenger has pressed the up button: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/exercise.md:39 src/user-defined-types/solution.md:71
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "\"The car has arrived on the ground floor: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/exercise.md:42 src/user-defined-types/solution.md:74
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "\"The car door opened: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/exercise.md:44 src/user-defined-types/solution.md:76
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "\"A passenger has pressed the 3rd floor button: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/exercise.md:47 src/user-defined-types/solution.md:79
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "\"The car door closed: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/exercise.md:48 src/user-defined-types/solution.md:80
+#: src/user-defined-types/exercise.md src/user-defined-types/solution.md
 msgid "\"The car has arrived on the 3rd floor: {:?}\""
 msgstr ""
 
-#: src/user-defined-types/exercise.md:52
-msgid ""
-"This exercise only requires creating data structures. The next part of the "
-"course will cover getting data out of these structures."
-msgstr ""
-
-#: src/user-defined-types/solution.md:4
-msgid ""
-"/// An event in the elevator system that the controller must react to.\n"
-msgstr ""
-
-#: src/user-defined-types/solution.md:7
+#: src/user-defined-types/solution.md
 msgid "/// A button was pressed.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:10
+#: src/user-defined-types/solution.md
 msgid "/// The car has arrived at the given floor.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:13
+#: src/user-defined-types/solution.md
 msgid "/// The car's doors have opened.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:16
+#: src/user-defined-types/solution.md
 msgid "/// The car's doors have closed.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:19
+#: src/user-defined-types/solution.md
 msgid "/// A floor is represented as an integer.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:22
-msgid "/// A direction of travel.\n"
-msgstr ""
-
-#: src/user-defined-types/solution.md:29
+#: src/user-defined-types/solution.md
 msgid "/// A user-accessible button.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:33
+#: src/user-defined-types/solution.md
 msgid "/// A button in the elevator lobby on the given floor.\n"
 msgstr ""
 
-#: src/user-defined-types/solution.md:36
+#: src/user-defined-types/solution.md
 msgid "/// A floor button within the car.\n"
 msgstr ""
 
-#: src/welcome-day-2.md:1
+#: src/welcome-day-2.md
 #, fuzzy
 msgid "Welcome to Day 2"
 msgstr "Bienvenue au jour 2"
 
-#: src/welcome-day-2.md:3
+#: src/welcome-day-2.md
 #, fuzzy
 msgid ""
 "Now that we have seen a fair amount of Rust, today will focus on Rust's type "
@@ -4914,52 +5193,90 @@ msgstr ""
 "Maintenant que nous avons vu une bonne quantité de Rust, nous allons "
 "continuer avec :"
 
-#: src/welcome-day-2.md:6
+#: src/welcome-day-2.md
 #, fuzzy
 msgid "Pattern matching: extracting data from structures."
 msgstr ""
 "Filtrage par motif : déstructuration des énumérations, des structures et des "
 "tableaux."
 
-#: src/welcome-day-2.md:7
+#: src/welcome-day-2.md
 msgid "Methods: associating functions with types."
 msgstr ""
 
-#: src/welcome-day-2.md:8
+#: src/welcome-day-2.md
 msgid "Traits: behaviors shared by multiple types."
 msgstr ""
 
-#: src/welcome-day-2.md:9
+#: src/welcome-day-2.md
 msgid "Generics: parameterizing types on other types."
 msgstr ""
 
-#: src/welcome-day-2.md:10
+#: src/welcome-day-2.md
 msgid ""
 "Standard library types and traits: a tour of Rust's rich standard library."
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:3
+#: src/welcome-day-2.md
+msgid "[Welcome](./welcome-day-2.md) (3 minutes)"
+msgstr ""
+
+#: src/welcome-day-2.md
+#, fuzzy
+msgid "[Pattern Matching](./pattern-matching.md) (50 minutes)"
+msgstr ""
+"Voir [Filtrage par motif](../pattern-matching.md) pour plus de détails sur "
+"les motifs avec Rust."
+
+#: src/welcome-day-2.md
+msgid "[Methods and Traits](./methods-and-traits.md) (55 minutes)"
+msgstr ""
+
+#: src/welcome-day-2.md
+msgid "[Generics](./generics.md) (45 minutes)"
+msgstr ""
+
+#: src/welcome-day-2.md src/welcome-day-4.md
+msgid ""
+"Including 10 minute breaks, this session should take about 3 hours and 5 "
+"minutes"
+msgstr ""
+
+#: src/pattern-matching.md
+msgid "[Destructuring](./pattern-matching/destructuring.md) (10 minutes)"
+msgstr ""
+
+#: src/pattern-matching.md
+msgid "[Let Control Flow](./pattern-matching/let-control-flow.md) (10 minutes)"
+msgstr ""
+
+#: src/pattern-matching.md
+msgid ""
+"[Exercise: Expression Evaluation](./pattern-matching/exercise.md) (30 "
+"minutes)"
+msgstr ""
+
+#: src/pattern-matching/destructuring.md
 msgid "Like tuples, structs and enums can also be destructured by matching:"
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:5
-#: src/pattern-matching/destructuring.md:57
+#: src/pattern-matching/destructuring.md
 msgid "Structs"
 msgstr "Structures"
 
-#: src/pattern-matching/destructuring.md:17
+#: src/pattern-matching/destructuring.md
 msgid "\"x.0 = 1, b = {b}, y = {y}\""
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:18
+#: src/pattern-matching/destructuring.md
 msgid "\"y = 2, x = {i:?}\""
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:19
+#: src/pattern-matching/destructuring.md
 msgid "\"y = {y}, other fields were ignored\""
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:25
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid ""
 "Patterns can also be used to bind variables to parts of your values. This is "
@@ -4970,19 +5287,19 @@ msgstr ""
 "parties de vos valeurs. C'est ainsi vous inspectez la structure de vos "
 "types. Commençons par un simple type `enum` :"
 
-#: src/pattern-matching/destructuring.md:38
+#: src/pattern-matching/destructuring.md
 msgid "\"cannot divide {n} into two equal parts\""
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:45
+#: src/pattern-matching/destructuring.md
 msgid "\"{n} divided in two is {half}\""
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:46
+#: src/pattern-matching/destructuring.md
 msgid "\"sorry, an error happened: {msg}\""
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:51
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid ""
 "Here we have used the arms to _destructure_ the `Result` value. In the first "
@@ -4993,22 +5310,22 @@ msgstr ""
 "premier arm, `half` est lié à la valeur à l'intérieur de la variante `Ok`. "
 "Dans le deuxième bras, `msg` est lié au message d'erreur."
 
-#: src/pattern-matching/destructuring.md:59
+#: src/pattern-matching/destructuring.md
 msgid "Change the literal values in `foo` to match with the other patterns."
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:60
+#: src/pattern-matching/destructuring.md
 msgid "Add a new field to `Foo` and make changes to the pattern as needed."
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:61
+#: src/pattern-matching/destructuring.md
 msgid ""
 "The distinction between a capture and a constant expression can be hard to "
 "spot. Try changing the `2` in the second arm to a variable, and see that it "
 "subtly doesn't work. Change it to a `const` and see it working again."
 msgstr ""
 
-#: src/pattern-matching/destructuring.md:68
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid ""
 "The `if`/`else` expression is returning an enum that is later unpacked with "
@@ -5017,7 +5334,7 @@ msgstr ""
 "L'expression `if`/`else` renvoie une énumération qui est ensuite "
 "décompressée avec une `match`."
 
-#: src/pattern-matching/destructuring.md:69
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid ""
 "You can try adding a third variant to the enum definition and displaying the "
@@ -5029,18 +5346,17 @@ msgstr ""
 "votre code est maintenant inexhaustif et comment le compilateur essaie de "
 "vous donner des indices."
 
-#: src/pattern-matching/destructuring.md:70
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid ""
 "The values in the enum variants can only be accessed after being pattern "
-"matched. The pattern binds references to the fields in the \"match arm\" "
-"after the `=>`."
+"matched."
 msgstr ""
 "Les valeurs des variantes enum ne sont accessibles qu'après avoir été mises "
 "en correspondance avec le modèle. Le modèle lie les références aux champs "
 "dans le \"match arm\" après le `=>`."
 
-#: src/pattern-matching/destructuring.md:71
+#: src/pattern-matching/destructuring.md
 #, fuzzy
 msgid ""
 "Demonstrate what happens when the search is inexhaustive. Note the advantage "
@@ -5050,45 +5366,54 @@ msgstr ""
 "l'avantage que le compilateur Rust fournit en confirmant quand tous les cas "
 "sont traités."
 
-#: src/pattern-matching/let-control-flow.md:3
+#: src/pattern-matching/destructuring.md
+msgid ""
+"Save the result of `divide_in_two` in the `result` variable and `match` it "
+"in a loop. That won't compile because `msg` is consumed when matched. To fix "
+"it, match `&result` instead of `result`. That will make `msg` a reference so "
+"it won't be consumed. This [\"match ergonomics\"](https://rust-lang.github."
+"io/rfcs/2005-match-ergonomics.html) appeared in Rust 2018. If you want to "
+"support older Rust, replace `msg` with `ref msg` in the pattern."
+msgstr ""
+
+#: src/pattern-matching/let-control-flow.md
 msgid ""
 "Rust has a few control flow constructs which differ from other languages. "
 "They are used for pattern matching:"
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:6
-#: src/pattern-matching/let-control-flow.md:9
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid "`if let` expressions"
 msgstr "expressions `si nous allons`"
 
-#: src/pattern-matching/let-control-flow.md:7
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid "`while let` expressions"
 msgstr "expressions `while let`"
 
-#: src/pattern-matching/let-control-flow.md:8
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid "`match` expressions"
 msgstr "expressions \"correspondantes\""
 
-#: src/pattern-matching/let-control-flow.md:11
+#: src/pattern-matching/let-control-flow.md
 msgid ""
 "The [`if let` expression](https://doc.rust-lang.org/reference/expressions/if-"
 "expr.html#if-let-expressions) lets you execute different code depending on "
 "whether a value matches a pattern:"
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:23
+#: src/pattern-matching/let-control-flow.md
 msgid "\"slept for {:?}\""
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:32
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid "`let else` expressions"
 msgstr "expressions `while let`"
 
-#: src/pattern-matching/let-control-flow.md:33
+#: src/pattern-matching/let-control-flow.md
 msgid ""
 "For the common case of matching a pattern and returning from the function, "
 "use [`let else`](https://doc.rust-lang.org/rust-by-example/flow_control/"
@@ -5096,37 +5421,29 @@ msgid ""
 "- anything but falling off the end of the block)."
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:44
-#: src/pattern-matching/let-control-flow.md:101
+#: src/pattern-matching/let-control-flow.md
 msgid "\"got None\""
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:50
-#: src/pattern-matching/let-control-flow.md:105
+#: src/pattern-matching/let-control-flow.md
 msgid "\"got empty string\""
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:56
-#: src/pattern-matching/let-control-flow.md:109
+#: src/pattern-matching/let-control-flow.md
 msgid "\"not a hex digit\""
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:61
-#: src/pattern-matching/solution.md:128
+#: src/pattern-matching/let-control-flow.md src/pattern-matching/solution.md
 msgid "\"result: {:?}\""
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:61
-#: src/methods-and-traits/exercise.md:121
-#: src/methods-and-traits/exercise.md:122
-#: src/methods-and-traits/exercise.md:123 src/generics/trait-bounds.md:16
-#: src/smart-pointers/solution.md:66 src/smart-pointers/solution.md:69
-#: src/testing/googletest.md:11 src/testing/googletest.md:12
-#: src/testing/solution.md:89
+#: src/pattern-matching/let-control-flow.md src/generics/trait-bounds.md
+#: src/smart-pointers/solution.md src/testing/googletest.md
+#: src/testing/solution.md
 msgid "\"foo\""
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:65
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid ""
 "Like with `if let`, there is a [`while let`](https://doc.rust-lang.org/"
@@ -5136,7 +5453,7 @@ msgstr ""
 "Comme avec `if`, il existe une variante `while let` qui teste à plusieurs "
 "reprises une valeur contre un modèle :"
 
-#: src/pattern-matching/let-control-flow.md:79
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid ""
 "Here [`String::pop`](https://doc.rust-lang.org/stable/std/string/struct."
@@ -5149,46 +5466,46 @@ msgstr ""
 "quoi il renvoie \"Aucun\". Le `while let` nous permet de continuer à "
 "parcourir tous les éléments."
 
-#: src/pattern-matching/let-control-flow.md:86
+#: src/pattern-matching/let-control-flow.md
 msgid "if-let"
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:88
+#: src/pattern-matching/let-control-flow.md
 msgid ""
 "Unlike `match`, `if let` does not have to cover all branches. This can make "
 "it more concise than `match`."
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:89
+#: src/pattern-matching/let-control-flow.md
 msgid "A common usage is handling `Some` values when working with `Option`."
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:90
+#: src/pattern-matching/let-control-flow.md
 msgid ""
 "Unlike `match`, `if let` does not support guard clauses for pattern matching."
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:92
+#: src/pattern-matching/let-control-flow.md
 msgid "let-else"
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:94
+#: src/pattern-matching/let-control-flow.md
 msgid ""
-"`if-let`s can pile up, as shown.  The `let-else` construct supports "
+"`if-let`s can pile up, as shown. The `let-else` construct supports "
 "flattening this nested code. Rewrite the awkward version for students, so "
 "they can see the transformation."
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:97
+#: src/pattern-matching/let-control-flow.md
 msgid "The rewritten version is:"
 msgstr ""
 
-#: src/pattern-matching/let-control-flow.md:116
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid "while-let"
 msgstr "expressions `while let`"
 
-#: src/pattern-matching/let-control-flow.md:118
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid ""
 "Point out that the `while let` loop will keep going as long as the value "
@@ -5197,7 +5514,7 @@ msgstr ""
 "Soulignez que la boucle `while let` continuera tant que la valeur correspond "
 "au modèle."
 
-#: src/pattern-matching/let-control-flow.md:119
+#: src/pattern-matching/let-control-flow.md
 #, fuzzy
 msgid ""
 "You could rewrite the `while let` loop as an infinite loop with an if "
@@ -5209,65 +5526,28 @@ msgstr ""
 "pour `iter.next()`. Le `while let` fournit du sucre syntaxique pour le "
 "scénario ci-dessus."
 
-#: src/pattern-matching/exercise.md:3
-msgid ""
-"Let's write a simple recursive evaluator for arithmetic expressions. Start "
-"with an enum defining the binary operations:"
+#: src/pattern-matching/exercise.md
+msgid "Let's write a simple recursive evaluator for arithmetic expressions."
 msgstr ""
 
-#: src/pattern-matching/exercise.md:7 src/pattern-matching/solution.md:4
-msgid "/// An operation to perform on two subexpressions.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:15 src/pattern-matching/solution.md:12
-msgid "/// An expression, in tree form.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:19 src/pattern-matching/solution.md:16
-msgid "/// An operation on two subexpressions.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:26 src/pattern-matching/solution.md:23
-msgid "/// A literal value\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:29 src/pattern-matching/solution.md:26
-msgid "/// The result of evaluating an expression.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:33 src/pattern-matching/solution.md:30
-msgid "/// Evaluation was successful, with the given result.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:35 src/pattern-matching/solution.md:32
-msgid "/// Evaluation failed, with the given error message.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:37 src/pattern-matching/solution.md:34
-msgid "// Allow `Ok` and `Err` as shorthands for `Res::Ok` and `Res::Err`.\n"
-msgstr ""
-
-#: src/pattern-matching/exercise.md:96 src/pattern-matching/solution.md:55
-#: src/pattern-matching/solution.md:117
-msgid "\"division by zero\""
-msgstr ""
-
-#: src/pattern-matching/exercise.md:101
+#: src/pattern-matching/exercise.md
 msgid ""
 "The `Box` type here is a smart pointer, and will be covered in detail later "
 "in the course. An expression can be \"boxed\" with `Box::new` as seen in the "
-"tests. To evaluate a boxed expression, use the deref operator to \"unbox\" "
-"it: `eval(*boxed_expr)`."
+"tests. To evaluate a boxed expression, use the deref operator (`*`) to "
+"\"unbox\" it: `eval(*boxed_expr)`."
 msgstr ""
 
-#: src/pattern-matching/exercise.md:106
+#: src/pattern-matching/exercise.md
 msgid ""
-"Some expressions cannot be evaluated and will return an error. The `Res` "
-"type represents either a successful value or an error with a message. This "
-"is very similar to the standard-library `Result` which we will see later."
+"Some expressions cannot be evaluated and will return an error. The standard "
+"[`Result<Value, String>`](https://doc.rust-lang.org/std/result/enum.Result."
+"html) type is an enum that represents either a successful value "
+"(`Ok(Value)`) or an error (`Err(String)`). We will cover this type in detail "
+"later."
 msgstr ""
 
-#: src/pattern-matching/exercise.md:110
+#: src/pattern-matching/exercise.md
 msgid ""
 "Copy and paste the code into the Rust playground, and begin implementing "
 "`eval`. The final product should pass the tests. It may be helpful to use "
@@ -5275,17 +5555,62 @@ msgid ""
 "temporarily with `#[ignore]`:"
 msgstr ""
 
-#: src/pattern-matching/exercise.md:122
+#: src/pattern-matching/exercise.md
 msgid ""
-"If you finish early, try writing a test that results in an integer overflow. "
-"How could you handle this with `Res::Err` instead of a panic?"
+"If you finish early, try writing a test that results in division by zero or "
+"integer overflow. How could you handle this with `Result` instead of a panic?"
 msgstr ""
 
-#: src/pattern-matching/solution.md:127
+#: src/pattern-matching/exercise.md src/pattern-matching/solution.md
+msgid "/// An operation to perform on two subexpressions.\n"
+msgstr ""
+
+#: src/pattern-matching/exercise.md src/pattern-matching/solution.md
+msgid "/// An expression, in tree form.\n"
+msgstr ""
+
+#: src/pattern-matching/exercise.md src/pattern-matching/solution.md
+msgid "/// An operation on two subexpressions.\n"
+msgstr ""
+
+#: src/pattern-matching/exercise.md src/pattern-matching/solution.md
+msgid "/// A literal value\n"
+msgstr ""
+
+#: src/pattern-matching/exercise.md src/pattern-matching/solution.md
+msgid "\"division by zero\""
+msgstr ""
+
+#: src/pattern-matching/solution.md
 msgid "\"expr: {:?}\""
 msgstr ""
 
-#: src/methods-and-traits/methods.md:3
+#: src/methods-and-traits.md
+msgid "[Methods](./methods-and-traits/methods.md) (10 minutes)"
+msgstr ""
+
+#: src/methods-and-traits.md
+msgid "[Traits](./methods-and-traits/traits.md) (10 minutes)"
+msgstr ""
+
+#: src/methods-and-traits.md
+msgid "[Deriving](./methods-and-traits/deriving.md) (5 minutes)"
+msgstr ""
+
+#: src/methods-and-traits.md
+msgid "[Trait Objects](./methods-and-traits/trait-objects.md) (10 minutes)"
+msgstr ""
+
+#: src/methods-and-traits.md
+msgid ""
+"[Exercise: Generic Logger](./methods-and-traits/exercise.md) (20 minutes)"
+msgstr ""
+
+#: src/methods-and-traits.md
+msgid "This segment should take about 55 minutes"
+msgstr ""
+
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Rust allows you to associate functions with your new types. You do this with "
@@ -5294,43 +5619,43 @@ msgstr ""
 "Rust vous permet d'associer des fonctions à vos nouveaux types. Vous faites "
 "cela avec un Bloc `impl` :"
 
-#: src/methods-and-traits/methods.md:14
+#: src/methods-and-traits/methods.md
 msgid "// No receiver, a static method\n"
 msgstr ""
 
-#: src/methods-and-traits/methods.md:18
+#: src/methods-and-traits/methods.md
 msgid "// Exclusive borrowed read-write access to self\n"
 msgstr ""
 
-#: src/methods-and-traits/methods.md:22
+#: src/methods-and-traits/methods.md
 msgid "// Shared and read-only borrowed access to self\n"
 msgstr ""
 
-#: src/methods-and-traits/methods.md:23
+#: src/methods-and-traits/methods.md
 msgid "\"Recorded {} laps for {}:\""
 msgstr ""
 
-#: src/methods-and-traits/methods.md:25
+#: src/methods-and-traits/methods.md
 msgid "\"Lap {idx}: {lap} sec\""
 msgstr ""
 
-#: src/methods-and-traits/methods.md:29
+#: src/methods-and-traits/methods.md
 msgid "// Exclusive ownership of self\n"
 msgstr ""
 
-#: src/methods-and-traits/methods.md:31
+#: src/methods-and-traits/methods.md
 msgid "\"Race {} is finished, total lap time: {}\""
 msgstr ""
 
-#: src/methods-and-traits/methods.md:36
+#: src/methods-and-traits/methods.md
 msgid "\"Monaco Grand Prix\""
 msgstr ""
 
-#: src/methods-and-traits/methods.md:43
+#: src/methods-and-traits/methods.md
 msgid "// race.add_lap(42);\n"
 msgstr ""
 
-#: src/methods-and-traits/methods.md:47
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "The `self` arguments specify the \"receiver\" - the object the method acts "
@@ -5339,7 +5664,7 @@ msgstr ""
 "Le `&self` ci-dessus indique que la méthode emprunte l'objet de manière "
 "immuable. Là sont d'autres récepteurs possibles pour une méthode :"
 
-#: src/methods-and-traits/methods.md:50
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "`&self`: borrows the object from the caller using a shared and immutable "
@@ -5348,7 +5673,7 @@ msgstr ""
 "`&self` : emprunte l'objet à l'appelant en utilisant un partage et immuable "
 "référence. L'objet peut être réutilisé par la suite."
 
-#: src/methods-and-traits/methods.md:52
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "`&mut self`: borrows the object from the caller using a unique and mutable "
@@ -5357,7 +5682,7 @@ msgstr ""
 "`&mut self` : emprunte l'objet à l'appelant en utilisant un nom unique et "
 "mutable référence. L'objet peut être réutilisé par la suite."
 
-#: src/methods-and-traits/methods.md:54
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "`self`: takes ownership of the object and moves it away from the caller. The "
@@ -5369,7 +5694,7 @@ msgstr ""
 "devient le propriétaire de l'objet. L'objet sera supprimé (désalloué) "
 "lorsque la méthode revient, sauf si sa propriété est explicitement transmis."
 
-#: src/methods-and-traits/methods.md:58
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid "`mut self`: same as above, but the method can mutate the object."
 msgstr ""
@@ -5377,7 +5702,7 @@ msgstr ""
 "peut le faire muter aussi. La propriété complète ne signifie pas "
 "automatiquement la mutabilité."
 
-#: src/methods-and-traits/methods.md:59
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "No receiver: this becomes a static method on the struct. Typically used to "
@@ -5387,14 +5712,14 @@ msgstr ""
 "Généralement utilisé pour créer des constructeurs appelés \"nouveaux\" par "
 "convention."
 
-#: src/methods-and-traits/methods.md:65
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid "It can be helpful to introduce methods by comparing them to functions."
 msgstr ""
 "Il peut être utile d'introduire des méthodes en les comparant à des "
 "fonctions."
 
-#: src/methods-and-traits/methods.md:66
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Methods are called on an instance of a type (such as a struct or enum), the "
@@ -5403,7 +5728,7 @@ msgstr ""
 "Les méthodes sont appelées sur une instance d'un type (tel qu'un struct ou "
 "un enum), le premier paramètre représente l'instance en tant que \"self\"."
 
-#: src/methods-and-traits/methods.md:67
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Developers may choose to use methods to take advantage of method receiver "
@@ -5415,12 +5740,12 @@ msgstr ""
 "des méthodes, nous pouvons conserver tout le code d'implémentation en un "
 "seul endroit prévisible."
 
-#: src/methods-and-traits/methods.md:68
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid "Point out the use of the keyword `self`, a method receiver."
 msgstr "Soulignez l'utilisation du mot-clé `self`, un récepteur de méthode."
 
-#: src/methods-and-traits/methods.md:69
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Show that it is an abbreviated term for `self: Self` and perhaps show how "
@@ -5429,7 +5754,7 @@ msgstr ""
 "Montrez qu'il s'agit d'un terme abrégé pour `self:&Self` et montrez peut-"
 "être comment le nom de la structure pourrait également être utilisé."
 
-#: src/methods-and-traits/methods.md:70
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Explain that `Self` is a type alias for the type the `impl` block is in and "
@@ -5438,7 +5763,7 @@ msgstr ""
 "Expliquez que `Self` est un alias de type pour le type dans lequel se trouve "
 "le bloc `impl` et peut être utilisé ailleurs dans le bloc."
 
-#: src/methods-and-traits/methods.md:71
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Note how `self` is used like other structs and dot notation can be used to "
@@ -5447,7 +5772,7 @@ msgstr ""
 "Notez comment `self` est utilisé comme d'autres structures et la notation "
 "par points peut être utilisée pour faire référence à des champs individuels."
 
-#: src/methods-and-traits/methods.md:72
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "This might be a good time to demonstrate how the `&self` differs from `self` "
@@ -5456,7 +5781,7 @@ msgstr ""
 "C'est peut-être le bon moment pour démontrer en quoi `&self` diffère de "
 "`self` en modifiant le code et en essayant d'exécuter say_hello deux fois."
 
-#: src/methods-and-traits/methods.md:73
+#: src/methods-and-traits/methods.md
 #, fuzzy
 msgid ""
 "Beyond variants on `self`, there are also [special wrapper types](https://"
@@ -5467,7 +5792,7 @@ msgstr ""
 "spéciaux\\] (https://doc.rust-lang.org/reference/special-types-and-traits."
 "html) autorisés à être des types de récepteurs, tels que `Box<Self>`."
 
-#: src/methods-and-traits/traits.md:3
+#: src/methods-and-traits/traits.md
 #, fuzzy
 msgid ""
 "Rust lets you abstract over types with traits. They're similar to interfaces:"
@@ -5475,40 +5800,33 @@ msgstr ""
 "Rust vous permet d'abstraire les types avec des traits. Ils sont similaires "
 "aux interfaces :"
 
-#: src/methods-and-traits/traits.md:7 src/methods-and-traits/trait-objects.md:7
-msgid "// No name needed, cats won't respond anyway.\n"
-msgstr ""
-
-#: src/methods-and-traits/traits.md:13
+#: src/methods-and-traits/traits.md
 msgid "\"Oh you're a cutie! What's your name? {}\""
 msgstr ""
 
-#: src/methods-and-traits/traits.md:18
-#: src/methods-and-traits/trait-objects.md:14
+#: src/methods-and-traits/traits.md src/methods-and-traits/trait-objects.md
 msgid "\"Woof, my name is {}!\""
 msgstr ""
 
-#: src/methods-and-traits/traits.md:22
-#: src/methods-and-traits/trait-objects.md:18
+#: src/methods-and-traits/traits.md src/methods-and-traits/trait-objects.md
 msgid "\"Miau!\""
 msgstr ""
 
-#: src/methods-and-traits/traits.md:27
-#: src/methods-and-traits/trait-objects.md:24
+#: src/methods-and-traits/traits.md src/methods-and-traits/trait-objects.md
 msgid "\"Fido\""
 msgstr ""
 
-#: src/methods-and-traits/traits.md:36
+#: src/methods-and-traits/traits.md
 msgid ""
 "A trait defines a number of methods that types must have in order to "
 "implement the trait."
 msgstr ""
 
-#: src/methods-and-traits/traits.md:39
+#: src/methods-and-traits/traits.md
 msgid "Traits are implemented in an `impl <trait> for <type> { .. }` block."
 msgstr ""
 
-#: src/methods-and-traits/traits.md:41
+#: src/methods-and-traits/traits.md
 #, fuzzy
 msgid ""
 "Traits may specify pre-implemented (provided) methods and methods that users "
@@ -5520,40 +5838,40 @@ msgstr ""
 "œuvre eux-mêmes. Les méthodes avec des implémentations par défaut peuvent "
 "s'appuyer sur les méthodes requises."
 
-#: src/methods-and-traits/deriving.md:3
+#: src/methods-and-traits/deriving.md
 msgid ""
 "Supported traits can be automatically implemented for your custom types, as "
 "follows:"
 msgstr ""
 
-#: src/methods-and-traits/deriving.md:15
+#: src/methods-and-traits/deriving.md
 msgid "// Default trait adds `default` constructor.\n"
 msgstr ""
 
-#: src/methods-and-traits/deriving.md:16
+#: src/methods-and-traits/deriving.md
 msgid "// Clone trait adds `clone` method.\n"
 msgstr ""
 
-#: src/methods-and-traits/deriving.md:17
+#: src/methods-and-traits/deriving.md
 msgid "\"EldurScrollz\""
 msgstr ""
 
-#: src/methods-and-traits/deriving.md:18
+#: src/methods-and-traits/deriving.md
 msgid "// Debug trait adds support for printing with `{:?}`.\n"
 msgstr ""
 
-#: src/methods-and-traits/deriving.md:19
+#: src/methods-and-traits/deriving.md
 msgid "\"{:?} vs. {:?}\""
 msgstr ""
 
-#: src/methods-and-traits/deriving.md:25
+#: src/methods-and-traits/deriving.md
 msgid ""
 "Derivation is implemented with macros, and many crates provide useful derive "
 "macros to add useful functionality. For example, `serde` can derive "
 "serialization support for a struct using `#[derive(Serialize)]`."
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:3
+#: src/methods-and-traits/trait-objects.md
 #, fuzzy
 msgid ""
 "Trait objects allow for values of different types, for instance in a "
@@ -5562,16 +5880,16 @@ msgstr ""
 "Les objets de trait autorisent des valeurs de différents types, par exemple "
 "dans une collection :"
 
-#: src/methods-and-traits/trait-objects.md:27
+#: src/methods-and-traits/trait-objects.md
 msgid "\"Hello, who are you? {}\""
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:32
+#: src/methods-and-traits/trait-objects.md
 #, fuzzy
 msgid "Memory layout after allocating `pets`:"
 msgstr "Disposition de la mémoire après l'allocation de `pets` :"
 
-#: src/methods-and-traits/trait-objects.md:34
+#: src/methods-and-traits/trait-objects.md
 msgid ""
 "```bob\n"
 " Stack                             Heap\n"
@@ -5632,25 +5950,25 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:68
+#: src/methods-and-traits/trait-objects.md
 msgid ""
 "Types that implement a given trait may be of different sizes. This makes it "
 "impossible to have things like `Vec<dyn Pet>` in the example above."
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:70
+#: src/methods-and-traits/trait-objects.md
 msgid ""
 "`dyn Pet` is a way to tell the compiler about a dynamically sized type that "
 "implements `Pet`."
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:72
+#: src/methods-and-traits/trait-objects.md
 msgid ""
 "In the example, `pets` is allocated on the stack and the vector data is on "
 "the heap. The two vector elements are _fat pointers_:"
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:74
+#: src/methods-and-traits/trait-objects.md
 msgid ""
 "A fat pointer is a double-width pointer. It has two components: a pointer to "
 "the actual object and a pointer to the [virtual method table](https://en."
@@ -5658,218 +5976,99 @@ msgid ""
 "implementation of that particular object."
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:77
+#: src/methods-and-traits/trait-objects.md
 msgid ""
 "The data for the `Dog` named Fido is the `name` and `age` fields. The `Cat` "
 "has a `lives` field."
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:79
+#: src/methods-and-traits/trait-objects.md
 msgid "Compare these outputs in the above example:"
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:81
-#: src/methods-and-traits/trait-objects.md:82 src/std-traits/closures.md:54
+#: src/methods-and-traits/trait-objects.md src/std-traits/closures.md
 msgid "\"{} {}\""
 msgstr ""
 
-#: src/methods-and-traits/trait-objects.md:83
-#: src/methods-and-traits/trait-objects.md:84
-#: src/methods-and-traits/solution.md:123 src/std-traits/exercise.md:25
-#: src/std-traits/solution.md:31 src/modules/solution.md:70
-#: src/android/build-rules/library.md:43
-#: src/android/interoperability/cpp/rust-bridge.md:17
-#: src/async/pitfalls/cancellation.md:59
+#: src/methods-and-traits/trait-objects.md src/std-traits/exercise.md
+#: src/std-traits/solution.md src/modules/exercise.md src/modules/solution.md
+#: src/android/build-rules/library.md
+#: src/android/interoperability/cpp/rust-bridge.md
+#: src/async/pitfalls/cancellation.md
 msgid "\"{}\""
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:3
-#, fuzzy
+#: src/methods-and-traits/exercise.md
 msgid ""
-"Let us design a classical GUI library using our new knowledge of traits and "
-"trait objects. We'll only implement the drawing of it (as text) for "
-"simplicity."
+"Let's design a simple logging utility, using a trait `Logger` with a `log` "
+"method. Code which might log its progress can then take an `&impl Logger`. "
+"In testing, this might put messages in the test logfile, while in a "
+"production build it would send messages to a log server."
 msgstr ""
-"Concevons une bibliothèque d'interface graphique classique en utilisant nos "
-"nouvelles connaissances sur les traits et objets trait."
 
-#: src/methods-and-traits/exercise.md:6
-#, fuzzy
-msgid "We will have a number of widgets in our library:"
-msgstr "Nous aurons un certain nombre de widgets dans notre bibliothèque :"
-
-#: src/methods-and-traits/exercise.md:8
-#, fuzzy
-msgid "`Window`: has a `title` and contains other widgets."
-msgstr "`Window` : a un `title` et contient d'autres widgets."
-
-#: src/methods-and-traits/exercise.md:9
+#: src/methods-and-traits/exercise.md
 msgid ""
-"`Button`: has a `label`. In reality, it would also take a callback function "
-"to allow the program to do something when the button is clicked but we won't "
-"include that since we're only drawing the GUI."
+"However, the `StderrLogger` given below logs all messages, regardless of "
+"verbosity. Your task is to write a `VerbosityFilter` type that will ignore "
+"messages above a maximum verbosity."
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:12
-#, fuzzy
-msgid "`Label`: has a `label`."
-msgstr "`Label` : a un `label`."
-
-#: src/methods-and-traits/exercise.md:14
-#, fuzzy
-msgid "The widgets will implement a `Widget` trait, see below."
-msgstr "Les widgets implémenteront un trait `Widget`, voir ci-dessous."
-
-#: src/methods-and-traits/exercise.md:16
-#, fuzzy
+#: src/methods-and-traits/exercise.md
 msgid ""
-"Copy the code below to <https://play.rust-lang.org/>, fill in the missing "
-"`draw_into` methods so that you implement the `Widget` trait:"
-msgstr ""
-"Copiez le code ci-dessous sur <https://play.rust-lang.org/>, remplissez les "
-"champs manquants méthodes `draw_into` afin que vous implémentiez le trait "
-"`Widget` :"
-
-#: src/methods-and-traits/exercise.md:24 src/methods-and-traits/solution.md:5
-#: src/modules/solution.md:22
-msgid "/// Natural width of `self`.\n"
+"This is a common pattern: a struct wrapping a trait implementation and "
+"implementing that same trait, adding behavior in the process. What other "
+"kinds of wrappers might be useful in a logging utility?"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:27 src/methods-and-traits/solution.md:8
-#: src/modules/solution.md:25
-msgid "/// Draw the widget into a buffer.\n"
+#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md
+msgid "/// Log a message at the given verbosity level.\n"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:30 src/methods-and-traits/solution.md:11
-#: src/modules/solution.md:28
-msgid "/// Draw the widget on standard output.\n"
+#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md
+msgid "\"verbosity={verbosity}: {message}\""
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:34 src/methods-and-traits/solution.md:15
-#: src/modules/solution.md:32
-msgid "\"{buffer}\""
+#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md
+msgid "\"FYI\""
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:86
-msgid "// TODO: Implement `Widget` for `Label`.\n"
+#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md
+msgid "\"Uhoh\""
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:88
-msgid "// TODO: Implement `Widget` for `Button`.\n"
+#: src/methods-and-traits/exercise.md
+msgid "// TODO: Define and implement `VerbosityFilter`.\n"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:90
-msgid "// TODO: Implement `Widget` for `Window`.\n"
+#: src/methods-and-traits/solution.md
+msgid "/// Only log messages up to the given verbosity level.\n"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:94 src/methods-and-traits/solution.md:128
-#: src/modules/solution.md:178
-msgid "\"Rust GUI Demo 1.23\""
+#: src/generics.md
+msgid "[Generic Functions](./generics/generic-functions.md) (5 minutes)"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:95 src/methods-and-traits/solution.md:129
-#: src/modules/solution.md:180
-msgid "\"This is a small text GUI demo.\""
+#: src/generics.md
+msgid "[Generic Data Types](./generics/generic-data.md) (15 minutes)"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:96 src/methods-and-traits/solution.md:130
-#: src/modules/solution.md:182
-msgid "\"Click me!\""
+#: src/generics.md
+msgid "[Trait Bounds](./generics/trait-bounds.md) (10 minutes)"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:101
-#, fuzzy
-msgid "The output of the above program can be something simple like this:"
-msgstr ""
-"La sortie du programme ci-dessus peut être quelque chose de simple comme "
-"ceci :"
-
-#: src/methods-and-traits/exercise.md:113
-#, fuzzy
-msgid ""
-"If you want to draw aligned text, you can use the [fill/alignment](https://"
-"doc.rust-lang.org/std/fmt/index.html#fillalignment) formatting operators. In "
-"particular, notice how you can pad with different characters (here a `'/'`) "
-"and how you can control alignment:"
-msgstr ""
-"Si vous voulez dessiner du texte aligné, vous pouvez utiliser le "
-"[remplissage/alignement](https://doc.rust-lang.org/std/fmt/index."
-"html#fillalignment) opérateurs de formatage. En particulier, notez comment "
-"vous pouvez compléter avec différents caractères (ici un `'/'`) et comment "
-"vous pouvez contrôler l'alignement :"
-
-#: src/methods-and-traits/exercise.md:121
-msgid "\"left aligned:  |{:/<width$}|\""
+#: src/generics.md
+msgid "[impl Trait](./generics/impl-trait.md) (5 minutes)"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:122
-msgid "\"centered:      |{:/^width$}|\""
+#: src/generics.md
+msgid "[Exercise: Generic min](./generics/exercise.md) (10 minutes)"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:123
-msgid "\"right aligned: |{:/>width$}|\""
+#: src/generics.md src/smart-pointers.md src/iterators.md src/error-handling.md
+msgid "This segment should take about 45 minutes"
 msgstr ""
 
-#: src/methods-and-traits/exercise.md:127
-#, fuzzy
-msgid ""
-"Using such alignment tricks, you can for example produce output like this:"
-msgstr ""
-"En utilisant de telles astuces d'alignement, vous pouvez par exemple "
-"produire une sortie comme celle-ci :"
-
-#: src/methods-and-traits/solution.md:70
-msgid "// Add 4 paddings for borders\n"
-msgstr ""
-
-#: src/methods-and-traits/solution.md:82 src/modules/solution.md:159
-msgid ""
-"// TODO: after learning about error handling, you can change\n"
-"        // draw_into to return Result<(), std::fmt::Error>. Then use\n"
-"        // the ?-operator here instead of .unwrap().\n"
-msgstr ""
-
-#: src/methods-and-traits/solution.md:85 src/methods-and-traits/solution.md:91
-#: src/modules/solution.md:162 src/modules/solution.md:168
-msgid "\"+-{:-<inner_width$}-+\""
-msgstr ""
-
-#: src/methods-and-traits/solution.md:85 src/methods-and-traits/solution.md:87
-#: src/methods-and-traits/solution.md:91 src/methods-and-traits/solution.md:105
-#: src/methods-and-traits/solution.md:109 src/modules/solution.md:104
-#: src/modules/solution.md:108 src/modules/solution.md:162
-#: src/modules/solution.md:164 src/modules/solution.md:168
-#: src/testing/unit-tests.md:27 src/testing/solution.md:95
-msgid "\"\""
-msgstr ""
-
-#: src/methods-and-traits/solution.md:86 src/modules/solution.md:163
-msgid "\"| {:^inner_width$} |\""
-msgstr ""
-
-#: src/methods-and-traits/solution.md:87 src/modules/solution.md:164
-msgid "\"+={:=<inner_width$}=+\""
-msgstr ""
-
-#: src/methods-and-traits/solution.md:89 src/modules/solution.md:166
-msgid "\"| {:inner_width$} |\""
-msgstr ""
-
-#: src/methods-and-traits/solution.md:97 src/modules/solution.md:94
-msgid "// add a bit of padding\n"
-msgstr ""
-
-#: src/methods-and-traits/solution.md:105
-#: src/methods-and-traits/solution.md:109 src/modules/solution.md:104
-#: src/modules/solution.md:108
-msgid "\"+{:-<width$}+\""
-msgstr ""
-
-#: src/methods-and-traits/solution.md:107 src/modules/solution.md:106
-msgid "\"|{:^width$}|\""
-msgstr ""
-
-#: src/generics/generic-functions.md:3
+#: src/generics/generic-functions.md
 #, fuzzy
 msgid ""
 "Rust supports generics, which lets you abstract algorithms or data "
@@ -5878,33 +6077,33 @@ msgstr ""
 "Rust prend en charge les génériques, ce qui vous permet d'abstraire un "
 "algorithme (comme le tri) sur les types utilisés dans l'algorithme."
 
-#: src/generics/generic-functions.md:8
+#: src/generics/generic-functions.md
 msgid "/// Pick `even` or `odd` depending on the value of `n`.\n"
 msgstr ""
 
-#: src/generics/generic-functions.md:18
+#: src/generics/generic-functions.md
 msgid "\"picked a number: {:?}\""
 msgstr ""
 
-#: src/generics/generic-functions.md:19
+#: src/generics/generic-functions.md
 msgid "\"picked a tuple: {:?}\""
 msgstr ""
 
-#: src/generics/generic-functions.md:19
+#: src/generics/generic-functions.md
 msgid "\"dog\""
 msgstr ""
 
-#: src/generics/generic-functions.md:19
+#: src/generics/generic-functions.md
 msgid "\"cat\""
 msgstr ""
 
-#: src/generics/generic-functions.md:25
+#: src/generics/generic-functions.md
 msgid ""
 "Rust infers a type for T based on the types of the arguments and return "
 "value."
 msgstr ""
 
-#: src/generics/generic-functions.md:27
+#: src/generics/generic-functions.md
 msgid ""
 "This is similar to C++ templates, but Rust partially compiles the generic "
 "function immediately, so that function must be valid for all types matching "
@@ -5913,7 +6112,7 @@ msgid ""
 "still considers it invalid. C++ would let you do this."
 msgstr ""
 
-#: src/generics/generic-functions.md:33
+#: src/generics/generic-functions.md
 #, fuzzy
 msgid ""
 "Generic code is turned into non-generic code based on the call sites. This "
@@ -5924,25 +6123,25 @@ msgstr ""
 "résultat que si vous aviez codé à la main les structures de données sans "
 "l'abstraction."
 
-#: src/generics/generic-data.md:3
+#: src/generics/generic-data.md
 #, fuzzy
 msgid "You can use generics to abstract over the concrete field type:"
 msgstr ""
 "Vous pouvez utiliser des génériques pour résumer le type de champ concret :"
 
-#: src/generics/generic-data.md:17
+#: src/generics/generic-data.md
 msgid "// fn set_x(&mut self, x: T)\n"
 msgstr ""
 
-#: src/generics/generic-data.md:23
+#: src/generics/generic-data.md
 msgid "\"{integer:?} and {float:?}\""
 msgstr ""
 
-#: src/generics/generic-data.md:24
+#: src/generics/generic-data.md
 msgid "\"coords: {:?}\""
 msgstr ""
 
-#: src/generics/generic-data.md:30
+#: src/generics/generic-data.md
 #, fuzzy
 msgid ""
 "_Q:_ Why `T` is specified twice in `impl<T> Point<T> {}`? Isn't that "
@@ -5951,7 +6150,7 @@ msgstr ""
 "_Q :_ Pourquoi `T` est spécifié deux fois dans `impl<T> Point<T> {}` ? N'est-"
 "ce pas redondant ?"
 
-#: src/generics/generic-data.md:31
+#: src/generics/generic-data.md
 #, fuzzy
 msgid ""
 "This is because it is a generic implementation section for generic type. "
@@ -5960,17 +6159,17 @@ msgstr ""
 "C'est parce qu'il s'agit d'une section d'implémentation générique pour le "
 "type générique. Ils sont indépendamment génériques."
 
-#: src/generics/generic-data.md:32
+#: src/generics/generic-data.md
 #, fuzzy
 msgid "It means these methods are defined for any `T`."
 msgstr "Cela signifie que ces méthodes sont définies pour n'importe quel `T`."
 
-#: src/generics/generic-data.md:33
+#: src/generics/generic-data.md
 #, fuzzy
 msgid "It is possible to write `impl Point<u32> { .. }`."
 msgstr "Il est possible d'écrire `impl Point<u32> { .. }`."
 
-#: src/generics/generic-data.md:34
+#: src/generics/generic-data.md
 #, fuzzy
 msgid ""
 "`Point` is still generic and you can use `Point<f64>`, but methods in this "
@@ -5979,14 +6178,14 @@ msgstr ""
 "`Point` est toujours générique et vous pouvez utiliser `Point<f64>`, mais "
 "les méthodes de ce bloc ne seront disponibles que pour `Point<u32>`."
 
-#: src/generics/generic-data.md:36
+#: src/generics/generic-data.md
 msgid ""
 "Try declaring a new variable `let p = Point { x: 5, y: 10.0 };`. Update the "
 "code to allow points that have elements of different types, by using two "
 "type variables, e.g., `T` and `U`."
 msgstr ""
 
-#: src/generics/trait-bounds.md:3
+#: src/generics/trait-bounds.md
 #, fuzzy
 msgid ""
 "When working with generics, you often want to require the types to implement "
@@ -5996,47 +6195,47 @@ msgstr ""
 "que les types implémentent un trait, afin que vous puissiez appeler les "
 "méthodes de ce trait."
 
-#: src/generics/trait-bounds.md:6
+#: src/generics/trait-bounds.md
 #, fuzzy
 msgid "You can do this with `T: Trait` or `impl Trait`:"
 msgstr "Vous pouvez le faire avec `T: Trait` ou `impl Trait` :"
 
-#: src/generics/trait-bounds.md:12
+#: src/generics/trait-bounds.md
 msgid "// struct NotClonable;\n"
 msgstr ""
 
-#: src/generics/trait-bounds.md:18
+#: src/generics/trait-bounds.md
 msgid "\"{pair:?}\""
 msgstr ""
 
-#: src/generics/trait-bounds.md:24
+#: src/generics/trait-bounds.md
 msgid "Try making a `NonClonable` and passing it to `duplicate`."
 msgstr ""
 
-#: src/generics/trait-bounds.md:26
+#: src/generics/trait-bounds.md
 msgid "When multiple traits are necessary, use `+` to join them."
 msgstr ""
 
-#: src/generics/trait-bounds.md:28
+#: src/generics/trait-bounds.md
 #, fuzzy
 msgid "Show a `where` clause, students will encounter it when reading code."
 msgstr ""
 "Montrez une clause \"où\", les étudiants la rencontreront lors de la lecture "
 "du code."
 
-#: src/generics/trait-bounds.md:39
+#: src/generics/trait-bounds.md
 #, fuzzy
 msgid "It declutters the function signature if you have many parameters."
 msgstr ""
 "Cela désencombre la signature de la fonction si vous avez beaucoup de "
 "paramètres."
 
-#: src/generics/trait-bounds.md:40
+#: src/generics/trait-bounds.md
 #, fuzzy
 msgid "It has additional features making it more powerful."
 msgstr "Il a des fonctionnalités supplémentaires qui le rendent plus puissant."
 
-#: src/generics/trait-bounds.md:41
+#: src/generics/trait-bounds.md
 #, fuzzy
 msgid ""
 "If someone asks, the extra feature is that the type on the left of \":\" can "
@@ -6045,13 +6244,13 @@ msgstr ""
 "Si quelqu'un demande, la fonctionnalité supplémentaire est que le type à "
 "gauche de \":\" peut être arbitraire, comme `Option<T>`."
 
-#: src/generics/trait-bounds.md:43
+#: src/generics/trait-bounds.md
 msgid ""
 "Note that Rust does not (yet) support specialization. For example, given the "
 "original `duplicate`, it is invalid to add a specialized `duplicate(a: u32)`."
 msgstr ""
 
-#: src/generics/impl-trait.md:3
+#: src/generics/impl-trait.md
 #, fuzzy
 msgid ""
 "Similar to trait bounds, an `impl Trait` syntax can be used in function "
@@ -6060,25 +6259,25 @@ msgstr ""
 "Semblable aux limites de trait, une syntaxe `impl Trait` peut être utilisée "
 "dans la fonction arguments et valeurs de retour :"
 
-#: src/generics/impl-trait.md:7
+#: src/generics/impl-trait.md
 msgid ""
 "// Syntactic sugar for:\n"
 "//   fn add_42_millions<T: Into<i32>>(x: T) -> i32 {\n"
 msgstr ""
 
-#: src/generics/impl-trait.md:19
+#: src/generics/impl-trait.md
 msgid "\"{many}\""
 msgstr ""
 
-#: src/generics/impl-trait.md:21
+#: src/generics/impl-trait.md
 msgid "\"{many_more}\""
 msgstr ""
 
-#: src/generics/impl-trait.md:23
+#: src/generics/impl-trait.md
 msgid "\"debuggable: {debuggable:?}\""
 msgstr ""
 
-#: src/generics/impl-trait.md:29
+#: src/generics/impl-trait.md
 #, fuzzy
 msgid ""
 "`impl Trait` allows you to work with types which you cannot name. The "
@@ -6087,7 +6286,7 @@ msgstr ""
 "La signification de `impl Trait` est un peu différente dans les différentes "
 "positions."
 
-#: src/generics/impl-trait.md:32
+#: src/generics/impl-trait.md
 #, fuzzy
 msgid ""
 "For a parameter, `impl Trait` is like an anonymous generic parameter with a "
@@ -6096,7 +6295,7 @@ msgstr ""
 "Pour un paramètre, `impl Trait` est comme un paramètre générique anonyme "
 "avec un trait lié."
 
-#: src/generics/impl-trait.md:34
+#: src/generics/impl-trait.md
 #, fuzzy
 msgid ""
 "For a return type, it means that the return type is some concrete type that "
@@ -6107,7 +6306,7 @@ msgstr ""
 "concret qui implémente le trait, sans nommer le type. Cela peut être utile "
 "lorsque vous ne souhaitez pas exposer le type concret dans un API publique."
 
-#: src/generics/impl-trait.md:38
+#: src/generics/impl-trait.md
 #, fuzzy
 msgid ""
 "Inference is hard in return position. A function returning `impl Foo` picks "
@@ -6124,42 +6323,85 @@ msgstr ""
 "avoir besoin d'en choisir un, comme avec `let x : Vec<_> = foo.collect()` ou "
 "avec le turbofish, `foo.collect ::<Vec<_>>()`."
 
-#: src/generics/impl-trait.md:44
+#: src/generics/impl-trait.md
 msgid ""
 "What is the type of `debuggable`? Try `let debuggable: () = ..` to see what "
 "the error message shows."
 msgstr ""
 
-#: src/generics/exercise.md:3
+#: src/generics/exercise.md
 msgid ""
 "In this short exercise, you will implement a generic `min` function that "
 "determines the minimum of two values, using a `LessThan` trait."
 msgstr ""
 
-#: src/generics/exercise.md:8 src/generics/solution.md:5
+#: src/generics/exercise.md src/generics/solution.md
 msgid "/// Return true if self is less than other.\n"
 msgstr ""
 
-#: src/generics/exercise.md:29
+#: src/generics/exercise.md
 msgid "// TODO: implement the `min` function used in `main`.\n"
 msgstr ""
 
-#: src/generics/exercise.md:34 src/generics/solution.md:37
+#: src/generics/exercise.md src/generics/solution.md
 msgid "\"Shapiro\""
 msgstr ""
 
-#: src/generics/exercise.md:38 src/generics/exercise.md:42
-#: src/generics/solution.md:41 src/generics/solution.md:45
+#: src/generics/exercise.md src/generics/solution.md
 msgid "\"Baumann\""
 msgstr ""
 
-#: src/std-types.md:7
+#: src/welcome-day-2-afternoon.md
+msgid "[Standard Library Types](./std-types.md) (1 hour and 10 minutes)"
+msgstr ""
+
+#: src/welcome-day-2-afternoon.md
+msgid "[Standard Library Traits](./std-traits.md) (1 hour and 40 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[Standard Library](./std-types/std.md) (3 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[Documentation](./std-types/docs.md) (5 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[Option](./std-types/option.md) (10 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[Result](./std-types/result.md) (10 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[String](./std-types/string.md) (10 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[Vec](./std-types/vec.md) (10 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[HashMap](./std-types/hashmap.md) (10 minutes)"
+msgstr ""
+
+#: src/std-types.md
+msgid "[Exercise: Counter](./std-types/exercise.md) (10 minutes)"
+msgstr ""
+
+#: src/std-types.md src/memory-management.md src/slices-and-lifetimes.md
+msgid "This segment should take about 1 hour and 10 minutes"
+msgstr ""
+
+#: src/std-types.md
 msgid ""
 "For each of the slides in this section, spend some time reviewing the "
 "documentation pages, highlighting some of the more common methods."
 msgstr ""
 
-#: src/std-types/std.md:3
+#: src/std-types/std.md
 #, fuzzy
 msgid ""
 "Rust comes with a standard library which helps establish a set of common "
@@ -6171,7 +6413,7 @@ msgstr ""
 "Rust. De cette façon, deux bibliothèques peuvent travailler ensemble en "
 "douceur car ils utilisent tous les deux le même type `String`."
 
-#: src/std-types/std.md:7
+#: src/std-types/std.md
 #, fuzzy
 msgid ""
 "In fact, Rust contains several layers of the Standard Library: `core`, "
@@ -6180,7 +6422,7 @@ msgstr ""
 "En fait, Rust contient plusieurs couches de la bibliothèque standard : "
 "`core`, `alloc` et `std`."
 
-#: src/std-types/std.md:8
+#: src/std-types/std.md
 #, fuzzy
 msgid ""
 "`core` includes the most basic types and functions that don't depend on "
@@ -6189,7 +6431,7 @@ msgstr ""
 "`core` inclut les types et fonctions les plus basiques qui ne dépendent pas "
 "de `libc`, de l'allocateur ou même la présence d'un système d'exploitation."
 
-#: src/std-types/std.md:10
+#: src/std-types/std.md
 #, fuzzy
 msgid ""
 "`alloc` includes types which require a global heap allocator, such as `Vec`, "
@@ -6198,7 +6440,7 @@ msgstr ""
 "`alloc` inclut les types qui nécessitent un allocateur de tas global, tels "
 "que `Vec`, `Box` et `Arc`."
 
-#: src/std-types/std.md:11
+#: src/std-types/std.md
 #, fuzzy
 msgid ""
 "Embedded Rust applications often only use `core`, and sometimes `alloc`."
@@ -6206,11 +6448,11 @@ msgstr ""
 "Les applications Embedded Rust n'utilisent souvent que \"core\" et parfois "
 "\"alloc\"."
 
-#: src/std-types/docs.md:3
+#: src/std-types/docs.md
 msgid "Rust comes with extensive documentation. For example:"
 msgstr ""
 
-#: src/std-types/docs.md:5
+#: src/std-types/docs.md
 #, fuzzy
 msgid ""
 "All of the details about [loops](https://doc.rust-lang.org/stable/reference/"
@@ -6219,13 +6461,13 @@ msgstr ""
 "Voir la [Rust Reference](https://doc.rust-lang.org/reference/type-layout."
 "html)."
 
-#: src/std-types/docs.md:6
+#: src/std-types/docs.md
 msgid ""
 "Primitive types like [`u8`](https://doc.rust-lang.org/stable/std/primitive."
 "u8.html)."
 msgstr ""
 
-#: src/std-types/docs.md:7
+#: src/std-types/docs.md
 #, fuzzy
 msgid ""
 "Standard library types like [`Option`](https://doc.rust-lang.org/stable/std/"
@@ -6235,11 +6477,11 @@ msgstr ""
 "[`Read`](https://doc.rust-lang.org/std/io/trait.Read.html) et [`Write`]"
 "(https://doc.rust-lang.org/std/io/trait.Write.html) utilisés pour IO,"
 
-#: src/std-types/docs.md:9
+#: src/std-types/docs.md
 msgid "In fact, you can document your own code:"
 msgstr ""
 
-#: src/std-types/docs.md:12
+#: src/std-types/docs.md
 msgid ""
 "/// Determine whether the first argument is divisible by the second "
 "argument.\n"
@@ -6247,7 +6489,7 @@ msgid ""
 "/// If the second argument is zero, the result is false.\n"
 msgstr ""
 
-#: src/std-types/docs.md:23
+#: src/std-types/docs.md
 #, fuzzy
 msgid ""
 "The contents are treated as Markdown. All published Rust library crates are "
@@ -6261,19 +6503,19 @@ msgstr ""
 "rustdoc.html). C'est idiomatic pour documenter tous les éléments publics "
 "dans une API utilisant ce modèle."
 
-#: src/std-types/docs.md:28
+#: src/std-types/docs.md
 msgid ""
 "To document an item from inside the item (such as inside a module), use `//!"
 "` or `/*! .. */`, called \"inner doc comments\":"
 msgstr ""
 
-#: src/std-types/docs.md:32
+#: src/std-types/docs.md
 msgid ""
 "//! This module contains functionality relating to divisibility of "
 "integers.\n"
 msgstr ""
 
-#: src/std-types/docs.md:37
+#: src/std-types/docs.md
 #, fuzzy
 msgid ""
 "Show students the generated docs for the `rand` crate at <https://docs.rs/"
@@ -6282,74 +6524,74 @@ msgstr ""
 "Montrez aux élèves les documents générés pour la caisse \"rand\" sur [`docs."
 "rs/rand`](https://docs.rs/rand)."
 
-#: src/std-types/option.md:1
+#: src/std-types/option.md
 #, fuzzy
 msgid "Option"
 msgstr "Exceptions"
 
-#: src/std-types/option.md:3
+#: src/std-types/option.md
 msgid ""
 "We have already seen some use of `Option<T>`. It stores either a value of "
 "type `T` or nothing. For example, [`String::find`](https://doc.rust-lang.org/"
 "stable/std/string/struct.String.html#method.find) returns an `Option<usize>`."
 msgstr ""
 
-#: src/std-types/option.md:10
+#: src/std-types/option.md
 msgid "\"Löwe 老虎 Léopard Gepardi\""
 msgstr ""
 
-#: src/std-types/option.md:11
+#: src/std-types/option.md
 msgid "'é'"
 msgstr ""
 
-#: src/std-types/option.md:12 src/std-types/option.md:15
+#: src/std-types/option.md
 msgid "\"find returned {position:?}\""
 msgstr ""
 
-#: src/std-types/option.md:14
+#: src/std-types/option.md
 msgid "'Z'"
 msgstr ""
 
-#: src/std-types/option.md:16
+#: src/std-types/option.md
 msgid "\"Character not found\""
 msgstr ""
 
-#: src/std-types/option.md:22
+#: src/std-types/option.md
 #, fuzzy
 msgid "`Option` is widely used, not just in the standard library."
 msgstr ""
 "`Option` et `Result` sont largement utilisés, pas seulement dans la "
 "bibliothèque standard."
 
-#: src/std-types/option.md:23
+#: src/std-types/option.md
 msgid ""
 "`unwrap` will return the value in an `Option`, or panic. `expect` is similar "
 "but takes an error message."
 msgstr ""
 
-#: src/std-types/option.md:24
+#: src/std-types/option.md
 msgid ""
 "You can panic on None, but you can't \"accidentally\" forget to check for "
 "None."
 msgstr ""
 
-#: src/std-types/option.md:25
+#: src/std-types/option.md
 msgid ""
 "It's common to `unwrap`/`expect` all over the place when hacking something "
 "together, but production code typically handles `None` in a nicer fashion."
 msgstr ""
 
-#: src/std-types/option.md:26
+#: src/std-types/option.md
 msgid ""
 "The niche optimization means that `Option<T>` often has the same size in "
 "memory as `T`."
 msgstr ""
 
-#: src/std-types/result.md:1
+#: src/std-types/result.md
 msgid "Result"
 msgstr ""
 
-#: src/std-types/result.md:3
+#: src/std-types/result.md
 msgid ""
 "`Result` is similar to `Option`, but indicates the success or failure of an "
 "operation, each with a different type. This is similar to the `Res` defined "
@@ -6357,23 +6599,23 @@ msgid ""
 "the `Ok` variant and `E` appears in the `Err` variant."
 msgstr ""
 
-#: src/std-types/result.md:13
+#: src/std-types/result.md
 msgid "\"diary.txt\""
 msgstr ""
 
-#: src/std-types/result.md:18
+#: src/std-types/result.md
 msgid "\"Dear diary: {contents} ({bytes} bytes)\""
 msgstr ""
 
-#: src/std-types/result.md:20
+#: src/std-types/result.md
 msgid "\"Could not read file content\""
 msgstr ""
 
-#: src/std-types/result.md:24
+#: src/std-types/result.md
 msgid "\"The diary could not be opened: {err}\""
 msgstr ""
 
-#: src/std-types/result.md:32
+#: src/std-types/result.md
 #, fuzzy
 msgid ""
 "As with `Option`, the successful value sits inside of `Result`, forcing the "
@@ -6387,7 +6629,7 @@ msgstr ""
 "produire, `unwrap()` ou `expect()` peut être appelé, et c'est aussi un "
 "signal de l'intention du développeur."
 
-#: src/std-types/result.md:35
+#: src/std-types/result.md
 #, fuzzy
 msgid ""
 "`Result` documentation is a recommended read. Not during the course, but it "
@@ -6398,7 +6640,7 @@ msgstr ""
 "mais cela vaut la peine d'être mentionné. Il contient de nombreuses méthodes "
 "et fonctions pratiques qui facilitent la programmation de style fonctionnel."
 
-#: src/std-types/result.md:37
+#: src/std-types/result.md
 #, fuzzy
 msgid ""
 "`Result` is the standard type to implement error handling as we will see on "
@@ -6407,11 +6649,11 @@ msgstr ""
 "`Result` est le type standard pour implémenter la gestion des erreurs, comme "
 "nous le verrons le jour 3."
 
-#: src/std-types/string.md:1
+#: src/std-types/string.md
 msgid "String"
 msgstr "String"
 
-#: src/std-types/string.md:3
+#: src/std-types/string.md
 #, fuzzy
 msgid ""
 "[`String`](https://doc.rust-lang.org/std/string/struct.String.html) is the "
@@ -6420,34 +6662,33 @@ msgstr ""
 "[`String`](https://doc.rust-lang.org/std/string/struct.String.html) est le "
 "tampon de chaîne UTF-8 évolutif standard alloué par tas :"
 
-#: src/std-types/string.md:8 src/std-traits/read-and-write.md:35
-#: src/memory-management/review.md:23 src/memory-management/review.md:54
-#: src/testing/unit-tests.md:32 src/testing/unit-tests.md:37
-#: src/concurrency/scoped-threads.md:9 src/concurrency/scoped-threads.md:26
+#: src/std-types/string.md src/std-traits/read-and-write.md
+#: src/memory-management/review.md src/testing/unit-tests.md
+#: src/concurrency/scoped-threads.md
 msgid "\"Hello\""
 msgstr ""
 
-#: src/std-types/string.md:9
+#: src/std-types/string.md
 msgid "\"s1: len = {}, capacity = {}\""
 msgstr ""
 
-#: src/std-types/string.md:13
+#: src/std-types/string.md
 msgid "'!'"
 msgstr ""
 
-#: src/std-types/string.md:14
+#: src/std-types/string.md
 msgid "\"s2: len = {}, capacity = {}\""
 msgstr ""
 
-#: src/std-types/string.md:16
+#: src/std-types/string.md
 msgid "\"🇨🇭\""
 msgstr ""
 
-#: src/std-types/string.md:17
+#: src/std-types/string.md
 msgid "\"s3: len = {}, number of chars = {}\""
 msgstr ""
 
-#: src/std-types/string.md:22
+#: src/std-types/string.md
 #, fuzzy
 msgid ""
 "`String` implements [`Deref<Target = str>`](https://doc.rust-lang.org/std/"
@@ -6458,19 +6699,19 @@ msgstr ""
 "string/struct.String.html#deref-methods-str), ce qui signifie que vous "
 "pouvez appeler tous Méthodes `str` sur une `String`."
 
-#: src/std-types/string.md:30
+#: src/std-types/string.md
 msgid ""
 "`String::new` returns a new empty string, use `String::with_capacity` when "
 "you know how much data you want to push to the string."
 msgstr ""
 
-#: src/std-types/string.md:31
+#: src/std-types/string.md
 msgid ""
 "`String::len` returns the size of the `String` in bytes (which can be "
 "different from its length in characters)."
 msgstr ""
 
-#: src/std-types/string.md:32
+#: src/std-types/string.md
 msgid ""
 "`String::chars` returns an iterator over the actual characters. Note that a "
 "`char` can be different from what a human will consider a \"character\" due "
@@ -6478,58 +6719,58 @@ msgid ""
 "unicode_segmentation/struct.Graphemes.html)."
 msgstr ""
 
-#: src/std-types/string.md:33
+#: src/std-types/string.md
 msgid ""
 "When people refer to strings they could either be talking about `&str` or "
 "`String`."
 msgstr ""
 
-#: src/std-types/string.md:34
+#: src/std-types/string.md
 msgid ""
 "When a type implements `Deref<Target = T>`, the compiler will let you "
 "transparently call methods from `T`."
 msgstr ""
 
-#: src/std-types/string.md:35
+#: src/std-types/string.md
 msgid ""
 "We haven't discussed the `Deref` trait yet, so at this point this mostly "
 "explains the structure of the sidebar in the documentation."
 msgstr ""
 
-#: src/std-types/string.md:36
+#: src/std-types/string.md
 msgid ""
 "`String` implements `Deref<Target = str>` which transparently gives it "
 "access to `str`'s methods."
 msgstr ""
 
-#: src/std-types/string.md:37
-msgid "Write and compare `let s3 = s1.deref();` and  `let s3 = &*s1;`."
+#: src/std-types/string.md
+msgid "Write and compare `let s3 = s1.deref();` and `let s3 = &*s1;`."
 msgstr ""
 
-#: src/std-types/string.md:38
+#: src/std-types/string.md
 msgid ""
 "`String` is implemented as a wrapper around a vector of bytes, many of the "
 "operations you see supported on vectors are also supported on `String`, but "
 "with some extra guarantees."
 msgstr ""
 
-#: src/std-types/string.md:39
+#: src/std-types/string.md
 msgid "Compare the different ways to index a `String`:"
 msgstr ""
 
-#: src/std-types/string.md:40
+#: src/std-types/string.md
 msgid ""
 "To a character by using `s3.chars().nth(i).unwrap()` where `i` is in-bound, "
 "out-of-bounds."
 msgstr ""
 
-#: src/std-types/string.md:41
+#: src/std-types/string.md
 msgid ""
 "To a substring by using `s3[0..4]`, where that slice is on character "
 "boundaries or not."
 msgstr ""
 
-#: src/std-types/vec.md:3
+#: src/std-types/vec.md
 #, fuzzy
 msgid ""
 "[`Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html) is the standard "
@@ -6538,31 +6779,31 @@ msgstr ""
 "[`Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html) est le tampon "
 "standard redimensionnable alloué au tas :"
 
-#: src/std-types/vec.md:9
+#: src/std-types/vec.md
 msgid "\"v1: len = {}, capacity = {}\""
 msgstr ""
 
-#: src/std-types/vec.md:14
+#: src/std-types/vec.md
 msgid "\"v2: len = {}, capacity = {}\""
 msgstr ""
 
-#: src/std-types/vec.md:16
+#: src/std-types/vec.md
 msgid "// Canonical macro to initialize a vector with elements.\n"
 msgstr ""
 
-#: src/std-types/vec.md:19
+#: src/std-types/vec.md
 msgid "// Retain only the even elements.\n"
 msgstr ""
 
-#: src/std-types/vec.md:21 src/std-types/vec.md:25
+#: src/std-types/vec.md
 msgid "\"{v3:?}\""
 msgstr ""
 
-#: src/std-types/vec.md:23
+#: src/std-types/vec.md
 msgid "// Remove consecutive duplicates.\n"
 msgstr ""
 
-#: src/std-types/vec.md:29
+#: src/std-types/vec.md
 #, fuzzy
 msgid ""
 "`Vec` implements [`Deref<Target = [T]>`](https://doc.rust-lang.org/std/vec/"
@@ -6573,112 +6814,110 @@ msgstr ""
 "struct.Vec.html#deref-methods-%5BT%5D), ce qui signifie que vous pouvez "
 "appeler slice méthodes sur un `Vec`."
 
-#: src/std-types/vec.md:37
+#: src/std-types/vec.md
 msgid ""
 "`Vec` is a type of collection, along with `String` and `HashMap`. The data "
 "it contains is stored on the heap. This means the amount of data doesn't "
-"need to be  known at compile time. It can grow or shrink at runtime."
+"need to be known at compile time. It can grow or shrink at runtime."
 msgstr ""
 
-#: src/std-types/vec.md:40
+#: src/std-types/vec.md
 msgid ""
 "Notice how `Vec<T>` is a generic type too, but you don't have to specify `T` "
 "explicitly. As always with Rust type inference, the `T` was established "
 "during the first `push` call."
 msgstr ""
 
-#: src/std-types/vec.md:42
+#: src/std-types/vec.md
 msgid ""
 "`vec![...]` is a canonical macro to use instead of `Vec::new()` and it "
 "supports adding initial elements to the vector."
 msgstr ""
 
-#: src/std-types/vec.md:44
+#: src/std-types/vec.md
 msgid ""
 "To index the vector you use `[` `]`, but they will panic if out of bounds. "
 "Alternatively, using `get` will return an `Option`. The `pop` function will "
 "remove the last element."
 msgstr ""
 
-#: src/std-types/vec.md:46
+#: src/std-types/vec.md
 msgid ""
 "Slices are covered on day 3. For now, students only need to know that a "
-"value of type `Vec` gives access to all of the documented read-only slice "
-"methods, too."
+"value of type `Vec` gives access to all of the documented slice methods, too."
 msgstr ""
 
-#: src/std-types/hashmap.md:3
+#: src/std-types/hashmap.md
 #, fuzzy
 msgid "Standard hash map with protection against HashDoS attacks:"
 msgstr ""
 "Carte de hachage standard avec protection contre les attaques HashDoS :"
 
-#: src/std-types/hashmap.md:10
+#: src/std-types/hashmap.md
 msgid "\"Adventures of Huckleberry Finn\""
 msgstr ""
 
-#: src/std-types/hashmap.md:11
+#: src/std-types/hashmap.md
 msgid "\"Grimms' Fairy Tales\""
 msgstr ""
 
-#: src/std-types/hashmap.md:12 src/std-types/hashmap.md:19
-#: src/std-types/hashmap.md:27
+#: src/std-types/hashmap.md
 msgid "\"Pride and Prejudice\""
 msgstr ""
 
-#: src/std-types/hashmap.md:14
+#: src/std-types/hashmap.md
 msgid "\"Les Misérables\""
 msgstr ""
 
-#: src/std-types/hashmap.md:15
+#: src/std-types/hashmap.md
 msgid "\"We know about {} books, but not Les Misérables.\""
 msgstr ""
 
-#: src/std-types/hashmap.md:19 src/std-types/hashmap.md:27
+#: src/std-types/hashmap.md
 msgid "\"Alice's Adventure in Wonderland\""
 msgstr ""
 
-#: src/std-types/hashmap.md:21
+#: src/std-types/hashmap.md
 msgid "\"{book}: {count} pages\""
 msgstr ""
 
-#: src/std-types/hashmap.md:22
+#: src/std-types/hashmap.md
 msgid "\"{book} is unknown.\""
 msgstr ""
 
-#: src/std-types/hashmap.md:26
+#: src/std-types/hashmap.md
 msgid "// Use the .entry() method to insert a value if nothing is found.\n"
 msgstr ""
 
-#: src/std-types/hashmap.md:32
+#: src/std-types/hashmap.md
 msgid "\"{page_counts:#?}\""
 msgstr ""
 
-#: src/std-types/hashmap.md:38
+#: src/std-types/hashmap.md
 msgid ""
 "`HashMap` is not defined in the prelude and needs to be brought into scope."
 msgstr ""
 
-#: src/std-types/hashmap.md:39
+#: src/std-types/hashmap.md
 msgid ""
 "Try the following lines of code. The first line will see if a book is in the "
 "hashmap and if not return an alternative value. The second line will insert "
 "the alternative value in the hashmap if the book is not found."
 msgstr ""
 
-#: src/std-types/hashmap.md:43 src/std-types/hashmap.md:54
+#: src/std-types/hashmap.md
 msgid "\"Harry Potter and the Sorcerer's Stone\""
 msgstr ""
 
-#: src/std-types/hashmap.md:46 src/std-types/hashmap.md:55
+#: src/std-types/hashmap.md
 msgid "\"The Hunger Games\""
 msgstr ""
 
-#: src/std-types/hashmap.md:49
+#: src/std-types/hashmap.md
 msgid "Unlike `vec!`, there is unfortunately no standard `hashmap!` macro."
 msgstr ""
 
-#: src/std-types/hashmap.md:50
+#: src/std-types/hashmap.md
 msgid ""
 "Although, since Rust 1.56, HashMap implements [`From<[(K, V); N]>`](https://"
 "doc.rust-lang.org/std/collections/hash_map/struct.HashMap.html#impl-"
@@ -6686,26 +6925,26 @@ msgid ""
 "us to easily initialize a hash map from a literal array:"
 msgstr ""
 
-#: src/std-types/hashmap.md:59
+#: src/std-types/hashmap.md
 msgid ""
 "Alternatively HashMap can be built from any `Iterator` which yields key-"
 "value tuples."
 msgstr ""
 
-#: src/std-types/hashmap.md:60
+#: src/std-types/hashmap.md
 msgid ""
 "We are showing `HashMap<String, i32>`, and avoid using `&str` as key to make "
 "examples easier. Using references in collections can, of course, be done, "
 "but it can lead into complications with the borrow checker."
 msgstr ""
 
-#: src/std-types/hashmap.md:62
+#: src/std-types/hashmap.md
 msgid ""
 "Try removing `to_string()` from the example above and see if it still "
 "compiles. Where do you think we might run into issues?"
 msgstr ""
 
-#: src/std-types/hashmap.md:64
+#: src/std-types/hashmap.md
 msgid ""
 "This type has several \"method-specific\" return types, such as `std::"
 "collections::hash_map::Keys`. These types often appear in searches of the "
@@ -6713,7 +6952,7 @@ msgid ""
 "to the `keys` method."
 msgstr ""
 
-#: src/std-types/exercise.md:3
+#: src/std-types/exercise.md
 msgid ""
 "In this exercise you will take a very simple data structure and make it "
 "generic. It uses a [`std::collections::HashMap`](https://doc.rust-lang.org/"
@@ -6721,116 +6960,150 @@ msgid ""
 "have been seen and how many times each one has appeared."
 msgstr ""
 
-#: src/std-types/exercise.md:9
+#: src/std-types/exercise.md
 msgid ""
 "The initial version of `Counter` is hard coded to only work for `u32` "
 "values. Make the struct and its methods generic over the type of value being "
 "tracked, that way `Counter` can track any type of value."
 msgstr ""
 
-#: src/std-types/exercise.md:13
+#: src/std-types/exercise.md
 msgid ""
 "If you finish early, try using the [`entry`](https://doc.rust-lang.org/"
 "stable/std/collections/struct.HashMap.html#method.entry) method to halve the "
 "number of hash lookups required to implement the `count` method."
 msgstr ""
 
-#: src/std-types/exercise.md:20 src/std-types/solution.md:6
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid ""
 "/// Counter counts the number of times each value of type T has been seen.\n"
 msgstr ""
 
-#: src/std-types/exercise.md:27 src/std-types/solution.md:13
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "/// Create a new Counter.\n"
 msgstr ""
 
-#: src/std-types/exercise.md:34 src/std-types/solution.md:20
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "/// Count an occurrence of the given value.\n"
 msgstr ""
 
-#: src/std-types/exercise.md:43 src/std-types/solution.md:25
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "/// Return the number of times the given value has been seen.\n"
 msgstr ""
 
-#: src/std-types/exercise.md:59 src/std-types/solution.md:41
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "\"saw {} values equal to {}\""
 msgstr ""
 
-#: src/std-types/exercise.md:63 src/std-types/exercise.md:65
-#: src/std-types/exercise.md:66 src/std-types/solution.md:45
-#: src/std-types/solution.md:47 src/std-types/solution.md:48
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "\"apple\""
 msgstr ""
 
-#: src/std-types/exercise.md:64 src/std-types/solution.md:46
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "\"orange\""
 msgstr ""
 
-#: src/std-types/exercise.md:66 src/std-types/solution.md:48
+#: src/std-types/exercise.md src/std-types/solution.md
 msgid "\"got {} apples\""
 msgstr ""
 
-#: src/std-traits.md:7
+#: src/std-traits.md
+msgid "[Comparisons](./std-traits/comparisons.md) (10 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[Operators](./std-traits/operators.md) (10 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[From and Into](./std-traits/from-and-into.md) (10 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[Casting](./std-traits/casting.md) (5 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[Read and Write](./std-traits/read-and-write.md) (10 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[Default, struct update syntax](./std-traits/default.md) (5 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[Closures](./std-traits/closures.md) (20 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "[Exercise: ROT13](./std-traits/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/std-traits.md
+msgid "This segment should take about 1 hour and 40 minutes"
+msgstr ""
+
+#: src/std-traits.md
 msgid ""
 "As with the standard-library types, spend time reviewing the documentation "
 "for each trait."
 msgstr ""
 
-#: src/std-traits.md:10
+#: src/std-traits.md
 msgid "This section is long. Take a break midway through."
 msgstr ""
 
-#: src/std-traits/comparisons.md:3
+#: src/std-traits/comparisons.md
 msgid ""
 "These traits support comparisons between values. All traits can be derived "
 "for types containing fields that implement these traits."
 msgstr ""
 
-#: src/std-traits/comparisons.md:6
+#: src/std-traits/comparisons.md
 msgid "`PartialEq` and `Eq`"
 msgstr ""
 
-#: src/std-traits/comparisons.md:8
+#: src/std-traits/comparisons.md
 msgid ""
 "`PartialEq` is a partial equivalence relation, with required method `eq` and "
 "provided method `ne`. The `==` and `!=` operators will call these methods."
 msgstr ""
 
-#: src/std-traits/comparisons.md:20
+#: src/std-traits/comparisons.md
 msgid ""
 "`Eq` is a full equivalence relation (reflexive, symmetric, and transitive) "
-"and implies `PartialEq`.  Functions that require full equivalence will use "
+"and implies `PartialEq`. Functions that require full equivalence will use "
 "`Eq` as a trait bound."
 msgstr ""
 
-#: src/std-traits/comparisons.md:24
+#: src/std-traits/comparisons.md
 #, fuzzy
 msgid "`PartialOrd` and `Ord`"
 msgstr "`Lire` et `Ecrire`"
 
-#: src/std-traits/comparisons.md:26
+#: src/std-traits/comparisons.md
 msgid ""
 "`PartialOrd` defines a partial ordering, with a `partial_cmp` method. It is "
 "used to implement the `<`, `<=`, `>=`, and `>` operators."
 msgstr ""
 
-#: src/std-traits/comparisons.md:43
+#: src/std-traits/comparisons.md
 msgid "`Ord` is a total ordering, with `cmp` returning `Ordering`."
 msgstr ""
 
-#: src/std-traits/comparisons.md:47
+#: src/std-traits/comparisons.md
 msgid ""
 "`PartialEq` can be implemented between different types, but `Eq` cannot, "
 "because it is reflexive:"
 msgstr ""
 
-#: src/std-traits/comparisons.md:58
+#: src/std-traits/comparisons.md
 msgid ""
 "In practice, it's common to derive these traits, but uncommon to implement "
 "them."
 msgstr ""
 
-#: src/std-traits/operators.md:3
+#: src/std-traits/operators.md
 #, fuzzy
 msgid ""
 "Operator overloading is implemented via traits in [`std::ops`](https://doc."
@@ -6839,16 +7112,16 @@ msgstr ""
 "La surcharge d'opérateur est implémentée via des traits dans [`std::ops`]"
 "(https://doc.rust-lang.org/std/ops/index.html) :"
 
-#: src/std-traits/operators.md:20
+#: src/std-traits/operators.md
 msgid "\"{:?} + {:?} = {:?}\""
 msgstr ""
 
-#: src/std-traits/operators.md:26 src/memory-management/drop.md:45
+#: src/std-traits/operators.md src/memory-management/drop.md
 #, fuzzy
 msgid "Discussion points:"
 msgstr "Points de discussion:"
 
-#: src/std-traits/operators.md:28
+#: src/std-traits/operators.md
 #, fuzzy
 msgid ""
 "You could implement `Add` for `&Point`. In which situations is that useful?"
@@ -6856,7 +7129,7 @@ msgstr ""
 "Vous pouvez implémenter `Add` pour `&Point`. Dans quelles situations est-ce "
 "utile ?"
 
-#: src/std-traits/operators.md:29
+#: src/std-traits/operators.md
 #, fuzzy
 msgid ""
 "Answer: `Add:add` consumes `self`. If type `T` for which you are overloading "
@@ -6869,7 +7142,7 @@ msgstr ""
 "sur le site d'appel. \\* Pourquoi `Output` est-il un type associé ? Pourrait-"
 "il en faire un paramètre de type?"
 
-#: src/std-traits/operators.md:33
+#: src/std-traits/operators.md
 #, fuzzy
 msgid ""
 "Why is `Output` an associated type? Could it be made a type parameter of the "
@@ -6879,20 +7152,20 @@ msgstr ""
 "les types associés (comme `Output`) sont contrôlés par l'implémenteur d'un "
 "trait."
 
-#: src/std-traits/operators.md:34
+#: src/std-traits/operators.md
 msgid ""
 "Short answer: Function type parameters are controlled by the caller, but "
-"associated types (like `Output`) are controlled by the implementor of a "
+"associated types (like `Output`) are controlled by the implementer of a "
 "trait."
 msgstr ""
 
-#: src/std-traits/operators.md:37
+#: src/std-traits/operators.md
 msgid ""
 "You could implement `Add` for two different types, e.g. `impl Add<(i32, "
 "i32)> for Point` would add a tuple to a `Point`."
 msgstr ""
 
-#: src/std-traits/from-and-into.md:3
+#: src/std-traits/from-and-into.md
 #, fuzzy
 msgid ""
 "Types implement [`From`](https://doc.rust-lang.org/std/convert/trait.From."
@@ -6903,11 +7176,11 @@ msgstr ""
 "From.html) et [`Into`](https://doc.rust-lang.org/std/convert/trait.Into."
 "html) pour faciliter les conversions de type :"
 
-#: src/std-traits/from-and-into.md:11 src/std-traits/from-and-into.md:23
+#: src/std-traits/from-and-into.md
 msgid "\"{s}, {addr}, {one}, {bigger}\""
 msgstr ""
 
-#: src/std-traits/from-and-into.md:15
+#: src/std-traits/from-and-into.md
 #, fuzzy
 msgid ""
 "[`Into`](https://doc.rust-lang.org/std/convert/trait.Into.html) is "
@@ -6918,7 +7191,7 @@ msgstr ""
 "automatiquement implémenté lorsque [`From`](https://doc.rust-lang.org/std/"
 "convert/trait.From.html) est implémenté :"
 
-#: src/std-traits/from-and-into.md:29
+#: src/std-traits/from-and-into.md
 #, fuzzy
 msgid ""
 "That's why it is common to only implement `From`, as your type will get "
@@ -6927,7 +7200,7 @@ msgstr ""
 "C'est pourquoi il est courant de n'implémenter que `From`, car votre type "
 "recevra également l'implémentation `Into`."
 
-#: src/std-traits/from-and-into.md:30
+#: src/std-traits/from-and-into.md
 #, fuzzy
 msgid ""
 "When declaring a function argument input type like \"anything that can be "
@@ -6940,32 +7213,32 @@ msgstr ""
 "devez utiliser `Into`. Votre fonction acceptera les types qui implémentent "
 "`From` et ceux qui implémentent _uniquement_ `Into`."
 
-#: src/std-traits/casting.md:3
+#: src/std-traits/casting.md
 msgid ""
 "Rust has no _implicit_ type conversions, but does support explicit casts "
 "with `as`. These generally follow C semantics where those are defined."
 msgstr ""
 
-#: src/std-traits/casting.md:9
+#: src/std-traits/casting.md
 msgid "\"as u16: {}\""
 msgstr ""
 
-#: src/std-traits/casting.md:10
+#: src/std-traits/casting.md
 msgid "\"as i16: {}\""
 msgstr ""
 
-#: src/std-traits/casting.md:11
+#: src/std-traits/casting.md
 msgid "\"as u8: {}\""
 msgstr ""
 
-#: src/std-traits/casting.md:15
+#: src/std-traits/casting.md
 msgid ""
 "The results of `as` are _always_ defined in Rust and consistent across "
-"platforms.  This might not match your intuition for changing sign or casting "
+"platforms. This might not match your intuition for changing sign or casting "
 "to a smaller type -- check the docs, and comment for clarity."
 msgstr ""
 
-#: src/std-traits/casting.md:19
+#: src/std-traits/casting.md
 msgid ""
 "Casting with `as` is a relatively sharp tool that is easy to use "
 "incorrectly, and can be a source of subtle bugs as future maintenance work "
@@ -6975,7 +7248,7 @@ msgid ""
 "was in the high bits)."
 msgstr ""
 
-#: src/std-traits/casting.md:21
+#: src/std-traits/casting.md
 msgid ""
 "For infallible casts (e.g. `u32` to `u64`), prefer using `From` or `Into` "
 "over `as` to confirm that the cast is in fact infallible. For fallible "
@@ -6983,22 +7256,22 @@ msgid ""
 "that fit differently from those that don't."
 msgstr ""
 
-#: src/std-traits/casting.md:26
+#: src/std-traits/casting.md
 msgid "Consider taking a break after this slide."
 msgstr ""
 
-#: src/std-traits/casting.md:28
+#: src/std-traits/casting.md
 msgid ""
-"`as` is similar to a C++ static cast.  Use of `as` in cases where data might "
+"`as` is similar to a C++ static cast. Use of `as` in cases where data might "
 "be lost is generally discouraged, or at least deserves an explanatory "
 "comment."
 msgstr ""
 
-#: src/std-traits/casting.md:31
+#: src/std-traits/casting.md
 msgid "This is common in casting integers to `usize` for use as an index."
 msgstr ""
 
-#: src/std-traits/read-and-write.md:3
+#: src/std-traits/read-and-write.md
 #, fuzzy
 msgid ""
 "Using [`Read`](https://doc.rust-lang.org/std/io/trait.Read.html) and "
@@ -7009,19 +7282,19 @@ msgstr ""
 "[`BufRead`](https://doc.rust-lang.org/std/io/trait.BufRead.html), vous "
 "pouvez résumer les sources `u8` :"
 
-#: src/std-traits/read-and-write.md:14
+#: src/std-traits/read-and-write.md
 msgid "b\"foo\\nbar\\nbaz\\n\""
 msgstr ""
 
-#: src/std-traits/read-and-write.md:15
+#: src/std-traits/read-and-write.md
 msgid "\"lines in slice: {}\""
 msgstr ""
 
-#: src/std-traits/read-and-write.md:18
+#: src/std-traits/read-and-write.md
 msgid "\"lines in file: {}\""
 msgstr ""
 
-#: src/std-traits/read-and-write.md:23
+#: src/std-traits/read-and-write.md
 #, fuzzy
 msgid ""
 "Similarly, [`Write`](https://doc.rust-lang.org/std/io/trait.Write.html) lets "
@@ -7030,24 +7303,24 @@ msgstr ""
 "De même, [`Write`](https://doc.rust-lang.org/std/io/trait.Write.html) vous "
 "permet d'abstraire les puits `u8` :"
 
-#: src/std-traits/read-and-write.md:30
+#: src/std-traits/read-and-write.md
 msgid "\"\\n\""
 msgstr ""
 
-#: src/std-traits/read-and-write.md:36 src/slices-and-lifetimes/str.md:11
+#: src/std-traits/read-and-write.md src/slices-and-lifetimes/str.md
 msgid "\"World\""
 msgstr ""
 
-#: src/std-traits/read-and-write.md:37
+#: src/std-traits/read-and-write.md
 msgid "\"Logged: {:?}\""
 msgstr ""
 
-#: src/std-traits/default.md:1
+#: src/std-traits/default.md
 #, fuzzy
 msgid "The `Default` Trait"
 msgstr "Le trait \"par défaut\""
 
-#: src/std-traits/default.md:3
+#: src/std-traits/default.md
 #, fuzzy
 msgid ""
 "[`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) trait "
@@ -7056,27 +7329,28 @@ msgstr ""
 "[`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) trait "
 "fournit une implémentation par défaut d'un trait."
 
-#: src/std-traits/default.md:18
+#: src/std-traits/default.md
 msgid "\"John Smith\""
 msgstr ""
 
-#: src/std-traits/default.md:24
+#: src/std-traits/default.md
 msgid "\"{default_struct:#?}\""
 msgstr ""
 
-#: src/std-traits/default.md:27
+#: src/std-traits/default.md
 msgid "\"Y is set!\""
 msgstr ""
 
-#: src/std-traits/default.md:30
+#: src/std-traits/default.md
 msgid "\"{almost_default_struct:#?}\""
 msgstr ""
 
-#: src/std-traits/default.md:33
+#: src/std-traits/default.md src/slices-and-lifetimes/exercise.md
+#: src/slices-and-lifetimes/solution.md
 msgid "\"{:#?}\""
 msgstr ""
 
-#: src/std-traits/default.md:40
+#: src/std-traits/default.md
 #, fuzzy
 msgid ""
 "It can be implemented directly or it can be derived via `#[derive(Default)]`."
@@ -7084,7 +7358,7 @@ msgstr ""
 "Il peut être implémenté directement ou il peut être dérivé via "
 "`#[derive(Default)]`."
 
-#: src/std-traits/default.md:41
+#: src/std-traits/default.md
 #, fuzzy
 msgid ""
 "A derived implementation will produce a value where all fields are set to "
@@ -7093,14 +7367,14 @@ msgstr ""
 "L'implémentation dérivée produira une instance où tous les champs sont "
 "définis sur leurs valeurs par défaut."
 
-#: src/std-traits/default.md:42
+#: src/std-traits/default.md
 #, fuzzy
 msgid "This means all types in the struct must implement `Default` too."
 msgstr ""
 "Cela signifie que tous les types de la structure doivent également "
 "implémenter `Default`."
 
-#: src/std-traits/default.md:43
+#: src/std-traits/default.md
 #, fuzzy
 msgid ""
 "Standard Rust types often implement `Default` with reasonable values (e.g. "
@@ -7109,13 +7383,13 @@ msgstr ""
 "Les types Rust standard implémentent souvent `Default` avec des valeurs "
 "raisonnables (par exemple `0`, `\"\"`, etc.)."
 
-#: src/std-traits/default.md:44
+#: src/std-traits/default.md
 #, fuzzy
 msgid "The partial struct initialization works nicely with default."
 msgstr ""
 "La copie de structure partielle fonctionne bien avec la valeur par défaut."
 
-#: src/std-traits/default.md:45
+#: src/std-traits/default.md
 #, fuzzy
 msgid ""
 "The Rust standard library is aware that types can implement `Default` and "
@@ -7124,14 +7398,14 @@ msgstr ""
 "La bibliothèque standard Rust est consciente que les types peuvent "
 "implémenter `Default` et fournit des méthodes pratiques qui l'utilisent."
 
-#: src/std-traits/default.md:46
+#: src/std-traits/default.md
 msgid ""
 "The `..` syntax is called [struct update syntax](https://doc.rust-lang.org/"
 "book/ch05-01-defining-structs.html#creating-instances-from-other-instances-"
 "with-struct-update-syntax)."
 msgstr ""
 
-#: src/std-traits/closures.md:3
+#: src/std-traits/closures.md
 #, fuzzy
 msgid ""
 "Closures or lambda expressions have types which cannot be named. However, "
@@ -7145,24 +7419,24 @@ msgstr ""
 "trait.FnMut.html), et [`FnOnce`](https://doc.rust-lang.org/std/ops/trait."
 "FnOnce.html) :"
 
-#: src/std-traits/closures.md:10
+#: src/std-traits/closures.md
 #, fuzzy
 msgid "\"Calling function on {input}\""
 msgstr "Appel de fonctions non sécurisées"
 
-#: src/std-traits/closures.md:16 src/std-traits/closures.md:17
+#: src/std-traits/closures.md
 msgid "\"add_3: {}\""
 msgstr ""
 
-#: src/std-traits/closures.md:24 src/std-traits/closures.md:25
+#: src/std-traits/closures.md
 msgid "\"accumulate: {}\""
 msgstr ""
 
-#: src/std-traits/closures.md:28
+#: src/std-traits/closures.md
 msgid "\"multiply_sum: {}\""
 msgstr ""
 
-#: src/std-traits/closures.md:34
+#: src/std-traits/closures.md
 #, fuzzy
 msgid ""
 "An `Fn` (e.g. `add_3`) neither consumes nor mutates captured values, or "
@@ -7172,7 +7446,7 @@ msgstr ""
 "Un `Fn` ne consomme ni ne modifie les valeurs capturées, ou peut-être ne "
 "capture rien du tout, il peut donc être appelé plusieurs fois simultanément."
 
-#: src/std-traits/closures.md:37
+#: src/std-traits/closures.md
 #, fuzzy
 msgid ""
 "An `FnMut` (e.g. `accumulate`) might mutate captured values. You can call it "
@@ -7181,7 +7455,7 @@ msgstr ""
 "Un `FnMut` peut faire muter les valeurs capturées, vous pouvez donc "
 "l'appeler plusieurs fois mais pas simultanément."
 
-#: src/std-traits/closures.md:40
+#: src/std-traits/closures.md
 #, fuzzy
 msgid ""
 "If you have an `FnOnce` (e.g. `multiply_sum`), you may only call it once. It "
@@ -7190,7 +7464,7 @@ msgstr ""
 "Si vous avez un \"FnOnce\", vous ne pouvez l'appeler qu'une seule fois. Cela "
 "peut consommer des valeurs capturées."
 
-#: src/std-traits/closures.md:43
+#: src/std-traits/closures.md
 #, fuzzy
 msgid ""
 "`FnMut` is a subtype of `FnOnce`. `Fn` is a subtype of `FnMut` and `FnOnce`. "
@@ -7202,27 +7476,40 @@ msgstr ""
 "`FnOnce` est appelé, et vous pouvez utiliser un `Fn` partout où un `FnMut` "
 "ou `FnOnce` est réclamé."
 
-#: src/std-traits/closures.md:47
+#: src/std-traits/closures.md
+msgid ""
+"When you define a function that takes a closure, you should take `FnOnce` if "
+"you can (i.e. you call it once), or `FnMut` else, and last `Fn`. This allows "
+"the most flexibility for the caller."
+msgstr ""
+
+#: src/std-traits/closures.md
+msgid ""
+"In contrast, when you have a closure, the most flexible you can have is `Fn` "
+"(it can be passed everywhere), then `FnMut`, and lastly `FnOnce`."
+msgstr ""
+
+#: src/std-traits/closures.md
 msgid ""
 "The compiler also infers `Copy` (e.g. for `add_3`) and `Clone` (e.g. "
 "`multiply_sum`), depending on what the closure captures."
 msgstr ""
 
-#: src/std-traits/closures.md:50
+#: src/std-traits/closures.md
 msgid ""
 "By default, closures will capture by reference if they can. The `move` "
 "keyword makes them capture by value."
 msgstr ""
 
-#: src/std-traits/closures.md:58
+#: src/std-traits/closures.md
 msgid "\"Hi\""
 msgstr ""
 
-#: src/std-traits/closures.md:59
+#: src/std-traits/closures.md
 msgid "\"there\""
 msgstr ""
 
-#: src/std-traits/exercise.md:3
+#: src/std-traits/exercise.md
 msgid ""
 "In this example, you will implement the classic [\"ROT13\" cipher](https://"
 "en.wikipedia.org/wiki/ROT13). Copy this code to the playground, and "
@@ -7230,100 +7517,151 @@ msgid ""
 "ensure the result is still valid UTF-8."
 msgstr ""
 
-#: src/std-traits/exercise.md:15
+#: src/std-traits/exercise.md
 msgid "// Implement the `Read` trait for `RotDecoder`.\n"
 msgstr ""
 
-#: src/std-traits/exercise.md:20 src/std-traits/exercise.md:35
-#: src/std-traits/solution.md:26 src/std-traits/solution.md:41
+#: src/std-traits/exercise.md src/std-traits/solution.md
 msgid "\"Gb trg gb gur bgure fvqr!\""
 msgstr ""
 
-#: src/std-traits/exercise.md:40 src/std-traits/solution.md:46
+#: src/std-traits/exercise.md src/std-traits/solution.md
 msgid "\"To get to the other side!\""
 msgstr ""
 
-#: src/std-traits/exercise.md:62
+#: src/std-traits/exercise.md
 msgid ""
 "What happens if you chain two `RotDecoder` instances together, each rotating "
 "by 13 characters?"
 msgstr ""
 
-#: src/std-traits/solution.md:16
+#: src/std-traits/solution.md
 msgid "'A'"
 msgstr ""
 
-#: src/welcome-day-3.md:1
+#: src/welcome-day-3.md
 #, fuzzy
 msgid "Welcome to Day 3"
 msgstr "Bienvenue au jour 3"
 
-#: src/welcome-day-3.md:3
+#: src/welcome-day-3.md
 msgid "Today, we will cover:"
 msgstr ""
 
-#: src/welcome-day-3.md:5
+#: src/welcome-day-3.md
 msgid ""
 "Memory management, lifetimes, and the borrow checker: how Rust ensures "
 "memory safety."
 msgstr ""
 
-#: src/welcome-day-3.md:6
+#: src/welcome-day-3.md
 msgid "Smart pointers: standard library pointer types."
 msgstr ""
 
-#: src/memory-management/review.md:3
+#: src/welcome-day-3.md
+msgid "[Welcome](./welcome-day-3.md) (3 minutes)"
+msgstr ""
+
+#: src/welcome-day-3.md
+msgid "[Memory Management](./memory-management.md) (1 hour and 10 minutes)"
+msgstr ""
+
+#: src/welcome-day-3.md
+msgid "[Smart Pointers](./smart-pointers.md) (45 minutes)"
+msgstr ""
+
+#: src/welcome-day-3.md
+msgid ""
+"Including 10 minute breaks, this session should take about 2 hours and 15 "
+"minutes"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Review of Program Memory](./memory-management/review.md) (5 minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid ""
+"[Approaches to Memory Management](./memory-management/approaches.md) (10 "
+"minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Ownership](./memory-management/ownership.md) (5 minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Move Semantics](./memory-management/move.md) (10 minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Clone](./memory-management/clone.md) (2 minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Copy Types](./memory-management/copy-types.md) (5 minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Drop](./memory-management/drop.md) (10 minutes)"
+msgstr ""
+
+#: src/memory-management.md
+msgid "[Exercise: Builder Type](./memory-management/exercise.md) (20 minutes)"
+msgstr ""
+
+#: src/memory-management/review.md
 msgid "Programs allocate memory in two ways:"
 msgstr ""
 
-#: src/memory-management/review.md:5
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Stack: Continuous area of memory for local variables."
 msgstr "Pile : Zone continue de mémoire pour les variables locales."
 
-#: src/memory-management/review.md:6
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Values have fixed sizes known at compile time."
 msgstr "Les valeurs ont des tailles fixes connues au moment de la compilation."
 
-#: src/memory-management/review.md:7
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Extremely fast: just move a stack pointer."
 msgstr "Extrêmement rapide : il suffit de déplacer un pointeur de pile."
 
-#: src/memory-management/review.md:8
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Easy to manage: follows function calls."
 msgstr "Facile à gérer : suit les appels de fonction."
 
-#: src/memory-management/review.md:9
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Great memory locality."
 msgstr "Grande localité de mémoire."
 
-#: src/memory-management/review.md:11
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Heap: Storage of values outside of function calls."
 msgstr "Heap : Stockage de valeurs en dehors des appels de fonction."
 
-#: src/memory-management/review.md:12
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Values have dynamic sizes determined at runtime."
 msgstr ""
 "Les valeurs ont des tailles dynamiques déterminées au moment de l'exécution."
 
-#: src/memory-management/review.md:13
+#: src/memory-management/review.md
 #, fuzzy
 msgid "Slightly slower than the stack: some book-keeping needed."
 msgstr ""
 "Légèrement plus lent que la pile : une certaine comptabilité est nécessaire."
 
-#: src/memory-management/review.md:14
+#: src/memory-management/review.md
 #, fuzzy
 msgid "No guarantee of memory locality."
 msgstr "Aucune garantie de localisation de la mémoire."
 
-#: src/memory-management/review.md:18
+#: src/memory-management/review.md
 #, fuzzy
 msgid ""
 "Creating a `String` puts fixed-sized metadata on the stack and dynamically "
@@ -7332,13 +7670,13 @@ msgstr ""
 "La création d'une \"chaîne\" place des données de taille fixe sur la pile et "
 "dimensionnées dynamiquement données sur le tas :"
 
-#: src/memory-management/review.md:43
+#: src/memory-management/review.md
 msgid ""
 "Mention that a `String` is backed by a `Vec`, so it has a capacity and "
 "length and can grow if mutable via reallocation on the heap."
 msgstr ""
 
-#: src/memory-management/review.md:45
+#: src/memory-management/review.md
 msgid ""
 "If students ask about it, you can mention that the underlying memory is heap "
 "allocated using the [System Allocator](https://doc.rust-lang.org/std/alloc/"
@@ -7346,21 +7684,21 @@ msgid ""
 "[Allocator API](https://doc.rust-lang.org/std/alloc/index.html)"
 msgstr ""
 
-#: src/memory-management/review.md:49
+#: src/memory-management/review.md
 msgid ""
 "We can inspect the memory layout with `unsafe` Rust. However, you should "
 "point out that this is rightfully unsafe!"
 msgstr ""
 
-#: src/memory-management/review.md:55 src/testing/unit-tests.md:15
+#: src/memory-management/review.md src/testing/unit-tests.md
 msgid "' '"
 msgstr ""
 
-#: src/memory-management/review.md:56
+#: src/memory-management/review.md
 msgid "\"world\""
 msgstr ""
 
-#: src/memory-management/review.md:57
+#: src/memory-management/review.md
 msgid ""
 "// DON'T DO THIS AT HOME! For educational purposes only.\n"
 "    // String provides no guarantees about its layout, so this could lead "
@@ -7368,36 +7706,36 @@ msgid ""
 "    // undefined behavior.\n"
 msgstr ""
 
-#: src/memory-management/review.md:62
+#: src/memory-management/review.md
 msgid "\"ptr = {ptr:#x}, len = {len}, capacity = {capacity}\""
 msgstr ""
 
-#: src/memory-management/approaches.md:3
+#: src/memory-management/approaches.md
 #, fuzzy
 msgid "Traditionally, languages have fallen into two broad categories:"
 msgstr ""
 "Traditionnellement, les langues se répartissent en deux grandes catégories :"
 
-#: src/memory-management/approaches.md:5
+#: src/memory-management/approaches.md
 #, fuzzy
 msgid "Full control via manual memory management: C, C++, Pascal, ..."
 msgstr ""
 "Contrôle total via la gestion manuelle de la mémoire : C, C++, Pascal, ..."
 
-#: src/memory-management/approaches.md:6
+#: src/memory-management/approaches.md
 msgid "Programmer decides when to allocate or free heap memory."
 msgstr ""
 
-#: src/memory-management/approaches.md:7
+#: src/memory-management/approaches.md
 msgid ""
 "Programmer must determine whether a pointer still points to valid memory."
 msgstr ""
 
-#: src/memory-management/approaches.md:8
+#: src/memory-management/approaches.md
 msgid "Studies show, programmers make mistakes."
 msgstr ""
 
-#: src/memory-management/approaches.md:9
+#: src/memory-management/approaches.md
 #, fuzzy
 msgid ""
 "Full safety via automatic memory management at runtime: Java, Python, Go, "
@@ -7406,23 +7744,23 @@ msgstr ""
 "Sécurité totale via la gestion automatique de la mémoire à l'exécution : "
 "Java, Python, Go, Haskell, ..."
 
-#: src/memory-management/approaches.md:10
+#: src/memory-management/approaches.md
 msgid ""
 "A runtime system ensures that memory is not freed until it can no longer be "
 "referenced."
 msgstr ""
 
-#: src/memory-management/approaches.md:11
+#: src/memory-management/approaches.md
 msgid ""
 "Typically implemented with reference counting, garbage collection, or RAII."
 msgstr ""
 
-#: src/memory-management/approaches.md:13
+#: src/memory-management/approaches.md
 #, fuzzy
 msgid "Rust offers a new mix:"
 msgstr "Rust propose un nouveau mix :"
 
-#: src/memory-management/approaches.md:15
+#: src/memory-management/approaches.md
 #, fuzzy
 msgid ""
 "Full control _and_ safety via compile time enforcement of correct memory "
@@ -7431,25 +7769,25 @@ msgstr ""
 "Contrôle total * et * sécurité via l'application du temps de compilation de "
 "la mémoire correcte gestion."
 
-#: src/memory-management/approaches.md:18
+#: src/memory-management/approaches.md
 #, fuzzy
 msgid "It does this with an explicit ownership concept."
 msgstr "Il le fait avec un concept de propriété explicite."
 
-#: src/memory-management/approaches.md:22
+#: src/memory-management/approaches.md
 msgid ""
 "This slide is intended to help students coming from other languages to put "
 "Rust in context."
 msgstr ""
 
-#: src/memory-management/approaches.md:25
+#: src/memory-management/approaches.md
 msgid ""
 "C must manage heap manually with `malloc` and `free`. Common errors include "
 "forgetting to call `free`, calling it multiple times for the same pointer, "
 "or dereferencing a pointer after the memory it points to has been freed."
 msgstr ""
 
-#: src/memory-management/approaches.md:30
+#: src/memory-management/approaches.md
 msgid ""
 "C++ has tools like smart pointers (`unique_ptr`, `shared_ptr`) that take "
 "advantage of language guarantees about calling destructors to ensure memory "
@@ -7457,7 +7795,7 @@ msgid ""
 "tools and create similar bugs to C."
 msgstr ""
 
-#: src/memory-management/approaches.md:35
+#: src/memory-management/approaches.md
 msgid ""
 "Java, Go, and Python rely on the garbage collector to identify memory that "
 "is no longer reachable and discard it. This guarantees that any pointer can "
@@ -7465,7 +7803,7 @@ msgid ""
 "GC has a runtime cost and is difficult to tune properly."
 msgstr ""
 
-#: src/memory-management/approaches.md:40
+#: src/memory-management/approaches.md
 msgid ""
 "Rust's ownership and borrowing model can, in many cases, get the performance "
 "of C, with alloc and free operations precisely where they are required -- "
@@ -7475,7 +7813,7 @@ msgid ""
 "(not covered in this class)."
 msgstr ""
 
-#: src/memory-management/ownership.md:3
+#: src/memory-management/ownership.md
 #, fuzzy
 msgid ""
 "All variable bindings have a _scope_ where they are valid and it is an error "
@@ -7484,14 +7822,14 @@ msgstr ""
 "Toutes les liaisons de variables ont un _scope_ où elles sont valides et "
 "c'est une erreur de utiliser une variable en dehors de sa portée :"
 
-#: src/memory-management/ownership.md:19
+#: src/memory-management/ownership.md
 #, fuzzy
 msgid ""
 "We say that the variable _owns_ the value. Every Rust value has precisely "
 "one owner at all times."
 msgstr "On dit que la variable _possède_ la valeur."
 
-#: src/memory-management/ownership.md:22
+#: src/memory-management/ownership.md
 #, fuzzy
 msgid ""
 "At the end of the scope, the variable is _dropped_ and the data is freed. A "
@@ -7499,60 +7837,59 @@ msgid ""
 msgstr ""
 "A la fin du scope, la variable est _dropped_ et les données sont libérées."
 
-#: src/memory-management/ownership.md:27
+#: src/memory-management/ownership.md
 msgid ""
 "Students familiar with garbage-collection implementations will know that a "
 "garbage collector starts with a set of \"roots\" to find all reachable "
 "memory. Rust's \"single owner\" principle is a similar idea."
 msgstr ""
 
-#: src/memory-management/move.md:3
+#: src/memory-management/move.md
 #, fuzzy
 msgid "An assignment will transfer _ownership_ between variables:"
 msgstr "Une affectation transférera la propriété entre les variables :"
 
-#: src/memory-management/move.md:7
+#: src/memory-management/move.md
 #, fuzzy
 msgid "\"Hello!\""
 msgstr "Bonjour le monde!"
 
-#: src/memory-management/move.md:9 src/slices-and-lifetimes/str.md:15
-#: src/slices-and-lifetimes/str.md:17
+#: src/memory-management/move.md src/slices-and-lifetimes/str.md
 msgid "\"s2: {s2}\""
 msgstr ""
 
-#: src/memory-management/move.md:10
+#: src/memory-management/move.md
 msgid "// println!(\"s1: {s1}\");\n"
 msgstr ""
 
-#: src/memory-management/move.md:14
+#: src/memory-management/move.md
 #, fuzzy
 msgid "The assignment of `s1` to `s2` transfers ownership."
 msgstr "L'affectation de `s1` à `s2` transfère la propriété."
 
-#: src/memory-management/move.md:15
+#: src/memory-management/move.md
 #, fuzzy
 msgid "When `s1` goes out of scope, nothing happens: it does not own anything."
 msgstr ""
 "Lorsque `s1` sort de la portée, rien ne se passe : il n'a pas de propriété."
 
-#: src/memory-management/move.md:16
+#: src/memory-management/move.md
 #, fuzzy
 msgid "When `s2` goes out of scope, the string data is freed."
 msgstr ""
 "Lorsque `s2` sort de la portée, les données de la chaîne sont libérées."
 
-#: src/memory-management/move.md:18
+#: src/memory-management/move.md
 #, fuzzy
 msgid "Before move to `s2`:"
 msgstr "Avant de passer à `s2` :"
 
-#: src/memory-management/move.md:35
+#: src/memory-management/move.md
 #, fuzzy
 msgid "After move to `s2`:"
 msgstr "Après le passage à `s2` :"
 
-#: src/memory-management/move.md:37
+#: src/memory-management/move.md
 msgid ""
 "```bob\n"
 " Stack                             Heap\n"
@@ -7576,7 +7913,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/memory-management/move.md:58
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "When you pass a value to a function, the value is assigned to the function "
@@ -7585,20 +7922,20 @@ msgstr ""
 "Lorsque vous transmettez une valeur à une fonction, la valeur est affectée à "
 "la fonction paramètre. Cela transfère la propriété :"
 
-#: src/memory-management/move.md:63
+#: src/memory-management/move.md
 msgid "\"Hello {name}\""
 msgstr ""
 
-#: src/memory-management/move.md:67 src/android/interoperability/java.md:56
+#: src/memory-management/move.md src/android/interoperability/java.md
 #, fuzzy
 msgid "\"Alice\""
 msgstr "Tranches"
 
-#: src/memory-management/move.md:69
+#: src/memory-management/move.md
 msgid "// say_hello(name);\n"
 msgstr ""
 
-#: src/memory-management/move.md:75
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "Mention that this is the opposite of the defaults in C++, which copies by "
@@ -7608,28 +7945,28 @@ msgstr ""
 "valeur à moins que vous n'utilisiez `std::move` (et que le constructeur de "
 "déplacement soit défini !)."
 
-#: src/memory-management/move.md:77
+#: src/memory-management/move.md
 msgid ""
 "It is only the ownership that moves. Whether any machine code is generated "
 "to manipulate the data itself is a matter of optimization, and such copies "
 "are aggressively optimized away."
 msgstr ""
 
-#: src/memory-management/move.md:79
+#: src/memory-management/move.md
 msgid ""
 "Simple values (such as integers) can be marked `Copy` (see later slides)."
 msgstr ""
 
-#: src/memory-management/move.md:81
+#: src/memory-management/move.md
 #, fuzzy
 msgid "In Rust, clones are explicit (by using `clone`)."
 msgstr "Dans Rust, les clones sont explicites (en utilisant `clone`)."
 
-#: src/memory-management/move.md:83
+#: src/memory-management/move.md
 msgid "In the `say_hello` example:"
 msgstr ""
 
-#: src/memory-management/move.md:85
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "With the first call to `say_hello`, `main` gives up ownership of `name`. "
@@ -7638,7 +7975,7 @@ msgstr ""
 "Avec le premier appel à `say_hello`, `main` abandonne la propriété de "
 "`name`. Ensuite, `name` ne peut plus être utilisé dans `main`."
 
-#: src/memory-management/move.md:86
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "The heap memory allocated for `name` will be freed at the end of the "
@@ -7647,7 +7984,7 @@ msgstr ""
 "La mémoire de tas allouée pour `name` sera libérée à la fin de la fonction "
 "`say_hello`."
 
-#: src/memory-management/move.md:87
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "`main` can retain ownership if it passes `name` as a reference (`&name`) and "
@@ -7656,7 +7993,7 @@ msgstr ""
 "`main` peut conserver la propriété s'il passe `name` comme référence "
 "(`&name`) et si `say_hello` accepte une référence comme paramètre."
 
-#: src/memory-management/move.md:88
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "Alternatively, `main` can pass a clone of `name` in the first call (`name."
@@ -7665,7 +8002,7 @@ msgstr ""
 "Alternativement, `main` peut passer un clone de `name` dans le premier appel "
 "(`name.clone()`)."
 
-#: src/memory-management/move.md:89
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "Rust makes it harder than C++ to inadvertently create copies by making move "
@@ -7675,25 +8012,25 @@ msgstr ""
 "faisant de la sémantique de déplacement la valeur par défaut et en forçant "
 "les programmeurs à rendre les clones explicites."
 
-#: src/memory-management/move.md:93
+#: src/memory-management/move.md
 #, fuzzy
 msgid "Defensive Copies in Modern C++"
 msgstr "Double libération de mémoire en C++ moderne"
 
-#: src/memory-management/move.md:95
+#: src/memory-management/move.md
 #, fuzzy
 msgid "Modern C++ solves this differently:"
 msgstr "Le C++ moderne résout cela différemment :"
 
-#: src/memory-management/move.md:98
+#: src/memory-management/move.md
 msgid "\"Cpp\""
 msgstr ""
 
-#: src/memory-management/move.md:99
+#: src/memory-management/move.md
 msgid "// Duplicate the data in s1.\n"
 msgstr ""
 
-#: src/memory-management/move.md:102
+#: src/memory-management/move.md
 #, fuzzy
 msgid ""
 "The heap data from `s1` is duplicated and `s2` gets its own independent copy."
@@ -7701,31 +8038,31 @@ msgstr ""
 "Les données de tas de `s1` sont dupliquées et `s2` obtient sa propre copie "
 "indépendante."
 
-#: src/memory-management/move.md:103
+#: src/memory-management/move.md
 #, fuzzy
 msgid "When `s1` and `s2` go out of scope, they each free their own memory."
 msgstr ""
 "Lorsque `s1` et `s2` sortent de la portée, ils libèrent chacun leur propre "
 "mémoire."
 
-#: src/memory-management/move.md:105
+#: src/memory-management/move.md
 #, fuzzy
 msgid "Before copy-assignment:"
 msgstr "Avant l'affectation de copie :"
 
-#: src/memory-management/move.md:122
+#: src/memory-management/move.md
 #, fuzzy
 msgid "After copy-assignment:"
 msgstr "Après l'affectation de copie :"
 
-#: src/memory-management/move.md:148
+#: src/memory-management/move.md
 msgid ""
 "C++ has made a slightly different choice than Rust. Because `=` copies data, "
 "the string data has to be cloned. Otherwise we would get a double-free when "
 "either string goes out of scope."
 msgstr ""
 
-#: src/memory-management/move.md:152
+#: src/memory-management/move.md
 msgid ""
 "C++ also has [`std::move`](https://en.cppreference.com/w/cpp/utility/move), "
 "which is used to indicate when a value may be moved from. If the example had "
@@ -7734,36 +8071,36 @@ msgid ""
 "programmer is allowed to keep using `s1`."
 msgstr ""
 
-#: src/memory-management/move.md:157
+#: src/memory-management/move.md
 msgid ""
 "Unlike Rust, `=` in C++ can run arbitrary code as determined by the type "
 "which is being copied or moved."
 msgstr ""
 
-#: src/memory-management/clone.md:1
+#: src/memory-management/clone.md
 msgid "Clone"
 msgstr ""
 
-#: src/memory-management/clone.md:3
+#: src/memory-management/clone.md
 msgid ""
 "Sometimes you _want_ to make a copy of a value. The `Clone` trait "
 "accomplishes this."
 msgstr ""
 
-#: src/memory-management/clone.md:22
+#: src/memory-management/clone.md
 msgid ""
 "The idea of `Clone` is to make it easy to spot where heap allocations are "
 "occurring. Look for `.clone()` and a few others like `Vec::new` or `Box::"
 "new`."
 msgstr ""
 
-#: src/memory-management/clone.md:25
+#: src/memory-management/clone.md
 msgid ""
 "It's common to \"clone your way out\" of problems with the borrow checker, "
 "and return later to try to optimize those clones away."
 msgstr ""
 
-#: src/memory-management/copy-types.md:6
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid ""
 "While move semantics are the default, certain types are copied by default:"
@@ -7771,35 +8108,35 @@ msgstr ""
 "Bien que la sémantique de déplacement soit la valeur par défaut, certains "
 "types sont copiés par défaut :"
 
-#: src/memory-management/copy-types.md:18
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "These types implement the `Copy` trait."
 msgstr "Ces types implémentent le trait \"Copier\"."
 
-#: src/memory-management/copy-types.md:20
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "You can opt-in your own types to use copy semantics:"
 msgstr ""
 "Vous pouvez activer vos propres types pour utiliser la sémantique de copie :"
 
-#: src/memory-management/copy-types.md:35
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "After the assignment, both `p1` and `p2` own their own data."
 msgstr "Après l'affectation, `p1` et `p2` possèdent leurs propres données."
 
-#: src/memory-management/copy-types.md:36
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "We can also use `p1.clone()` to explicitly copy the data."
 msgstr ""
 "Nous pouvons également utiliser `p1.clone()` pour copier explicitement les "
 "données."
 
-#: src/memory-management/copy-types.md:40
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "Copying and cloning are not the same thing:"
 msgstr "La copie et le clonage ne sont pas la même chose :"
 
-#: src/memory-management/copy-types.md:42
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid ""
 "Copying refers to bitwise copies of memory regions and does not work on "
@@ -7808,7 +8145,7 @@ msgstr ""
 "La copie fait référence aux copies au niveau du bit des régions de mémoire "
 "et ne fonctionne pas sur des objets arbitraires."
 
-#: src/memory-management/copy-types.md:43
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid ""
 "Copying does not allow for custom logic (unlike copy constructors in C++)."
@@ -7816,7 +8153,7 @@ msgstr ""
 "La copie ne permet pas de logique personnalisée (contrairement aux "
 "constructeurs de copie en C++)."
 
-#: src/memory-management/copy-types.md:44
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid ""
 "Cloning is a more general operation and also allows for custom behavior by "
@@ -7825,18 +8162,18 @@ msgstr ""
 "Le clonage est une opération plus générale et permet également un "
 "comportement personnalisé en implémentant le trait \"Cloner\"."
 
-#: src/memory-management/copy-types.md:45
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "Copying does not work on types that implement the `Drop` trait."
 msgstr ""
 "La copie ne fonctionne pas sur les types qui implémentent le trait `Drop`."
 
-#: src/memory-management/copy-types.md:47
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "In the above example, try the following:"
 msgstr "Dans l'exemple ci-dessus, essayez ce qui suit :"
 
-#: src/memory-management/copy-types.md:49
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid ""
 "Add a `String` field to `struct Point`. It will not compile because `String` "
@@ -7845,26 +8182,26 @@ msgstr ""
 "Ajoutez un champ `String` à `struct Point`. Il ne sera pas compilé car "
 "`String` n'est pas un type `Copy`."
 
-#: src/memory-management/copy-types.md:50
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid ""
 "Remove `Copy` from the `derive` attribute. The compiler error is now in the "
-"`println!` for  `p1`."
+"`println!` for `p1`."
 msgstr ""
 "Supprimer `Copy` de l'attribut `derive`. L'erreur du compilateur est "
 "maintenant dans `println!` pour `p1`."
 
-#: src/memory-management/copy-types.md:51
+#: src/memory-management/copy-types.md
 #, fuzzy
 msgid "Show that it works if you clone `p1` instead."
 msgstr "Montrez que cela fonctionne si vous clonez `p1` à la place."
 
-#: src/memory-management/drop.md:1
+#: src/memory-management/drop.md
 #, fuzzy
 msgid "The `Drop` Trait"
 msgstr "Le trait `Lâcher`"
 
-#: src/memory-management/drop.md:3
+#: src/memory-management/drop.md
 #, fuzzy
 msgid ""
 "Values which implement [`Drop`](https://doc.rust-lang.org/std/ops/trait.Drop."
@@ -7874,60 +8211,59 @@ msgstr ""
 "trait.Drop.html) peuvent spécifier le code à exécuter lorsqu'elles sortent "
 "de la portée :"
 
-#: src/memory-management/drop.md:12
+#: src/memory-management/drop.md
 msgid "\"Dropping {}\""
 msgstr ""
 
-#: src/memory-management/drop.md:17
-#: src/exercises/concurrency/link-checker.md:92
-#: src/exercises/concurrency/solutions-morning.md:123
+#: src/memory-management/drop.md src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"a\""
 msgstr ""
 
-#: src/memory-management/drop.md:19 src/testing/googletest.md:12
+#: src/memory-management/drop.md src/testing/googletest.md
 msgid "\"b\""
 msgstr ""
 
-#: src/memory-management/drop.md:21
+#: src/memory-management/drop.md
 msgid "\"c\""
 msgstr ""
 
-#: src/memory-management/drop.md:22
+#: src/memory-management/drop.md
 msgid "\"d\""
 msgstr ""
 
-#: src/memory-management/drop.md:23
+#: src/memory-management/drop.md
 msgid "\"Exiting block B\""
 msgstr ""
 
-#: src/memory-management/drop.md:25
+#: src/memory-management/drop.md
 msgid "\"Exiting block A\""
 msgstr ""
 
-#: src/memory-management/drop.md:28
+#: src/memory-management/drop.md
 msgid "\"Exiting main\""
 msgstr ""
 
-#: src/memory-management/drop.md:34
+#: src/memory-management/drop.md
 msgid "Note that `std::mem::drop` is not the same as `std::ops::Drop::drop`."
 msgstr ""
 
-#: src/memory-management/drop.md:35
+#: src/memory-management/drop.md
 msgid "Values are automatically dropped when they go out of scope."
 msgstr ""
 
-#: src/memory-management/drop.md:36
+#: src/memory-management/drop.md
 msgid ""
 "When a value is dropped, if it implements `std::ops::Drop` then its `Drop::"
 "drop` implementation will be called."
 msgstr ""
 
-#: src/memory-management/drop.md:38
+#: src/memory-management/drop.md
 msgid ""
 "All its fields will then be dropped too, whether or not it implements `Drop`."
 msgstr ""
 
-#: src/memory-management/drop.md:39
+#: src/memory-management/drop.md
 msgid ""
 "`std::mem::drop` is just an empty function that takes any value. The "
 "significance is that it takes ownership of the value, so at the end of its "
@@ -7935,18 +8271,18 @@ msgid ""
 "values earlier than they would otherwise go out of scope."
 msgstr ""
 
-#: src/memory-management/drop.md:42
+#: src/memory-management/drop.md
 msgid ""
 "This can be useful for objects that do some work on `drop`: releasing locks, "
 "closing files, etc."
 msgstr ""
 
-#: src/memory-management/drop.md:47
+#: src/memory-management/drop.md
 #, fuzzy
 msgid "Why doesn't `Drop::drop` take `self`?"
 msgstr "Pourquoi `Drop::drop` ne prend-il pas `self` ?"
 
-#: src/memory-management/drop.md:48
+#: src/memory-management/drop.md
 #, fuzzy
 msgid ""
 "Short-answer: If it did, `std::mem::drop` would be called at the end of the "
@@ -7956,112 +8292,134 @@ msgstr ""
 "de le bloc, résultant en un autre appel à `Drop :: drop`, et une pile "
 "débordement!"
 
-#: src/memory-management/drop.md:51
+#: src/memory-management/drop.md
 #, fuzzy
 msgid "Try replacing `drop(a)` with `a.drop()`."
 msgstr "Essayez de remplacer `drop(a)` par `a.drop()`."
 
-#: src/memory-management/exercise.md:3
+#: src/memory-management/exercise.md
 msgid ""
 "In this example, we will implement a complex data type that owns all of its "
 "data. We will use the \"builder pattern\" to support building a new value "
 "piece-by-piece, using convenience functions."
 msgstr ""
 
-#: src/memory-management/exercise.md:7
+#: src/memory-management/exercise.md
 msgid "Fill in the missing pieces."
 msgstr ""
 
-#: src/memory-management/exercise.md:22 src/memory-management/solution.md:16
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "/// A representation of a software package.\n"
 msgstr ""
 
-#: src/memory-management/exercise.md:35
+#: src/memory-management/exercise.md src/memory-management/solution.md
+msgid ""
+"/// Return a representation of this package as a dependency, for use in\n"
+"    /// building other packages.\n"
+msgstr ""
+
+#: src/memory-management/exercise.md
 msgid "\"1\""
 msgstr ""
 
-#: src/memory-management/exercise.md:38 src/memory-management/solution.md:35
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid ""
 "/// A builder for a Package. Use `build()` to create the `Package` itself.\n"
 msgstr ""
 
-#: src/memory-management/exercise.md:44
+#: src/memory-management/exercise.md
 msgid "\"2\""
 msgstr ""
 
-#: src/memory-management/exercise.md:47 src/memory-management/solution.md:50
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "/// Set the package version.\n"
 msgstr ""
 
-#: src/memory-management/exercise.md:53 src/memory-management/solution.md:56
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "/// Set the package authors.\n"
 msgstr ""
 
-#: src/memory-management/exercise.md:55
+#: src/memory-management/exercise.md
 msgid "\"3\""
 msgstr ""
 
-#: src/memory-management/exercise.md:58 src/memory-management/solution.md:62
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "/// Add an additional dependency.\n"
 msgstr ""
 
-#: src/memory-management/exercise.md:60
+#: src/memory-management/exercise.md
 msgid "\"4\""
 msgstr ""
 
-#: src/memory-management/exercise.md:63 src/memory-management/solution.md:68
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "/// Set the language. If not set, language defaults to None.\n"
 msgstr ""
 
-#: src/memory-management/exercise.md:65
+#: src/memory-management/exercise.md
 msgid "\"5\""
 msgstr ""
 
-#: src/memory-management/exercise.md:74 src/memory-management/solution.md:80
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"base64\""
 msgstr ""
 
-#: src/memory-management/exercise.md:74 src/memory-management/solution.md:80
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"0.13\""
 msgstr ""
 
-#: src/memory-management/exercise.md:75 src/memory-management/solution.md:81
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"base64: {base64:?}\""
 msgstr ""
 
-#: src/memory-management/exercise.md:76 src/memory-management/solution.md:82
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"log\""
 msgstr ""
 
-#: src/memory-management/exercise.md:77 src/memory-management/solution.md:83
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"0.4\""
 msgstr ""
 
-#: src/memory-management/exercise.md:80 src/memory-management/solution.md:86
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"log: {log:?}\""
 msgstr ""
 
-#: src/memory-management/exercise.md:81 src/memory-management/solution.md:87
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"serde\""
 msgstr ""
 
-#: src/memory-management/exercise.md:82 src/memory-management/solution.md:88
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"djmitche\""
 msgstr ""
 
-#: src/memory-management/exercise.md:83 src/memory-management/solution.md:89
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"4.0\""
 msgstr ""
 
-#: src/memory-management/exercise.md:87 src/memory-management/solution.md:93
+#: src/memory-management/exercise.md src/memory-management/solution.md
 msgid "\"serde: {serde:?}\""
 msgstr ""
 
-#: src/memory-management/solution.md:43
+#: src/memory-management/solution.md
 msgid "\"0.1\""
 msgstr ""
 
-#: src/smart-pointers/box.md:3
+#: src/smart-pointers.md
+msgid "[Box"
+msgstr ""
+
+#: src/smart-pointers.md
+msgid "](./smart-pointers/box.md) (10 minutes)"
+msgstr ""
+
+#: src/smart-pointers.md
+msgid "[Rc](./smart-pointers/rc.md) (5 minutes)"
+msgstr ""
+
+#: src/smart-pointers.md
+msgid "[Exercise: Binary Tree](./smart-pointers/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "[`Box`](https://doc.rust-lang.org/std/boxed/struct.Box.html) is an owned "
@@ -8070,11 +8428,11 @@ msgstr ""
 "[`Box`](https://doc.rust-lang.org/std/boxed/struct.Box.html) est un pointeur "
 "propriétaire vers des données sur le tas :"
 
-#: src/smart-pointers/box.md:8
+#: src/smart-pointers/box.md
 msgid "\"five: {}\""
 msgstr ""
 
-#: src/smart-pointers/box.md:26
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "`Box<T>` implements `Deref<Target = T>`, which means that you can [call "
@@ -8085,7 +8443,7 @@ msgstr ""
 "[appeler des méthodes depuis `T` directement sur une `Box<T>`](https://doc."
 "rust-lang.org/std/ops/trait.Deref.html#more-on-deref-coercion)."
 
-#: src/smart-pointers/box.md:29
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "Recursive data types or data types with dynamic sizes need to use a `Box`:"
@@ -8093,33 +8451,41 @@ msgstr ""
 "Les types de données récursifs ou les types de données avec des tailles "
 "dynamiques doivent utiliser une `Box` :"
 
-#: src/smart-pointers/box.md:40 src/smart-pointers/box.md:85
+#: src/smart-pointers/box.md
+msgid "/// A non-empty list: first element and the rest of the list.\n"
+msgstr ""
+
+#: src/smart-pointers/box.md
+msgid "/// An empty list.\n"
+msgstr ""
+
+#: src/smart-pointers/box.md
 msgid "\"{list:?}\""
 msgstr ""
 
-#: src/smart-pointers/box.md:44
+#: src/smart-pointers/box.md
 msgid ""
 "```bob\n"
 " Stack                           Heap\n"
-".- - - - - - - - - - - - -.     .- - - - - - - - - - - - - - - - - - - - - - "
-"- -.\n"
-":                         :     :                                               :\n"
+".- - - - - - - - - - - - - - .     .- - - - - - - - - - - - - - - - - - - - "
+"- - - - -.\n"
+":                            :     :                                                 :\n"
 ":    "
-"list                 :     :                                               :\n"
-":   +------+----+----+    :     :    +------+----+----+    +------+----+----"
-"+   :\n"
-":   | Cons | 1  | o--+----+-----+--->| Cons | 2  | o--+--->| Nil  | // | // "
-"|   :\n"
-":   +------+----+----+    :     :    +------+----+----+    +------+----+----"
-"+   :\n"
-":                         :     :                                               :\n"
-":                         :     :                                               :\n"
-"'- - - - - - - - - - - - -'     '- - - - - - - - - - - - - - - - - - - - - - "
-"- -'\n"
+"list                    :     :                                                 :\n"
+":   +---------+----+----+    :     :    +---------+----+----+    +------+----"
+"+----+  :\n"
+":   | Element | 1  | o--+----+-----+--->| Element | 2  | o--+--->| Nil  | // "
+"| // |  :\n"
+":   +---------+----+----+    :     :    +---------+----+----+    +------+----"
+"+----+  :\n"
+":                            :     :                                                 :\n"
+":                            :     :                                                 :\n"
+"'- - - - - - - - - - - - - - '     '- - - - - - - - - - - - - - - - - - - - "
+"- - - - -'\n"
 "```"
 msgstr ""
 
-#: src/smart-pointers/box.md:58
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "`Box` is like `std::unique_ptr` in C++, except that it's guaranteed to be "
@@ -8128,21 +8494,12 @@ msgstr ""
 "`Box` est comme `std::unique_ptr` en C++, sauf qu'il est garanti qu'il n'est "
 "pas nul."
 
-#: src/smart-pointers/box.md:59
-#, fuzzy
-msgid ""
-"In the above example, you can even leave out the `*` in the `println!` "
-"statement thanks to `Deref`."
-msgstr ""
-"Dans l'exemple ci-dessus, vous pouvez même omettre le `*` dans l'instruction "
-"`println!` grâce à `Deref`."
-
-#: src/smart-pointers/box.md:60
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid "A `Box` can be useful when you:"
 msgstr "Une `Box` peut être utile lorsque vous :"
 
-#: src/smart-pointers/box.md:61
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "have a type whose size that can't be known at compile time, but the Rust "
@@ -8151,7 +8508,7 @@ msgstr ""
 "avoir un type dont la taille ne peut pas être connue au moment de la "
 "compilation, mais le compilateur Rust veut connaître une taille exacte."
 
-#: src/smart-pointers/box.md:62
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "want to transfer ownership of a large amount of data. To avoid copying large "
@@ -8162,7 +8519,7 @@ msgstr ""
 "éviter de copier de grandes quantités de données sur la pile, stockez plutôt "
 "les données sur le tas dans une `Box` afin que seul le pointeur soit déplacé."
 
-#: src/smart-pointers/box.md:64
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "If `Box` was not used and we attempted to embed a `List` directly into the "
@@ -8173,7 +8530,7 @@ msgstr ""
 "`List` directement dans la `List`, le compilateur ne calculerait pas une "
 "taille fixe de la structure en mémoire, elle semblerait infinie."
 
-#: src/smart-pointers/box.md:67
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "`Box` solves this problem as it has the same size as a regular pointer and "
@@ -8182,7 +8539,7 @@ msgstr ""
 "`Box` résout ce problème car il a la même taille qu'un pointeur normal et "
 "pointe simplement vers le prochain élément de la `Liste` dans le tas."
 
-#: src/smart-pointers/box.md:70
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "Remove the `Box` in the List definition and show the compiler error. "
@@ -8194,11 +8551,11 @@ msgstr ""
 "peut-être utiliser une boîte ou une référence quelconque, au lieu de stocker "
 "une valeur directement."
 
-#: src/smart-pointers/box.md:74
+#: src/smart-pointers/box.md
 msgid "Niche Optimization"
 msgstr "Optimisation niche"
 
-#: src/smart-pointers/box.md:89
+#: src/smart-pointers/box.md
 #, fuzzy
 msgid ""
 "A `Box` cannot be empty, so the pointer is always valid and non-`null`. This "
@@ -8207,29 +8564,23 @@ msgstr ""
 "Une `Box` ne peut pas être vide, donc le pointeur est toujours valide et non "
 "`null`. Ce permet au compilateur d'optimiser la disposition de la mémoire :"
 
-#: src/smart-pointers/box.md:92
+#: src/smart-pointers/box.md
 msgid ""
 "```bob\n"
 " Stack                           Heap\n"
-".- - - - - - - - - - - - -.     .- - - - - - - - - - - - - - - - - - - - - - "
-"-.\n"
-":                         :     :                                             :\n"
-":    "
-"list                 :     :                                             :\n"
-":   +----+----+           :     :    +----+----+    +----+------"
-"+             :\n"
-":   | 1  | o--+-----------+-----+--->| 2  | o--+--->| // | null "
-"|             :\n"
-":   +----+----+           :     :    +----+----+    +----+------"
-"+             :\n"
-":                         :     :                                             :\n"
-":                         :     :                                             :\n"
-"`- - - - - - - - - - - - -'     '- - - - - - - - - - - - - - - - - - - - - - "
-"-'\n"
+".- - - - - - - - - - - - - - .     .- - - - - - - - - - - - - -.\n"
+":                            :     :                           :\n"
+":    list                    :     :                           :\n"
+":   +---------+----+----+    :     :    +---------+----+----+  :\n"
+":   | Element | 1  | o--+----+-----+--->| Element | 2  | // |  :\n"
+":   +---------+----+----+    :     :    +---------+----+----+  :\n"
+":                            :     :                           :\n"
+":                            :     :                           :\n"
+"'- - - - - - - - - - - - - - '     '- - - - - - - - - - - - - -'\n"
 "```"
 msgstr ""
 
-#: src/smart-pointers/rc.md:3
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "[`Rc`](https://doc.rust-lang.org/std/rc/struct.Rc.html) is a reference-"
@@ -8240,15 +8591,15 @@ msgstr ""
 "partagé compté par référence. Utilisez-le lorsque vous avez besoin de vous "
 "référer aux mêmes données depuis plusieurs endroits :"
 
-#: src/smart-pointers/rc.md:13
+#: src/smart-pointers/rc.md
 msgid "\"a: {a}\""
 msgstr ""
 
-#: src/smart-pointers/rc.md:14
+#: src/smart-pointers/rc.md
 msgid "\"b: {b}\""
 msgstr ""
 
-#: src/smart-pointers/rc.md:18
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "See [`Arc`](../concurrency/shared_state/arc.md) and [`Mutex`](https://doc."
@@ -8258,7 +8609,7 @@ msgstr ""
 "Voir [`Arc`](https://doc.rust-lang.org/std/sync/struct.Mutex.html) si vous "
 "êtes dans un contexte multi-thread."
 
-#: src/smart-pointers/rc.md:19
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "You can _downgrade_ a shared pointer into a [`Weak`](https://doc.rust-lang."
@@ -8268,7 +8619,7 @@ msgstr ""
 "(https://doc.rust-lang.org/std/rc/struct.Weak.html) pour créer des cycles "
 "qui va tomber."
 
-#: src/smart-pointers/rc.md:29
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "`Rc`'s count ensures that its contained value is valid for as long as there "
@@ -8277,12 +8628,12 @@ msgstr ""
 "Le comptage de `Rc` garantit que sa valeur contenue est valide tant qu'il y "
 "a des références."
 
-#: src/smart-pointers/rc.md:30
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid "`Rc` in Rust is like `std::shared_ptr` in C++."
 msgstr "Comme `std::shared_ptr` de C++."
 
-#: src/smart-pointers/rc.md:31
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "`Rc::clone` is cheap: it creates a pointer to the same allocation and "
@@ -8294,7 +8645,7 @@ msgstr ""
 "généralement être ignoré lors de la recherche de problèmes de performances "
 "dans le code."
 
-#: src/smart-pointers/rc.md:32
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "`make_mut` actually clones the inner value if necessary (\"clone-on-write\") "
@@ -8303,12 +8654,12 @@ msgstr ""
 "`make_mut` clone en fait la valeur interne si nécessaire (\"clone-on-"
 "write\") et renvoie une référence mutable."
 
-#: src/smart-pointers/rc.md:33
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid "Use `Rc::strong_count` to check the reference count."
 msgstr "Utilisez `Rc::strong_count` pour vérifier le nombre de références."
 
-#: src/smart-pointers/rc.md:34
+#: src/smart-pointers/rc.md
 #, fuzzy
 msgid ""
 "`Rc::downgrade` gives you a _weakly reference-counted_ object to create "
@@ -8318,7 +8669,7 @@ msgstr ""
 "référence_ pour créer des cycles qui seront supprimés correctement "
 "(probablement en combinaison avec `RefCell`)."
 
-#: src/smart-pointers/exercise.md:3
+#: src/smart-pointers/exercise.md
 msgid ""
 "A binary tree is a tree-type data structure where every node has two "
 "children (left and right). We will create a tree where each node stores a "
@@ -8326,36 +8677,75 @@ msgid ""
 "values, and all nodes in N's right subtree will contain larger values."
 msgstr ""
 
-#: src/smart-pointers/exercise.md:8
+#: src/smart-pointers/exercise.md
 msgid "Implement the following types, so that the given tests pass."
 msgstr ""
 
-#: src/smart-pointers/exercise.md:17 src/smart-pointers/solution.md:10
+#: src/smart-pointers/exercise.md
+msgid ""
+"Extra Credit: implement an iterator over a binary tree that returns the "
+"values in order."
+msgstr ""
+
+#: src/smart-pointers/exercise.md src/smart-pointers/solution.md
+msgid "/// A node in the binary tree.\n"
+msgstr ""
+
+#: src/smart-pointers/exercise.md src/smart-pointers/solution.md
+msgid "/// A possibly-empty subtree.\n"
+msgstr ""
+
+#: src/smart-pointers/exercise.md src/smart-pointers/solution.md
 msgid ""
 "/// A container storing a set of values, using a binary tree.\n"
 "///\n"
 "/// If the same value is added multiple times, it is only stored once.\n"
 msgstr ""
 
-#: src/smart-pointers/exercise.md:23
-msgid "// Implement `new`, `insert`, and `has`.\n"
+#: src/smart-pointers/exercise.md
+msgid "// Implement `new`, `insert`, `len`, and `has`.\n"
 msgstr ""
 
-#: src/smart-pointers/exercise.md:38 src/smart-pointers/solution.md:84
+#: src/smart-pointers/exercise.md src/smart-pointers/solution.md
 msgid "// not a unique item\n"
 msgstr ""
 
-#: src/smart-pointers/exercise.md:73
-msgid ""
-"Extra Credit: implement an iterator over a binary tree that returns the "
-"values in order."
-msgstr ""
-
-#: src/smart-pointers/solution.md:68 src/testing/googletest.md:11
+#: src/smart-pointers/solution.md src/testing/googletest.md
 msgid "\"bar\""
 msgstr ""
 
-#: src/borrowing/shared.md:3
+#: src/welcome-day-3-afternoon.md
+msgid "[Borrowing](./borrowing.md) (1 hour)"
+msgstr ""
+
+#: src/welcome-day-3-afternoon.md
+msgid ""
+"[Slices and Lifetimes](./slices-and-lifetimes.md) (1 hour and 10 minutes)"
+msgstr ""
+
+#: src/welcome-day-3-afternoon.md
+msgid ""
+"Including 10 minute breaks, this session should take about 2 hours and 20 "
+"minutes"
+msgstr ""
+
+#: src/borrowing.md
+msgid "[Borrowing a Value](./borrowing/shared.md) (10 minutes)"
+msgstr ""
+
+#: src/borrowing.md
+msgid "[Borrow Checking](./borrowing/borrowck.md) (10 minutes)"
+msgstr ""
+
+#: src/borrowing.md
+msgid "[Interior Mutability](./borrowing/interior-mutability.md) (10 minutes)"
+msgstr ""
+
+#: src/borrowing.md
+msgid "[Exercise: Health Statistics](./borrowing/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/borrowing/shared.md
 #, fuzzy
 msgid ""
 "As we saw before, instead of transferring ownership when calling a function, "
@@ -8364,28 +8754,28 @@ msgstr ""
 "Au lieu de transférer la propriété lors de l'appel d'une fonction, vous "
 "pouvez laisser une la fonction _emprunte_ la valeur :"
 
-#: src/borrowing/shared.md:23
+#: src/borrowing/shared.md
 #, fuzzy
 msgid "The `add` function _borrows_ two points and returns a new point."
 msgstr "La fonction `add` _emprunte_ deux points et renvoie un nouveau point."
 
-#: src/borrowing/shared.md:24
+#: src/borrowing/shared.md
 #, fuzzy
 msgid "The caller retains ownership of the inputs."
 msgstr "L'appelant conserve la propriété des entrées."
 
-#: src/borrowing/shared.md:28
+#: src/borrowing/shared.md
 msgid ""
 "This slide is a review of the material on references from day 1, expanding "
 "slightly to include function arguments and return values."
 msgstr ""
 
-#: src/borrowing/shared.md:33
+#: src/borrowing/shared.md
 #, fuzzy
 msgid "Notes on stack returns:"
 msgstr "Remarques sur les retours de pile :"
 
-#: src/borrowing/shared.md:35
+#: src/borrowing/shared.md
 msgid ""
 "Demonstrate that the return from `add` is cheap because the compiler can "
 "eliminate the copy operation. Change the above code to print stack addresses "
@@ -8396,11 +8786,11 @@ msgid ""
 "the same when changing to the \"RELEASE\" setting:"
 msgstr ""
 
-#: src/borrowing/shared.md:56
+#: src/borrowing/shared.md
 msgid "The Rust compiler can do return value optimization (RVO)."
 msgstr ""
 
-#: src/borrowing/shared.md:57
+#: src/borrowing/shared.md
 msgid ""
 "In C++, copy elision has to be defined in the language specification because "
 "constructors can have side effects. In Rust, this is not an issue at all. If "
@@ -8408,7 +8798,7 @@ msgid ""
 "copy."
 msgstr ""
 
-#: src/borrowing/borrowck.md:3
+#: src/borrowing/borrowck.md
 #, fuzzy
 msgid ""
 "Rust's _borrow checker_ puts constraints on the ways you can borrow values. "
@@ -8417,23 +8807,23 @@ msgstr ""
 "Rust impose des contraintes sur la manière dont vous pouvez emprunter des "
 "valeurs :"
 
-#: src/borrowing/borrowck.md:5
+#: src/borrowing/borrowck.md
 #, fuzzy
 msgid "You can have one or more shared references to the value, _or_"
 msgstr "Vous pouvez avoir une ou plusieurs valeurs `&T` à tout moment, _ou_"
 
-#: src/borrowing/borrowck.md:6
+#: src/borrowing/borrowck.md
 #, fuzzy
 msgid "You can have exactly one exclusive reference to the value."
 msgstr "Vous pouvez avoir exactement une valeur `&mut T`."
 
-#: src/borrowing/borrowck.md:26
+#: src/borrowing/borrowck.md
 msgid ""
 "Note that the requirement is that conflicting references not _exist_ at the "
 "same point. It does not matter where the reference is dereferenced."
 msgstr ""
 
-#: src/borrowing/borrowck.md:27
+#: src/borrowing/borrowck.md
 #, fuzzy
 msgid ""
 "The above code does not compile because `a` is borrowed as mutable (through "
@@ -8442,7 +8832,7 @@ msgstr ""
 "Le code ci-dessus ne se compile pas car 'a' est emprunté comme mutable (via "
 "'c') et comme immuable (via 'b') en même temps."
 
-#: src/borrowing/borrowck.md:28
+#: src/borrowing/borrowck.md
 #, fuzzy
 msgid ""
 "Move the `println!` statement for `b` before the scope that introduces `c` "
@@ -8451,7 +8841,7 @@ msgstr ""
 "Déplacez l'instruction `println!` pour `b` avant la portée qui introduit `c` "
 "pour que le code soit compilé."
 
-#: src/borrowing/borrowck.md:29
+#: src/borrowing/borrowck.md
 #, fuzzy
 msgid ""
 "After that change, the compiler realizes that `b` is only ever used before "
@@ -8463,7 +8853,7 @@ msgstr ""
 "fonctionnalité du vérificateur d'emprunt appelée \"durées de vie non "
 "lexicales\"."
 
-#: src/borrowing/borrowck.md:30
+#: src/borrowing/borrowck.md
 msgid ""
 "The exclusive reference constraint is quite strong. Rust uses it to ensure "
 "that data races do not occur. Rust also _relies_ on this constraint to "
@@ -8471,7 +8861,7 @@ msgid ""
 "cached in a register for the lifetime of that reference."
 msgstr ""
 
-#: src/borrowing/borrowck.md:31
+#: src/borrowing/borrowck.md
 msgid ""
 "The borrow checker is designed to accommodate many common patterns, such as "
 "taking exclusive references to different fields in a struct at the same "
@@ -8479,64 +8869,81 @@ msgid ""
 "this often results in \"fighting with the borrow checker.\""
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:6
+#: src/borrowing/interior-mutability.md
 msgid ""
-"Rust provides a few safe means of modifying a value given only a shared "
-"reference to that value. All of these replace compile-time checks with "
-"runtime checks."
+"In some situations, it's necessary to modify data behind a shared (read-"
+"only) reference. For example, a shared data structure might have an internal "
+"cache, and wish to update that cache from read-only methods."
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:10
-msgid "`Cell` and `RefCell`"
+#: src/borrowing/interior-mutability.md
+msgid ""
+"The \"interior mutability\" pattern allows exclusive (mutable) access behind "
+"a shared reference. The standard library provides several ways to do this, "
+"all while still ensuring safety, typically by performing a runtime check."
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:12
+#: src/borrowing/interior-mutability.md
 #, fuzzy
-msgid ""
-"[`Cell`](https://doc.rust-lang.org/std/cell/struct.Cell.html) and [`RefCell`]"
-"(https://doc.rust-lang.org/std/cell/struct.RefCell.html) implement what Rust "
-"calls _interior mutability:_ mutation of values in an immutable context."
-msgstr ""
-"En utilisant [`Read`](https://doc.rust-lang.org/std/io/trait.Read.html) et "
-"[`BufRead`](https://doc.rust-lang.org/std/io/trait.BufRead.html), vous "
-"pouvez résumer les sources `u8` :"
+msgid "`RefCell`"
+msgstr "`RefCell<T>`"
 
-#: src/borrowing/interior-mutability.md:17
-msgid ""
-"`Cell` is typically used for simple types, as it requires copying or moving "
-"values. More complex interior types typically use `RefCell`, which tracks "
-"shared and exclusive references at runtime and panics if they are misused."
-msgstr ""
-
-#: src/borrowing/interior-mutability.md:49
+#: src/borrowing/interior-mutability.md
 msgid "\"graph: {root:#?}\""
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:50
+#: src/borrowing/interior-mutability.md
 msgid "\"graph sum: {}\""
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:56
+#: src/borrowing/interior-mutability.md
+#, fuzzy
+msgid "`Cell`"
+msgstr "`Cellule<T>`"
+
+#: src/borrowing/interior-mutability.md
 msgid ""
-"If we were using `Cell` instead of `RefCell` in this example, we would have "
-"to move the `Node` out of the `Rc` to push children, then move it back in. "
-"This is safe because there's always one, un-referenced value in the cell, "
-"but it's not ergonomic."
+"`Cell` wraps a value and allows getting or setting the value, even with a "
+"shared reference to the `Cell`. However, it does not allow any references to "
+"the value. Since there are no references, borrowing rules cannot be broken."
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:57
+#: src/borrowing/interior-mutability.md
 msgid ""
-"To do anything with a Node, you must call a `RefCell` method, usually "
-"`borrow` or `borrow_mut`."
+"The main thing to take away from this slide is that Rust provides _safe_ "
+"ways to modify data behind a shared reference. There are a variety of ways "
+"to ensure that safety, and `RefCell` and `Cell` are two of them."
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:58
+#: src/borrowing/interior-mutability.md
+msgid ""
+"`RefCell` enforces Rust's usual borrowing rules (either multiple shared "
+"references or a single exclusive reference) with a runtime check. In this "
+"case, all borrows are very short and never overlap, so the checks always "
+"succeed."
+msgstr ""
+
+#: src/borrowing/interior-mutability.md
+msgid ""
+"`Rc` only allows shared (read-only) access to its contents, since its "
+"purpose is to allow (and count) many references. But we want to modify the "
+"value, so we need interior mutability."
+msgstr ""
+
+#: src/borrowing/interior-mutability.md
+msgid ""
+"`Cell` is a simpler means to ensure safety: it has a `set` method that takes "
+"`&self`. This needs no runtime check, but requires moving values, which can "
+"have its own cost."
+msgstr ""
+
+#: src/borrowing/interior-mutability.md
 msgid ""
 "Demonstrate that reference loops can be created by adding `root` to `subtree."
-"children` (don't try to print it!)."
+"children`."
 msgstr ""
 
-#: src/borrowing/interior-mutability.md:59
+#: src/borrowing/interior-mutability.md
 msgid ""
 "To demonstrate a runtime panic, add a `fn inc(&mut self)` that increments "
 "`self.value` and calls the same method on its children. This will panic in "
@@ -8544,7 +8951,7 @@ msgid ""
 "borrowed: BorrowMutError'`."
 msgstr ""
 
-#: src/borrowing/exercise.md:3
+#: src/borrowing/exercise.md
 #, fuzzy
 msgid ""
 "You're working on implementing a health-monitoring system. As part of that, "
@@ -8554,64 +8961,91 @@ msgstr ""
 "Dans le cadre de cela, vous besoin de suivre les statistiques de santé des "
 "utilisateurs."
 
-#: src/borrowing/exercise.md:6
+#: src/borrowing/exercise.md
 #, fuzzy
 msgid ""
-"You'll start with some stubbed functions in an `impl` block as well as a "
-"`User` struct definition. Your goal is to implement the stubbed out methods "
-"on the `User` `struct` defined in the `impl` block."
+"You'll start with a stubbed function in an `impl` block as well as a `User` "
+"struct definition. Your goal is to implement the stubbed out method on the "
+"`User` `struct` defined in the `impl` block."
 msgstr ""
 "Vous commencerez avec quelques fonctions stub dans un bloc `impl` ainsi "
 "qu'un `User` définition de structure. Votre objectif est d'implémenter les "
 "méthodes tronquées sur le `User` `struct` défini dans le bloc `impl`."
 
-#: src/borrowing/exercise.md:10
+#: src/borrowing/exercise.md
 #, fuzzy
 msgid ""
 "Copy the code below to <https://play.rust-lang.org/> and fill in the missing "
-"methods:"
+"method:"
 msgstr ""
 "Copiez le code ci-dessous sur <https://play.rust-lang.org/> et remplissez "
 "les champs manquants méthodes :"
 
-#: src/borrowing/exercise.md:51
+#: src/borrowing/exercise.md
 msgid ""
 "\"Update a user's statistics based on measurements from a visit to the "
 "doctor\""
 msgstr ""
 
-#: src/borrowing/exercise.md:56 src/borrowing/exercise.md:62
-#: src/borrowing/exercise.md:68 src/borrowing/solution.md:58
-#: src/borrowing/solution.md:64 src/borrowing/solution.md:70
-#: src/android/build-rules/library.md:43 src/android/aidl/client.md:23
+#: src/borrowing/exercise.md src/borrowing/solution.md
+#: src/android/build-rules/library.md src/android/aidl/client.md
 msgid "\"Bob\""
 msgstr ""
 
-#: src/borrowing/exercise.md:57 src/borrowing/solution.md:59
+#: src/borrowing/exercise.md src/borrowing/solution.md
 msgid "\"I'm {} and my age is {}\""
 msgstr ""
 
-#: src/slices-and-lifetimes/slices.md:1
+#: src/slices-and-lifetimes.md
+msgid "[Slices: &\\[T\\]](./slices-and-lifetimes/slices.md) (10 minutes)"
+msgstr ""
+
+#: src/slices-and-lifetimes.md
+msgid "[String References](./slices-and-lifetimes/str.md) (10 minutes)"
+msgstr ""
+
+#: src/slices-and-lifetimes.md
+msgid ""
+"[Lifetime Annotations](./slices-and-lifetimes/lifetime-annotations.md) (10 "
+"minutes)"
+msgstr ""
+
+#: src/slices-and-lifetimes.md
+msgid ""
+"[Lifetime Elision](./slices-and-lifetimes/lifetime-elision.md) (5 minutes)"
+msgstr ""
+
+#: src/slices-and-lifetimes.md
+msgid ""
+"[Struct Lifetimes](./slices-and-lifetimes/struct-lifetimes.md) (5 minutes)"
+msgstr ""
+
+#: src/slices-and-lifetimes.md
+msgid ""
+"[Exercise: Protobuf Parsing](./slices-and-lifetimes/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/slices-and-lifetimes/slices.md
 msgid "Slices"
 msgstr "Tranches"
 
-#: src/slices-and-lifetimes/slices.md:3
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid "A slice gives you a view into a larger collection:"
 msgstr "Une tranche vous donne une vue dans une plus grande collection :"
 
-#: src/slices-and-lifetimes/slices.md:17
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid "Slices borrow data from the sliced type."
 msgstr ""
 "Les tranches empruntent des données au type en tranches. \\* Question : Que "
 "se passe-t-il si vous modifiez `a[3]` ?"
 
-#: src/slices-and-lifetimes/slices.md:18
+#: src/slices-and-lifetimes/slices.md
 msgid "Question: What happens if you modify `a[3]` right before printing `s`?"
 msgstr ""
 
-#: src/slices-and-lifetimes/slices.md:22
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "We create a slice by borrowing `a` and specifying the starting and ending "
@@ -8620,7 +9054,7 @@ msgstr ""
 "Nous créons une tranche en empruntant `a` et en spécifiant les index de "
 "début et de fin entre parenthèses."
 
-#: src/slices-and-lifetimes/slices.md:24
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "If the slice starts at index 0, Rust’s range syntax allows us to drop the "
@@ -8631,7 +9065,7 @@ msgstr ""
 "de supprimer l'index de départ, ce qui signifie que `&a[0..a.len()]` et "
 "`&a[..a.len()]` sont identiques ."
 
-#: src/slices-and-lifetimes/slices.md:26
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "The same is true for the last index, so `&a[2..a.len()]` and `&a[2..]` are "
@@ -8640,7 +9074,7 @@ msgstr ""
 "Il en va de même pour le dernier index, donc `&a[2..a.len()]` et `&a[2..]` "
 "sont identiques."
 
-#: src/slices-and-lifetimes/slices.md:28
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "To easily create a slice of the full array, we can therefore use `&a[..]`."
@@ -8648,7 +9082,7 @@ msgstr ""
 "Pour créer facilement une tranche du tableau complet, on peut donc utiliser "
 "`&a[..]`."
 
-#: src/slices-and-lifetimes/slices.md:30
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "`s` is a reference to a slice of `i32`s. Notice that the type of `s` "
@@ -8659,7 +9093,7 @@ msgstr ""
 "(`&[i32]`) ne mentionne plus la longueur du tableau. Cela nous permet "
 "d'effectuer des calculs sur des tranches de tailles différentes."
 
-#: src/slices-and-lifetimes/slices.md:32
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "Slices always borrow from another object. In this example, `a` has to remain "
@@ -8669,7 +9103,7 @@ msgstr ""
 "doit rester \"vivant\" (dans la portée) au moins aussi longtemps que notre "
 "tranche."
 
-#: src/slices-and-lifetimes/slices.md:34
+#: src/slices-and-lifetimes/slices.md
 #, fuzzy
 msgid ""
 "The question about modifying `a[3]` can spark an interesting discussion, but "
@@ -8684,75 +9118,75 @@ msgstr ""
 "mais vous pouvez lire les données de `a` et `s` en toute sécurité. Plus de "
 "détails seront expliqués dans la section Vérificateur d'emprunt."
 
-#: src/slices-and-lifetimes/str.md:6
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "We can now understand the two string types in Rust: `&str` is almost like "
 "`&[char]`, but with its data stored in a variable-length encoding (UTF-8)."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:12
+#: src/slices-and-lifetimes/str.md
 msgid "\"s1: {s1}\""
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:14
+#: src/slices-and-lifetimes/str.md
 #, fuzzy
 msgid "\"Hello \""
 msgstr "Bonjour le monde!"
 
-#: src/slices-and-lifetimes/str.md:20
+#: src/slices-and-lifetimes/str.md
 msgid "\"s3: {s3}\""
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:24
+#: src/slices-and-lifetimes/str.md
 #, fuzzy
 msgid "Rust terminology:"
 msgstr "Terminologie de Rust :"
 
-#: src/slices-and-lifetimes/str.md:26
+#: src/slices-and-lifetimes/str.md
 #, fuzzy
 msgid "`&str` an immutable reference to a string slice."
 msgstr "`&str` une référence immuable à une tranche de chaîne."
 
-#: src/slices-and-lifetimes/str.md:27
+#: src/slices-and-lifetimes/str.md
 #, fuzzy
 msgid "`String` a mutable string buffer."
 msgstr "`String` un tampon de chaîne mutable."
 
-#: src/slices-and-lifetimes/str.md:31
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "`&str` introduces a string slice, which is an immutable reference to UTF-8 "
 "encoded string data stored in a block of memory. String literals "
 "(`”Hello”`), are stored in the program’s binary."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:34
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "Rust’s `String` type is a wrapper around a vector of bytes. As with a "
 "`Vec<T>`, it is owned."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:36
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "As with many other types `String::from()` creates a string from a string "
 "literal; `String::new()` creates a new empty string, to which string data "
 "can be added using the `push()` and `push_str()` methods."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:39
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "The `format!()` macro is a convenient way to generate an owned string from "
 "dynamic values. It accepts the same format specification as `println!()`."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:42
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "You can borrow `&str` slices from `String` via `&` and optionally range "
-"selection.  If you select a byte range that is not aligned to character "
-"boundaries, the expression will panic.  The `chars` iterator iterates over "
+"selection. If you select a byte range that is not aligned to character "
+"boundaries, the expression will panic. The `chars` iterator iterates over "
 "characters and is preferred over trying to get character boundaries right."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:47
+#: src/slices-and-lifetimes/str.md
 msgid ""
 "For C++ programmers: think of `&str` as `std::string_view` from C++, but the "
 "one that always points to a valid string in memory. Rust `String` is a rough "
@@ -8760,50 +9194,46 @@ msgid ""
 "UTF-8 encoded bytes and will never use a small-string optimization)."
 msgstr ""
 
-#: src/slices-and-lifetimes/str.md:51
+#: src/slices-and-lifetimes/str.md
 msgid "Byte strings literals allow you to create a `&[u8]` value directly:"
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:1
-msgid "Lifetimes"
-msgstr "Durées de vie"
-
-#: src/slices-and-lifetimes/lifetime-annotations.md:3
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
-"A reference has a _lifetime_, which must \"outlive\" the value it refers to. "
-"This is verified by the borrow checker."
+"A reference has a _lifetime_, which must not \"outlive\" the value it refers "
+"to. This is verified by the borrow checker."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:6
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
-"The lifetime can be implicit - this is what we have seen so far.  Lifetimes "
-"can also be explicit: `&'a Point`, `&'document str`.  Lifetimes start with "
-"`'` and `'a` is a typical default name.  Read `&'a Point` as \"a borrowed "
+"The lifetime can be implicit - this is what we have seen so far. Lifetimes "
+"can also be explicit: `&'a Point`, `&'document str`. Lifetimes start with "
+"`'` and `'a` is a typical default name. Read `&'a Point` as \"a borrowed "
 "`Point` which is valid for at least the lifetime `a`\"."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:11
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
 "Lifetimes are always inferred by the compiler: you cannot assign a lifetime "
 "yourself. Explicit lifetime annotations create constraints where there is "
 "ambiguity; the compiler verifies that there is a valid solution."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:15
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
 "Lifetimes become more complicated when considering passing values to and "
 "returning values from functions."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:29
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid "// What is the lifetime of p3?\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:30
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid "\"p3: {p3:?}\""
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:36
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
 "In this example, the the compiler does not know what lifetime to infer for "
 "`p3`. Looking inside the function body shows that it can only safely assume "
@@ -8812,26 +9242,26 @@ msgid ""
 "return values."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:42
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid "Add `'a` appropriately to `left_most`:"
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:48
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
 "This says, \"given p1 and p2 which both outlive `'a`, the return value lives "
 "for at least `'a`."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-annotations.md:50
+#: src/slices-and-lifetimes/lifetime-annotations.md
 msgid ""
 "In common cases, lifetimes can be elided, as described on the next slide."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:1
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid "Lifetimes in Function Calls"
 msgstr "Durées de vie dans les appels de fonction"
 
-#: src/slices-and-lifetimes/lifetime-elision.md:3
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid ""
 "Lifetimes for function arguments and return values must be fully specified, "
 "but Rust allows lifetimes to be elided in most cases with [a few simple "
@@ -8839,48 +9269,57 @@ msgid ""
 "inference -- it is just a syntactic shorthand."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:8
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid "Each argument which does not have a lifetime annotation is given one."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:9
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid ""
 "If there is only one argument lifetime, it is given to all un-annotated "
 "return values."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:10
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid ""
 "If there are multiple argument lifetimes, but the first one is for `self`, "
 "that lifetime is given to all un-annotated return values."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:49
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid "In this example, `cab_distance` is trivially elided."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:51
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid ""
 "The `nearest` function provides another example of a function with multiple "
 "references in its arguments that requires explicit annotation."
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:53
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid "Try adjusting the signature to \"lie\" about the lifetimes returned:"
 msgstr ""
 
-#: src/slices-and-lifetimes/lifetime-elision.md:59
+#: src/slices-and-lifetimes/lifetime-elision.md
 msgid ""
 "This won't compile, demonstrating that the annotations are checked for "
-"validity by the compiler.  Note that this is not the case for raw pointers "
+"validity by the compiler. Note that this is not the case for raw pointers "
 "(unsafe), and this is a common source of errors with unsafe Rust."
 msgstr ""
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:1
+#: src/slices-and-lifetimes/lifetime-elision.md
+msgid ""
+"Students may ask when to use lifetimes. Rust borrows _always_ have "
+"lifetimes. Most of the time, elision and type inference mean these don't "
+"need to be written out. In more complicated cases, lifetime annotations can "
+"help resolve ambiguity. Often, especially when prototyping, it's easier to "
+"just work with owned data by cloning values where necessary."
+msgstr ""
+
+#: src/slices-and-lifetimes/struct-lifetimes.md
 msgid "Lifetimes in Data Structures"
 msgstr "Durées de vie dans les structures de données"
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:3
+#: src/slices-and-lifetimes/struct-lifetimes.md
 #, fuzzy
 msgid ""
 "If a data type stores borrowed data, it must be annotated with a lifetime:"
@@ -8888,27 +9327,27 @@ msgstr ""
 "Si un type de données stocke des données empruntées, il doit être annoté "
 "avec une durée de vie :"
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:10
+#: src/slices-and-lifetimes/struct-lifetimes.md
 msgid "\"Bye {text}!\""
 msgstr ""
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:14
+#: src/slices-and-lifetimes/struct-lifetimes.md
 msgid "\"The quick brown fox jumps over the lazy dog.\""
 msgstr ""
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:17
+#: src/slices-and-lifetimes/struct-lifetimes.md
 msgid "// erase(text);\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:18
+#: src/slices-and-lifetimes/struct-lifetimes.md
 msgid "\"{fox:?}\""
 msgstr ""
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:19
+#: src/slices-and-lifetimes/struct-lifetimes.md
 msgid "\"{dog:?}\""
 msgstr ""
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:25
+#: src/slices-and-lifetimes/struct-lifetimes.md
 #, fuzzy
 msgid ""
 "In the above example, the annotation on `Highlight` enforces that the data "
@@ -8919,7 +9358,7 @@ msgstr ""
 "données sous-jacentes au `&str` contenu vivent au moins aussi longtemps que "
 "toute instance de `Highlight` qui utilise ces données."
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:26
+#: src/slices-and-lifetimes/struct-lifetimes.md
 #, fuzzy
 msgid ""
 "If `text` is consumed before the end of the lifetime of `fox` (or `dog`), "
@@ -8928,7 +9367,7 @@ msgstr ""
 "Si `text` est consommé avant la fin de la durée de vie de `fox` (ou `dog`), "
 "le vérificateur d'emprunt génère une erreur."
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:27
+#: src/slices-and-lifetimes/struct-lifetimes.md
 #, fuzzy
 msgid ""
 "Types with borrowed data force users to hold on to the original data. This "
@@ -8939,14 +9378,14 @@ msgstr ""
 "les données d'origine. Cela peut être utile pour créer des vues légères, "
 "mais cela les rend généralement un peu plus difficiles à utiliser."
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:28
+#: src/slices-and-lifetimes/struct-lifetimes.md
 #, fuzzy
 msgid "When possible, make data structures own their data directly."
 msgstr ""
 "Dans la mesure du possible, faites en sorte que les structures de données "
 "soient directement propriétaires de leurs données."
 
-#: src/slices-and-lifetimes/struct-lifetimes.md:29
+#: src/slices-and-lifetimes/struct-lifetimes.md
 #, fuzzy
 msgid ""
 "Some structs with multiple references inside can have more than one lifetime "
@@ -8960,7 +9399,7 @@ msgstr ""
 "en plus de la durée de vie de la structure elle-même. Ce sont des cas "
 "d'utilisation très avancés."
 
-#: src/slices-and-lifetimes/exercise.md:3
+#: src/slices-and-lifetimes/exercise.md
 msgid ""
 "In this exercise, you will build a parser for the [protobuf binary encoding]"
 "(https://protobuf.dev/programming-guides/encoding/). Don't worry, it's "
@@ -8968,7 +9407,7 @@ msgid ""
 "slices of data. The underlying data itself is never copied."
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:8
+#: src/slices-and-lifetimes/exercise.md
 msgid ""
 "Fully parsing a protobuf message requires knowing the types of the fields, "
 "indexed by their field numbers. That is typically provided in a `proto` "
@@ -8976,12 +9415,12 @@ msgid ""
 "statements in functions that get called for each field."
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:13
+#: src/slices-and-lifetimes/exercise.md
 #, fuzzy
 msgid "We'll use the following proto:"
 msgstr "Vous pouvez utiliser le fichier `Cargo.toml` suivant :"
 
-#: src/slices-and-lifetimes/exercise.md:28
+#: src/slices-and-lifetimes/exercise.md
 msgid ""
 "A proto message is encoded as a series of fields, one after the next. Each "
 "is implemented as a \"tag\" followed by the value. The tag contains a field "
@@ -8989,7 +9428,7 @@ msgid ""
 "defining how the payload should be determined from the byte stream."
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:33
+#: src/slices-and-lifetimes/exercise.md
 msgid ""
 "Integers, including the tag, are represented with a variable-length encoding "
 "called VARINT. Luckily, `parse_varint` is defined for you below. The given "
@@ -8997,220 +9436,201 @@ msgid ""
 "to parse a message into a series of calls to those callbacks."
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:38
-msgid "What remains for you is to implement the `parse_field` function."
+#: src/slices-and-lifetimes/exercise.md
+msgid ""
+"What remains for you is to implement the `parse_field` function and the "
+"`ProtoMessage` trait for `Person` and `PhoneNumber`."
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:47
-#: src/slices-and-lifetimes/solution.md:10
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "\"Invalid varint\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:49
-#: src/slices-and-lifetimes/solution.md:12
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "\"Invalid wire-type\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:51
-#: src/slices-and-lifetimes/solution.md:14
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "\"Unexpected EOF\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:53
-#: src/slices-and-lifetimes/solution.md:16
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "\"Invalid length\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:55
-#: src/slices-and-lifetimes/solution.md:18
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "\"Unexpected wire-type)\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:57
-#: src/slices-and-lifetimes/solution.md:20
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "\"Invalid string (not UTF-8)\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:60
-#: src/slices-and-lifetimes/solution.md:23
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "/// A wire type as seen on the wire.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:63
-#: src/slices-and-lifetimes/solution.md:26
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "/// The Varint WireType indicates the value is a single VARINT.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:65
-#: src/slices-and-lifetimes/solution.md:28
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid ""
 "//I64,  -- not needed for this exercise\n"
 "    /// The Len WireType indicates that the value is a length represented as "
-"a VARINT\n"
-"    /// followed by exactly that number of bytes.\n"
+"a\n"
+"    /// VARINT followed by exactly that number of bytes.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:69
-#: src/slices-and-lifetimes/solution.md:32
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid ""
-"/// The I32 WireType indicates that the value is precisely 4 bytes in little-"
-"endian order\n"
-"    /// containing a 32-bit signed integer.\n"
+"/// The I32 WireType indicates that the value is precisely 4 bytes in\n"
+"    /// little-endian order containing a 32-bit signed integer.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:74
-#: src/slices-and-lifetimes/solution.md:37
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "/// A field's value, typed based on the wire type.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:78
-#: src/slices-and-lifetimes/solution.md:41
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "//I64(i64),  -- not needed for this exercise\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:83
-#: src/slices-and-lifetimes/solution.md:46
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "/// A field, containing the field number and its value.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:96
-#: src/slices-and-lifetimes/solution.md:59
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "//1 => WireType::I64,  -- not needed for this exercise\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:126
-#: src/slices-and-lifetimes/solution.md:89
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid ""
 "/// Parse a VARINT, returning the parsed value and the remaining bytes.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:134
-#: src/slices-and-lifetimes/solution.md:97
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid ""
 "// This is the last byte of the VARINT, so convert it to\n"
 "            // a u64 and return it.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:144
-#: src/slices-and-lifetimes/solution.md:107
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "// More than 7 bytes is invalid.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:147
-#: src/slices-and-lifetimes/solution.md:110
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "/// Convert a tag into a field number and a WireType.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:155
-#: src/slices-and-lifetimes/solution.md:117
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid "/// Parse a field, returning the remaining bytes\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:158
+#: src/slices-and-lifetimes/exercise.md
 msgid ""
-"// 1. Read and unpack the tag.\n"
-"    // 2. Based on the wire type, build a Field, consuming as many bytes as\n"
-"    //    necessary.\n"
-"    // 3. Return the field, and any un-consumed bytes.\n"
+"\"Based on the wire type, build a Field, consuming as many bytes as "
+"necessary.\""
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:164
-#: src/slices-and-lifetimes/solution.md:154
+#: src/slices-and-lifetimes/exercise.md
+msgid "\"Return the field, and any un-consumed bytes.\""
+msgstr ""
+
+#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md
 msgid ""
-"/// Parse a message in the given data, calling `field_callback` for each "
-"field in the message.\n"
+"/// Parse a message in the given data, calling `T::add_field` for each field "
+"in\n"
+"/// the message.\n"
 "///\n"
 "/// The entire input is consumed.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:181
-#: src/slices-and-lifetimes/solution.md:171
-msgid "/// Handle a field in a Person message.\n"
+#: src/slices-and-lifetimes/exercise.md
+msgid "// TODO: Implement ProtoMessage for Person and PhoneNumber.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/exercise.md:184
-#: src/slices-and-lifetimes/solution.md:174
-msgid "\"name: {}\""
-msgstr ""
-
-#: src/slices-and-lifetimes/exercise.md:185
-#: src/slices-and-lifetimes/solution.md:175
-msgid "\"id: {}\""
-msgstr ""
-
-#: src/slices-and-lifetimes/exercise.md:187
-#: src/slices-and-lifetimes/solution.md:177
-msgid "\"phone:\""
-msgstr ""
-
-#: src/slices-and-lifetimes/exercise.md:190
-#: src/slices-and-lifetimes/exercise.md:200
-#: src/slices-and-lifetimes/solution.md:180
-#: src/slices-and-lifetimes/solution.md:190
-msgid "// skip everything else\n"
-msgstr ""
-
-#: src/slices-and-lifetimes/exercise.md:195
-#: src/slices-and-lifetimes/solution.md:185
-msgid "/// Handle a field in a PhoneNumber message.\n"
-msgstr ""
-
-#: src/slices-and-lifetimes/exercise.md:198
-#: src/slices-and-lifetimes/solution.md:188
-msgid "\"  number: {}\""
-msgstr ""
-
-#: src/slices-and-lifetimes/exercise.md:199
-#: src/slices-and-lifetimes/solution.md:189
-msgid "\"  type: {}\""
-msgstr ""
-
-#: src/slices-and-lifetimes/solution.md:141
+#: src/slices-and-lifetimes/solution.md
 msgid "// Unwrap error because `value` is definitely 4 bytes long.\n"
 msgstr ""
 
-#: src/slices-and-lifetimes/solution.md:216
-#: src/slices-and-lifetimes/solution.md:223
-#: src/slices-and-lifetimes/solution.md:230
+#: src/slices-and-lifetimes/solution.md
+msgid "// skip everything else\n"
+msgstr ""
+
+#: src/slices-and-lifetimes/solution.md
 msgid "b\"hello\""
 msgstr ""
 
-#: src/welcome-day-4.md:1
+#: src/welcome-day-4.md
 #, fuzzy
 msgid "Welcome to Day 4"
 msgstr "Bienvenue au jour 1"
 
-#: src/welcome-day-4.md:3
+#: src/welcome-day-4.md
 #, fuzzy
 msgid ""
 "Today we will cover topics relating to building large-scale software in Rust:"
 msgstr "Aujourd'hui, nous aborderons quelques sujets plus avancés de Rust :"
 
-#: src/welcome-day-4.md:5
+#: src/welcome-day-4.md
 msgid "Iterators: a deep dive on the `Iterator` trait."
 msgstr ""
 
-#: src/welcome-day-4.md:6
+#: src/welcome-day-4.md
 msgid "Modules and visibility."
 msgstr ""
 
-#: src/welcome-day-4.md:7
+#: src/welcome-day-4.md
 #, fuzzy
 msgid "Testing."
 msgstr "Tester"
 
-#: src/welcome-day-4.md:8
+#: src/welcome-day-4.md
 #, fuzzy
 msgid "Error handling: panics, `Result`, and the try operator `?`."
 msgstr ""
 "Gestion des erreurs : paniques, « Résultat » et l'opérateur d'essai « ? »."
 
-#: src/welcome-day-4.md:9
+#: src/welcome-day-4.md
 msgid ""
 "Unsafe Rust: the escape hatch when you can't express yourself in safe Rust."
 msgstr ""
 
-#: src/iterators/iterator.md:6
+#: src/welcome-day-4.md
+msgid "[Welcome](./welcome-day-4.md) (3 minutes)"
+msgstr ""
+
+#: src/welcome-day-4.md
+msgid "[Iterators](./iterators.md) (45 minutes)"
+msgstr ""
+
+#: src/welcome-day-4.md
+msgid "[Modules](./modules.md) (40 minutes)"
+msgstr ""
+
+#: src/welcome-day-4.md
+msgid "[Testing](./testing.md) (1 hour and 5 minutes)"
+msgstr ""
+
+#: src/iterators.md
+msgid "[Iterator](./iterators/iterator.md) (5 minutes)"
+msgstr ""
+
+#: src/iterators.md
+msgid "[IntoIterator](./iterators/intoiterator.md) (5 minutes)"
+msgstr ""
+
+#: src/iterators.md
+msgid "[FromIterator](./iterators/fromiterator.md) (5 minutes)"
+msgstr ""
+
+#: src/iterators.md
+msgid ""
+"[Exercise: Iterator Method Chaining](./iterators/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/iterators/iterator.md
 msgid ""
 "The [`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html) "
 "trait supports iterating over values in a collection. It requires a `next` "
@@ -9218,11 +9638,11 @@ msgid ""
 "`Iterator`, and you can implement it yourself, too:"
 msgstr ""
 
-#: src/iterators/iterator.md:30
+#: src/iterators/iterator.md
 msgid "\"fib({i}): {n}\""
 msgstr ""
 
-#: src/iterators/iterator.md:37
+#: src/iterators/iterator.md
 #, fuzzy
 msgid ""
 "The `Iterator` trait implements many common functional programming "
@@ -9237,7 +9657,7 @@ msgstr ""
 "documentation à propos d'eux. Dans Rust, ces fonctions devraient produire le "
 "code aussi efficace que l'impératif équivalent implémentations."
 
-#: src/iterators/iterator.md:42
+#: src/iterators/iterator.md
 #, fuzzy
 msgid ""
 "`IntoIterator` is the trait that makes for loops work. It is implemented by "
@@ -9251,7 +9671,7 @@ msgstr ""
 "pourquoi vous pouvez itérer sur un vecteur avec `for i in some_vec { .. }` "
 "mais `some_vec.next()` n'existe pas."
 
-#: src/iterators/intoiterator.md:3
+#: src/iterators/intoiterator.md
 #, fuzzy
 msgid ""
 "The `Iterator` trait tells you how to _iterate_ once you have created an "
@@ -9263,11 +9683,11 @@ msgstr ""
 "créé un itérateur. Le trait connexe \"IntoIterator\" vous indique comment "
 "créer l'itérateur :"
 
-#: src/iterators/intoiterator.md:52
+#: src/iterators/intoiterator.md
 msgid "\"point = {x}, {y}\""
 msgstr ""
 
-#: src/iterators/intoiterator.md:59
+#: src/iterators/intoiterator.md
 #, fuzzy
 msgid ""
 "Click through to the docs for `IntoIterator`. Every implementation of "
@@ -9276,17 +9696,17 @@ msgstr ""
 "La syntaxe ici signifie que chaque implémentation de `IntoIterator` doit "
 "déclarer deux types :"
 
-#: src/iterators/intoiterator.md:62
+#: src/iterators/intoiterator.md
 #, fuzzy
 msgid "`Item`: the type to iterate over, such as `i8`,"
 msgstr "`Item` : le type sur lequel nous itérons, tel que `i8`,"
 
-#: src/iterators/intoiterator.md:63
+#: src/iterators/intoiterator.md
 #, fuzzy
 msgid "`IntoIter`: the `Iterator` type returned by the `into_iter` method."
 msgstr "`IntoIter` : le type `Iterator` renvoyé par la méthode `into_iter`."
 
-#: src/iterators/intoiterator.md:65
+#: src/iterators/intoiterator.md
 #, fuzzy
 msgid ""
 "Note that `IntoIter` and `Item` are linked: the iterator must have the same "
@@ -9295,23 +9715,23 @@ msgstr ""
 "Notez que `IntoIter` et `Item` sont liés : l'itérateur doit avoir le même "
 "Type `Item`, ce qui signifie qu'il renvoie `Option<Item>`"
 
-#: src/iterators/intoiterator.md:68
+#: src/iterators/intoiterator.md
 msgid "The example iterates over all combinations of x and y coordinates."
 msgstr ""
 
-#: src/iterators/intoiterator.md:70
+#: src/iterators/intoiterator.md
 msgid ""
 "Try iterating over the grid twice in `main`. Why does this fail? Note that "
 "`IntoIterator::into_iter` takes ownership of `self`."
 msgstr ""
 
-#: src/iterators/intoiterator.md:73
+#: src/iterators/intoiterator.md
 msgid ""
 "Fix this issue by implementing `IntoIterator` for `&Grid` and storing a "
 "reference to the `Grid` in `GridIter`."
 msgstr ""
 
-#: src/iterators/intoiterator.md:76
+#: src/iterators/intoiterator.md
 msgid ""
 "The same problem can occur for standard library types: `for e in "
 "some_vector` will take ownership of `some_vector` and iterate over owned "
@@ -9319,11 +9739,11 @@ msgid ""
 "over references to elements of `some_vector`."
 msgstr ""
 
-#: src/iterators/fromiterator.md:1
+#: src/iterators/fromiterator.md
 msgid "FromIterator"
 msgstr "FromIterator"
 
-#: src/iterators/fromiterator.md:3
+#: src/iterators/fromiterator.md
 #, fuzzy
 msgid ""
 "[`FromIterator`](https://doc.rust-lang.org/std/iter/trait.FromIterator.html) "
@@ -9334,33 +9754,33 @@ msgstr ""
 "vous permet de créer une collection à partir d'un [`Iterator`](https://doc."
 "rust-lang.org/std/iter/trait.Iterator.html)."
 
-#: src/iterators/fromiterator.md:12
+#: src/iterators/fromiterator.md
 msgid "\"prime_squares: {prime_squares:?}\""
 msgstr ""
 
-#: src/iterators/fromiterator.md:18
+#: src/iterators/fromiterator.md
 #, fuzzy
 msgid "`Iterator` implements"
 msgstr "`Itérateur`"
 
-#: src/iterators/fromiterator.md:27
+#: src/iterators/fromiterator.md
 msgid "There are two ways to specify `B` for this method:"
 msgstr ""
 
-#: src/iterators/fromiterator.md:29
+#: src/iterators/fromiterator.md
 msgid ""
 "With the \"turbofish\": `some_iterator.collect::<COLLECTION_TYPE>()`, as "
 "shown. The `_` shorthand used here lets Rust infer the type of the `Vec` "
-"elements. "
+"elements."
 msgstr ""
 
-#: src/iterators/fromiterator.md:32
+#: src/iterators/fromiterator.md
 msgid ""
 "With type inference: `let prime_squares: Vec<_> = some_iterator.collect()`. "
 "Rewrite the example to use this form."
 msgstr ""
 
-#: src/iterators/fromiterator.md:35
+#: src/iterators/fromiterator.md
 #, fuzzy
 msgid ""
 "There are basic implementations of `FromIterator` for `Vec`, `HashMap`, etc. "
@@ -9371,7 +9791,7 @@ msgstr ""
 "choses sympas comme convertir un `Iterator<Item = Result<V, E>>` en un "
 "`Result<Vec<V>, E>`."
 
-#: src/iterators/exercise.md:3
+#: src/iterators/exercise.md
 #, fuzzy
 msgid ""
 "In this exercise, you will need to find and use some of the provided methods "
@@ -9381,7 +9801,7 @@ msgstr ""
 "Vous pouvez implémenter le trait [`Iterator`](https://doc.rust-lang.org/std/"
 "iter/trait.Iterator.html) sur vos propres types :"
 
-#: src/iterators/exercise.md:6
+#: src/iterators/exercise.md
 #, fuzzy
 msgid ""
 "Copy the following code to <https://play.rust-lang.org/> and make the tests "
@@ -9392,38 +9812,63 @@ msgstr ""
 "passer. Essayez d'éviter d'attribuer un \"Vec\" à vos résultats "
 "intermédiaires :"
 
-#: src/iterators/exercise.md:12 src/iterators/solution.md:4
+#: src/iterators/exercise.md src/iterators/solution.md
 msgid ""
 "/// Calculate the differences between elements of `values` offset by "
-"`offset`, wrapping\n"
-"/// around from the end of `values` to the beginning.\n"
+"`offset`,\n"
+"/// wrapping around from the end of `values` to the beginning.\n"
 "///\n"
 "/// Element `n` of the result is `values[(n+offset)%len] - values[n]`.\n"
 msgstr ""
 
-#: src/modules/modules.md:3
+#: src/modules.md
+msgid "[Modules](./modules/modules.md) (5 minutes)"
+msgstr ""
+
+#: src/modules.md
+msgid "[Filesystem Hierarchy](./modules/filesystem.md) (5 minutes)"
+msgstr ""
+
+#: src/modules.md
+msgid "[Visibility](./modules/visibility.md) (5 minutes)"
+msgstr ""
+
+#: src/modules.md
+msgid "[use, super, self](./modules/paths.md) (10 minutes)"
+msgstr ""
+
+#: src/modules.md
+msgid ""
+"[Exercise: Modules for a GUI Library](./modules/exercise.md) (15 minutes)"
+msgstr ""
+
+#: src/modules.md
+msgid "This segment should take about 40 minutes"
+msgstr ""
+
+#: src/modules/modules.md
 #, fuzzy
 msgid "We have seen how `impl` blocks let us namespace functions to a type."
 msgstr ""
 "Nous avons vu comment les blocs `impl` nous permettent de faire fonctionner "
 "l'espace de noms sur un type."
 
-#: src/modules/modules.md:5
+#: src/modules/modules.md
 #, fuzzy
 msgid "Similarly, `mod` lets us namespace types and functions:"
 msgstr ""
 "De même, `mod` nous permet d'utiliser des types et des fonctions d'espace de "
 "noms :"
 
-#: src/modules/modules.md:10
+#: src/modules/modules.md
 msgid "\"In the foo module\""
 msgstr ""
 
-#: src/modules/modules.md:16
+#: src/modules/modules.md
 msgid "\"In the bar module\""
 msgstr ""
 
-#: src/modules/modules.md:28
+#: src/modules/modules.md
 #, fuzzy
 msgid ""
 "Packages provide functionality and include a `Cargo.toml` file that "
@@ -9432,7 +9877,7 @@ msgstr ""
 "Les packages fournissent des fonctionnalités et incluent un fichier `Cargo."
 "toml` qui décrit comment créer un ensemble de 1+ caisses."
 
-#: src/modules/modules.md:29
+#: src/modules/modules.md
 #, fuzzy
 msgid ""
 "Crates are a tree of modules, where a binary crate creates an executable and "
@@ -9441,41 +9886,41 @@ msgstr ""
 "Les caisses sont un arbre de modules, où une caisse binaire crée un "
 "exécutable et une caisse de bibliothèque se compile en une bibliothèque."
 
-#: src/modules/modules.md:30
+#: src/modules/modules.md
 #, fuzzy
 msgid "Modules define organization, scope, and are the focus of this section."
 msgstr ""
 "Les modules définissent l'organisation, la portée et sont au centre de cette "
 "section."
 
-#: src/modules/filesystem.md:3
+#: src/modules/filesystem.md
 msgid ""
 "Omitting the module content will tell Rust to look for it in another file:"
 msgstr ""
 
-#: src/modules/filesystem.md:9
+#: src/modules/filesystem.md
 msgid ""
 "This tells rust that the `garden` module content is found at `src/garden."
 "rs`. Similarly, a `garden::vegetables` module can be found at `src/garden/"
 "vegetables.rs`."
 msgstr ""
 
-#: src/modules/filesystem.md:12
+#: src/modules/filesystem.md
 #, fuzzy
 msgid "The `crate` root is in:"
 msgstr "La racine `crate` se trouve dans :"
 
-#: src/modules/filesystem.md:14
+#: src/modules/filesystem.md
 #, fuzzy
 msgid "`src/lib.rs` (for a library crate)"
 msgstr "`src/lib.rs` (pour une caisse de bibliothèque)"
 
-#: src/modules/filesystem.md:15
+#: src/modules/filesystem.md
 #, fuzzy
 msgid "`src/main.rs` (for a binary crate)"
 msgstr "`src/main.rs` (pour un crate binaire)"
 
-#: src/modules/filesystem.md:17
+#: src/modules/filesystem.md
 #, fuzzy
 msgid ""
 "Modules defined in files can be documented, too, using \"inner doc "
@@ -9486,75 +9931,75 @@ msgstr ""
 "l'aide de \"commentaires de documentation internes\". Ceux-ci documentent "
 "l'élément qui les contient -- dans ce cas, un module."
 
-#: src/modules/filesystem.md:21
+#: src/modules/filesystem.md
 msgid ""
 "//! This module implements the garden, including a highly performant "
 "germination\n"
 "//! implementation.\n"
 msgstr ""
 
-#: src/modules/filesystem.md:23
+#: src/modules/filesystem.md
 msgid "// Re-export types from this module.\n"
 msgstr ""
 
-#: src/modules/filesystem.md:27
+#: src/modules/filesystem.md
 msgid "/// Sow the given seed packets.\n"
 msgstr ""
 
-#: src/modules/filesystem.md:30
+#: src/modules/filesystem.md
 msgid "/// Harvest the produce in the garden that is ready.\n"
 msgstr ""
 
-#: src/modules/filesystem.md:37
+#: src/modules/filesystem.md
 msgid ""
 "Before Rust 2018, modules needed to be located at `module/mod.rs` instead of "
 "`module.rs`, and this is still a working alternative for editions after 2018."
 msgstr ""
 
-#: src/modules/filesystem.md:39
+#: src/modules/filesystem.md
 msgid ""
 "The main reason to introduce `filename.rs` as alternative to `filename/mod."
 "rs` was because many files named `mod.rs` can be hard to distinguish in IDEs."
 msgstr ""
 
-#: src/modules/filesystem.md:42
+#: src/modules/filesystem.md
 msgid "Deeper nesting can use folders, even if the main module is a file:"
 msgstr ""
 
-#: src/modules/filesystem.md:52
+#: src/modules/filesystem.md
 msgid ""
 "The place rust will look for modules can be changed with a compiler "
 "directive:"
 msgstr ""
 
-#: src/modules/filesystem.md:55
+#: src/modules/filesystem.md
 msgid "\"some/path.rs\""
 msgstr ""
 
-#: src/modules/filesystem.md:59
+#: src/modules/filesystem.md
 msgid ""
 "This is useful, for example, if you would like to place tests for a module "
 "in a file named `some_module_test.rs`, similar to the convention in Go."
 msgstr ""
 
-#: src/modules/visibility.md:3
+#: src/modules/visibility.md
 #, fuzzy
 msgid "Modules are a privacy boundary:"
 msgstr "Les modules sont une limite de confidentialité :"
 
-#: src/modules/visibility.md:5
+#: src/modules/visibility.md
 #, fuzzy
 msgid "Module items are private by default (hides implementation details)."
 msgstr ""
 "Les éléments du module sont privés par défaut (cache les détails "
 "d'implémentation)."
 
-#: src/modules/visibility.md:6
+#: src/modules/visibility.md
 #, fuzzy
 msgid "Parent and sibling items are always visible."
 msgstr "Les éléments parents et frères sont toujours visibles."
 
-#: src/modules/visibility.md:7
+#: src/modules/visibility.md
 #, fuzzy
 msgid ""
 "In other words, if an item is visible in module `foo`, it's visible in all "
@@ -9563,28 +10008,28 @@ msgstr ""
 "En d'autres termes, si un élément est visible dans le module `foo`, il est "
 "visible dans tous les descendants de `foo`."
 
-#: src/modules/visibility.md:13
+#: src/modules/visibility.md
 msgid "\"outer::private\""
 msgstr ""
 
-#: src/modules/visibility.md:17
+#: src/modules/visibility.md
 msgid "\"outer::public\""
 msgstr ""
 
-#: src/modules/visibility.md:22
+#: src/modules/visibility.md
 msgid "\"outer::inner::private\""
 msgstr ""
 
-#: src/modules/visibility.md:26
+#: src/modules/visibility.md
 msgid "\"outer::inner::public\""
 msgstr ""
 
-#: src/modules/visibility.md:39
+#: src/modules/visibility.md
 #, fuzzy
 msgid "Use the `pub` keyword to make modules public."
 msgstr "Utilisez le mot-clé `pub` pour rendre les modules publics."
 
-#: src/modules/visibility.md:41
+#: src/modules/visibility.md
 #, fuzzy
 msgid ""
 "Additionally, there are advanced `pub(...)` specifiers to restrict the scope "
@@ -9593,7 +10038,7 @@ msgstr ""
 "De plus, il existe des spécificateurs avancés `pub(...)` pour restreindre la "
 "portée de la visibilité publique."
 
-#: src/modules/visibility.md:43
+#: src/modules/visibility.md
 #, fuzzy
 msgid ""
 "See the [Rust Reference](https://doc.rust-lang.org/reference/visibility-and-"
@@ -9602,19 +10047,19 @@ msgstr ""
 "Voir la [Rust Reference](https://doc.rust-lang.org/reference/visibility-and-"
 "privacy.html#pubin-path-pubcrate-pubsuper-and-pubself)."
 
-#: src/modules/visibility.md:44
+#: src/modules/visibility.md
 #, fuzzy
 msgid "Configuring `pub(crate)` visibility is a common pattern."
 msgstr ""
 "La configuration de la visibilité de `pub(crate)` est un modèle courant."
 
-#: src/modules/visibility.md:45
+#: src/modules/visibility.md
 #, fuzzy
 msgid "Less commonly, you can give visibility to a specific path."
 msgstr ""
 "Plus rarement, vous pouvez donner de la visibilité à un chemin spécifique."
 
-#: src/modules/visibility.md:46
+#: src/modules/visibility.md
 #, fuzzy
 msgid ""
 "In any case, visibility must be granted to an ancestor module (and all of "
@@ -9623,68 +10068,68 @@ msgstr ""
 "Dans tous les cas, la visibilité doit être accordée à un module ancêtre (et "
 "à tous ses descendants)."
 
-#: src/modules/paths.md:1
+#: src/modules/paths.md
 msgid "use, super, self"
 msgstr ""
 
-#: src/modules/paths.md:3
+#: src/modules/paths.md
 msgid ""
 "A module can bring symbols from another module into scope with `use`. You "
 "will typically see something like this at the top of each module:"
 msgstr ""
 
-#: src/modules/paths.md:11
+#: src/modules/paths.md
 msgid "Paths"
 msgstr "Chemins"
 
-#: src/modules/paths.md:13
+#: src/modules/paths.md
 #, fuzzy
 msgid "Paths are resolved as follows:"
 msgstr "Les chemins sont résolus comme suit :"
 
-#: src/modules/paths.md:15
+#: src/modules/paths.md
 #, fuzzy
 msgid "As a relative path:"
 msgstr "En tant que chemin relatif :"
 
-#: src/modules/paths.md:16
+#: src/modules/paths.md
 #, fuzzy
 msgid "`foo` or `self::foo` refers to `foo` in the current module,"
 msgstr "`foo` ou `self::foo` fait référence à `foo` dans le module actuel,"
 
-#: src/modules/paths.md:17
+#: src/modules/paths.md
 #, fuzzy
 msgid "`super::foo` refers to `foo` in the parent module."
 msgstr "`super::foo` fait référence à `foo` dans le module parent."
 
-#: src/modules/paths.md:19
+#: src/modules/paths.md
 #, fuzzy
 msgid "As an absolute path:"
 msgstr "En tant que chemin absolu :"
 
-#: src/modules/paths.md:20
+#: src/modules/paths.md
 #, fuzzy
 msgid "`crate::foo` refers to `foo` in the root of the current crate,"
 msgstr "`crate::foo` fait référence à `foo` à la racine du crate actuel,"
 
-#: src/modules/paths.md:21
+#: src/modules/paths.md
 #, fuzzy
 msgid "`bar::foo` refers to `foo` in the `bar` crate."
 msgstr "`bar::foo` fait référence à `foo` dans le crate `bar`."
 
-#: src/modules/paths.md:25
+#: src/modules/paths.md
 msgid ""
 "It is common to \"re-export\" symbols at a shorter path. For example, the "
 "top-level `lib.rs` in a crate might have"
 msgstr ""
 
-#: src/modules/paths.md:35
+#: src/modules/paths.md
 msgid ""
 "making `DiskStorage` and `NetworkStorage` available to other crates with a "
 "convenient, short path."
 msgstr ""
 
-#: src/modules/paths.md:38
+#: src/modules/paths.md
 msgid ""
 "For the most part, only items that appear in a module need to be `use`'d. "
 "However, a trait must be in scope to call any methods on that trait, even if "
@@ -9693,191 +10138,305 @@ msgid ""
 "`use std::io::Read`."
 msgstr ""
 
-#: src/modules/paths.md:44
+#: src/modules/paths.md
 msgid ""
 "The `use` statement can have a wildcard: `use std::io::*`. This is "
 "discouraged because it is not clear which items are imported, and those "
 "might change over time."
 msgstr ""
 
-#: src/modules/exercise.md:3
+#: src/modules/exercise.md
+msgid ""
+"In this exercise, you will reorganize a small GUI Library implementation. "
+"This library defines a `Widget` trait and a few implementations of that "
+"trait, as well as a `main` function."
+msgstr ""
+
+#: src/modules/exercise.md
 msgid ""
-"In this exercise, you will reorganize the GUI Library exercise from the "
-"\"Methods and Traits\" segment of the course into a collection of modules. "
 "It is typical to put each type or set of closely-related types into its own "
 "module, so each widget type should get its own module."
 msgstr ""
 
-#: src/modules/exercise.md:8
-msgid ""
-"If you no longer have your version, that's fine - refer back to the "
-"[provided solution](../methods-and-traits/solution.html)."
-msgstr ""
-
-#: src/modules/exercise.md:11
+#: src/modules/exercise.md
 #, fuzzy
 msgid "Cargo Setup"
 msgstr "Installation"
 
-#: src/modules/exercise.md:13
+#: src/modules/exercise.md
 msgid ""
 "The Rust playground only supports one file, so you will need to make a Cargo "
 "project on your local filesystem:"
 msgstr ""
 
-#: src/modules/exercise.md:22
+#: src/modules/exercise.md
 msgid ""
-"Edit `src/main.rs` to add `mod` statements, and add additional files in the "
-"`src` directory."
+"Edit the resulting `src/main.rs` to add `mod` statements, and add additional "
+"files in the `src` directory."
 msgstr ""
 
-#: src/modules/exercise.md:27
+#: src/modules/exercise.md
+msgid "Source"
+msgstr ""
+
+#: src/modules/exercise.md
+msgid "Here's the single-module implementation of the GUI library:"
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "/// Natural width of `self`.\n"
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "/// Draw the widget into a buffer.\n"
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "/// Draw the widget on standard output.\n"
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"{buffer}\""
+msgstr ""
+
+#: src/modules/exercise.md
+msgid "// Add 4 paddings for borders\n"
+msgstr ""
+
+#: src/modules/exercise.md
+msgid ""
+"// TODO: Change draw_into to return Result<(), std::fmt::Error>. Then use "
+"the\n"
+"        // ?-operator here instead of .unwrap().\n"
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"+-{:-<inner_width$}-+\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md src/testing/unit-tests.md
+#: src/testing/solution.md
+msgid "\"\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"| {:^inner_width$} |\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"+={:=<inner_width$}=+\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"| {:inner_width$} |\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "// add a bit of padding\n"
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"+{:-<width$}+\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"|{:^width$}|\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"Rust GUI Demo 1.23\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"This is a small text GUI demo.\""
+msgstr ""
+
+#: src/modules/exercise.md src/modules/solution.md
+msgid "\"Click me!\""
+msgstr ""
+
+#: src/modules/exercise.md
 msgid ""
 "Encourage students to divide the code in a way that feels natural for them, "
 "and get accustomed to the required `mod`, `use`, and `pub` declarations. "
 "Afterward, discuss what organizations are most idiomatic."
 msgstr ""
 
-#: src/modules/solution.md:20
+#: src/modules/solution.md
 msgid "// ---- src/widgets.rs ----\n"
 msgstr ""
 
-#: src/modules/solution.md:42
+#: src/modules/solution.md
 msgid "// ---- src/widgets/label.rs ----\n"
 msgstr ""
 
-#: src/modules/solution.md:59
+#: src/modules/solution.md
 msgid "// ANCHOR_END: Label-width\n"
 msgstr ""
 
-#: src/modules/solution.md:67
+#: src/modules/solution.md
 msgid "// ANCHOR: Label-draw_into\n"
 msgstr ""
 
-#: src/modules/solution.md:69
+#: src/modules/solution.md
 msgid "// ANCHOR_END: Label-draw_into\n"
 msgstr ""
 
-#: src/modules/solution.md:76
+#: src/modules/solution.md
 msgid "// ---- src/widgets/button.rs ----\n"
 msgstr ""
 
-#: src/modules/solution.md:93
+#: src/modules/solution.md
 msgid "// ANCHOR_END: Button-width\n"
 msgstr ""
 
-#: src/modules/solution.md:97
+#: src/modules/solution.md
 msgid "// ANCHOR: Button-draw_into\n"
 msgstr ""
 
-#: src/modules/solution.md:99
+#: src/modules/solution.md
 msgid "// ANCHOR_END: Button-draw_into\n"
 msgstr ""
 
-#: src/modules/solution.md:114
+#: src/modules/solution.md
 msgid "// ---- src/widgets/window.rs ----\n"
 msgstr ""
 
-#: src/modules/solution.md:144
+#: src/modules/solution.md
 msgid ""
 "// ANCHOR_END: Window-width\n"
 "        // Add 4 paddings for borders\n"
 msgstr ""
 
-#: src/modules/solution.md:149
+#: src/modules/solution.md
 msgid "// ANCHOR: Window-draw_into\n"
 msgstr ""
 
-#: src/modules/solution.md:151
+#: src/modules/solution.md
 msgid "// ANCHOR_END: Window-draw_into\n"
 msgstr ""
 
-#: src/modules/solution.md:174
+#: src/modules/solution.md
+msgid ""
+"// TODO: after learning about error handling, you can change\n"
+"        // draw_into to return Result<(), std::fmt::Error>. Then use\n"
+"        // the ?-operator here instead of .unwrap().\n"
+msgstr ""
+
+#: src/modules/solution.md
 msgid "// ---- src/main.rs ----\n"
 msgstr ""
 
-#: src/testing/unit-tests.md:1
+#: src/testing.md
+msgid "[Test Modules](./testing/unit-tests.md) (5 minutes)"
+msgstr ""
+
+#: src/testing.md
+msgid "[Other Types of Tests](./testing/other.md) (10 minutes)"
+msgstr ""
+
+#: src/testing.md
+msgid "[Useful Crates](./testing/useful-crates.md) (3 minutes)"
+msgstr ""
+
+#: src/testing.md
+msgid "[GoogleTest](./testing/googletest.md) (5 minutes)"
+msgstr ""
+
+#: src/testing.md
+msgid "[Mocking](./testing/mocking.md) (5 minutes)"
+msgstr ""
+
+#: src/testing.md
+msgid "[Compiler Lints and Clippy](./testing/lints.md) (5 minutes)"
+msgstr ""
+
+#: src/testing.md
+msgid "[Exercise: Luhn Algorithm](./testing/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/testing/unit-tests.md
 msgid "Unit Tests"
 msgstr "Tests unitaires"
 
-#: src/testing/unit-tests.md:3
+#: src/testing/unit-tests.md
 #, fuzzy
 msgid "Rust and Cargo come with a simple unit test framework:"
 msgstr "Rust et Cargo sont livrés avec un cadre de test unitaire simple :"
 
-#: src/testing/unit-tests.md:5
+#: src/testing/unit-tests.md
 #, fuzzy
 msgid "Unit tests are supported throughout your code."
 msgstr "Les tests unitaires sont pris en charge dans tout votre code."
 
-#: src/testing/unit-tests.md:7
+#: src/testing/unit-tests.md
 #, fuzzy
 msgid "Integration tests are supported via the `tests/` directory."
 msgstr ""
 "Les tests d'intégration sont pris en charge via le répertoire `tests/`."
 
-#: src/testing/unit-tests.md:9
+#: src/testing/unit-tests.md
 msgid ""
-"Tests are marked with `#[test]`.  Unit tests are often put in a nested "
+"Tests are marked with `#[test]`. Unit tests are often put in a nested "
 "`tests` module, using `#[cfg(test)]` to conditionally compile them only when "
 "building tests."
 msgstr ""
 
-#: src/testing/unit-tests.md:37
+#: src/testing/unit-tests.md
 #, fuzzy
 msgid "\"Hello World\""
 msgstr "Bonjour le monde!"
 
-#: src/testing/unit-tests.md:42
+#: src/testing/unit-tests.md
 #, fuzzy
 msgid "This lets you unit test private helpers."
 msgstr "Cela vous permet de tester unitairement les helpers privés."
 
-#: src/testing/unit-tests.md:43
+#: src/testing/unit-tests.md
 #, fuzzy
 msgid "The `#[cfg(test)]` attribute is only active when you run `cargo test`."
 msgstr ""
 "L'attribut `#[cfg(test)]` n'est actif que lorsque vous lancez `cargo test`."
 
-#: src/testing/unit-tests.md:47
+#: src/testing/unit-tests.md
 msgid "Run the tests in the playground in order to show their results."
 msgstr ""
 
-#: src/testing/other.md:3
+#: src/testing/other.md
 msgid "Integration Tests"
 msgstr "Tests d'intégration"
 
-#: src/testing/other.md:5
+#: src/testing/other.md
 #, fuzzy
 msgid "If you want to test your library as a client, use an integration test."
 msgstr ""
 "Si vous souhaitez tester votre bibliothèque en tant que client, utilisez un "
 "test d'intégration."
 
-#: src/testing/other.md:7
+#: src/testing/other.md
 #, fuzzy
 msgid "Create a `.rs` file under `tests/`:"
 msgstr "Créez un fichier `.rs` sous `tests/` :"
 
-#: src/testing/other.md:10
+#: src/testing/other.md
 msgid "// tests/my_library.rs\n"
 msgstr ""
 
-#: src/testing/other.md:19
+#: src/testing/other.md
 #, fuzzy
 msgid "These tests only have access to the public API of your crate."
 msgstr "Ces tests n'ont accès qu'à l'API publique de votre crate."
 
-#: src/testing/other.md:21
+#: src/testing/other.md
 msgid "Documentation Tests"
 msgstr "Tests de documentation"
 
-#: src/testing/other.md:23
+#: src/testing/other.md
 #, fuzzy
 msgid "Rust has built-in support for documentation tests:"
 msgstr "Rust a un support intégré pour les tests de documentation :"
 
-#: src/testing/other.md:26
+#: src/testing/other.md
 msgid ""
 "/// Shortens a string to the given length.\n"
 "///\n"
@@ -9888,25 +10447,25 @@ msgid ""
 "/// ```\n"
 msgstr ""
 
-#: src/testing/other.md:38
+#: src/testing/other.md
 #, fuzzy
 msgid "Code blocks in `///` comments are automatically seen as Rust code."
 msgstr ""
 "Les blocs de code dans les commentaires `///` sont automatiquement "
 "considérés comme du code Rust."
 
-#: src/testing/other.md:39
+#: src/testing/other.md
 #, fuzzy
 msgid "The code will be compiled and executed as part of `cargo test`."
 msgstr "Le code sera compilé et exécuté dans le cadre du `cargo test`."
 
-#: src/testing/other.md:40
+#: src/testing/other.md
 msgid ""
-"Adding `# ` in the code will hide it from the docs, but will still compile/"
+"Adding `#` in the code will hide it from the docs, but will still compile/"
 "run it."
 msgstr ""
 
-#: src/testing/other.md:41
+#: src/testing/other.md
 #, fuzzy
 msgid ""
 "Test the above code on the [Rust Playground](https://play.rust-lang.org/?"
@@ -9915,111 +10474,111 @@ msgstr ""
 "Testez le code ci-dessus sur [Rust Playground](https://play.rust-lang.org/?"
 "version=stable&mode=debug&edition=2021&gist=3ce2ad13ea1302f6572cb15cd96becf0)."
 
-#: src/testing/useful-crates.md:3
+#: src/testing/useful-crates.md
 #, fuzzy
 msgid "Rust comes with only basic support for writing tests."
 msgstr "Rust a un support intégré pour les tests de documentation :"
 
-#: src/testing/useful-crates.md:5
+#: src/testing/useful-crates.md
 msgid "Here are some additional crates which we recommend for writing tests:"
 msgstr ""
 
-#: src/testing/useful-crates.md:7
+#: src/testing/useful-crates.md
 msgid ""
 "[googletest](https://docs.rs/googletest): Comprehensive test assertion "
 "library in the tradition of GoogleTest for C++."
 msgstr ""
 
-#: src/testing/useful-crates.md:8
+#: src/testing/useful-crates.md
 msgid "[proptest](https://docs.rs/proptest): Property-based testing for Rust."
 msgstr ""
 
-#: src/testing/useful-crates.md:9
+#: src/testing/useful-crates.md
 msgid ""
 "[rstest](https://docs.rs/rstest): Support for fixtures and parameterised "
 "tests."
 msgstr ""
 
-#: src/testing/googletest.md:3
+#: src/testing/googletest.md
 msgid ""
 "The [GoogleTest](https://docs.rs/googletest/) crate allows for flexible test "
 "assertions using _matchers_:"
 msgstr ""
 
-#: src/testing/googletest.md:11
+#: src/testing/googletest.md
 msgid "\"baz\""
 msgstr ""
 
-#: src/testing/googletest.md:12
+#: src/testing/googletest.md
 msgid "\"xyz\""
 msgstr ""
 
-#: src/testing/googletest.md:16
+#: src/testing/googletest.md
 msgid ""
 "If we change the last element to `\"!\"`, the test fails with a structured "
 "error message pin-pointing the error:"
 msgstr ""
 
-#: src/testing/googletest.md:36
+#: src/testing/googletest.md
 msgid ""
 "GoogleTest is not part of the Rust Playground, so you need to run this "
 "example in a local environment. Use `cargo add googletest` to quickly add it "
 "to an existing Cargo project."
 msgstr ""
 
-#: src/testing/googletest.md:40
+#: src/testing/googletest.md
 msgid ""
 "The `use googletest::prelude::*;` line imports a number of [commonly used "
 "macros and types](https://docs.rs/googletest/latest/googletest/prelude/index."
 "html)."
 msgstr ""
 
-#: src/testing/googletest.md:43
+#: src/testing/googletest.md
 msgid "This just scratches the surface, there are many builtin matchers."
 msgstr ""
 
-#: src/testing/googletest.md:45
+#: src/testing/googletest.md
 msgid ""
 "A particularly nice feature is that mismatches in multi-line strings strings "
 "are shown as a diff:"
 msgstr ""
 
-#: src/testing/googletest.md:51
+#: src/testing/googletest.md
 msgid ""
 "\"Memory safety found,\\n\\\n"
 "                 Rust's strong typing guides the way,\\n\\\n"
 "                 Secure code you'll write.\""
 msgstr ""
 
-#: src/testing/googletest.md:56
+#: src/testing/googletest.md
 msgid ""
 "\"Memory safety found,\\n\\\n"
 "            Rust's silly humor guides the way,\\n\\\n"
 "            Secure code you'll write.\""
 msgstr ""
 
-#: src/testing/googletest.md:63
+#: src/testing/googletest.md
 msgid "shows a color-coded diff (colors not shown here):"
 msgstr ""
 
-#: src/testing/googletest.md:79
+#: src/testing/googletest.md
 msgid ""
 "The crate is a Rust port of [GoogleTest for C++](https://google.github.io/"
 "googletest/)."
 msgstr ""
 
-#: src/testing/googletest.md:84
+#: src/testing/googletest.md
 msgid "GoogleTest is available for use in AOSP."
 msgstr ""
 
-#: src/testing/mocking.md:3
+#: src/testing/mocking.md
 msgid ""
 "For mocking, [Mockall](https://docs.rs/mockall/) is a widely used library. "
 "You need to refactor your code to use traits, which you can then quickly "
 "mock:"
 msgstr ""
 
-#: src/testing/mocking.md:26
+#: src/testing/mocking.md
 msgid ""
 "The advice here is for Android (AOSP) where Mockall is the recommended "
 "mocking library. There are other [mocking libraries available on crates.io]"
@@ -10028,7 +10587,7 @@ msgid ""
 "meaning that they make it easy to get a mock implementation of a given trait."
 msgstr ""
 
-#: src/testing/mocking.md:32
+#: src/testing/mocking.md
 msgid ""
 "Note that mocking is somewhat _controversial_: mocks allow you to completely "
 "isolate a test from its dependencies. The immediate result is faster and "
@@ -10036,7 +10595,7 @@ msgid ""
 "wrongly and return output different from what the real dependencies would do."
 msgstr ""
 
-#: src/testing/mocking.md:37
+#: src/testing/mocking.md
 msgid ""
 "If at all possible, it is recommended that you use the real dependencies. As "
 "an example, many databases allow you to configure an in-memory backend. This "
@@ -10044,70 +10603,70 @@ msgid ""
 "and will automatically clean up after themselves."
 msgstr ""
 
-#: src/testing/mocking.md:42
+#: src/testing/mocking.md
 msgid ""
 "Similarly, many web frameworks allow you to start an in-process server which "
 "binds to a random port on `localhost`. Always prefer this over mocking away "
 "the framework since it helps you test your code in the real environment."
 msgstr ""
 
-#: src/testing/mocking.md:46
+#: src/testing/mocking.md
 msgid ""
 "Mockall is not part of the Rust Playground, so you need to run this example "
 "in a local environment. Use `cargo add mockall` to quickly add Mockall to an "
 "existing Cargo project."
 msgstr ""
 
-#: src/testing/mocking.md:50
+#: src/testing/mocking.md
 msgid ""
 "Mockall has a lot more functionality. In particular, you can set up "
 "expectations which depend on the arguments passed. Here we use this to mock "
 "a cat which becomes hungry 3 hours after the last time it was fed:"
 msgstr ""
 
-#: src/testing/mocking.md:68
+#: src/testing/mocking.md
 msgid ""
 "You can use `.times(n)` to limit the number of times a mock method can be "
 "called to `n` --- the mock will automatically panic when dropped if this "
 "isn't satisfied."
 msgstr ""
 
-#: src/testing/lints.md:3
+#: src/testing/lints.md
 msgid ""
 "The Rust compiler produces fantastic error messages, as well as helpful "
 "built-in lints. [Clippy](https://doc.rust-lang.org/clippy/) provides even "
 "more lints, organized into groups that can be enabled per-project."
 msgstr ""
 
-#: src/testing/lints.md:14
+#: src/testing/lints.md
 msgid "\"X probably fits in a u16, right? {}\""
 msgstr ""
 
-#: src/testing/lints.md:20
+#: src/testing/lints.md
 msgid ""
 "Run the code sample and examine the error message. There are also lints "
 "visible here, but those will not be shown once the code compiles. Switch to "
 "the Playground site to show those lints."
 msgstr ""
 
-#: src/testing/lints.md:24
+#: src/testing/lints.md
 msgid ""
 "After resolving the lints, run `clippy` on the playground site to show "
 "clippy warnings. Clippy has extensive documentation of its lints, and adds "
 "new lints (including default-deny lints) all the time."
 msgstr ""
 
-#: src/testing/lints.md:28
+#: src/testing/lints.md
 msgid ""
 "Note that errors or warnings with `help: ...` can be fixed with `cargo fix` "
 "or via your editor."
 msgstr ""
 
-#: src/testing/exercise.md:3
+#: src/testing/exercise.md
 msgid "Luhn Algorithm"
 msgstr "Algorithme de Luhn"
 
-#: src/testing/exercise.md:5
+#: src/testing/exercise.md
 #, fuzzy
 msgid ""
 "The [Luhn algorithm](https://en.wikipedia.org/wiki/Luhn_algorithm) is used "
@@ -10119,13 +10678,13 @@ msgstr ""
 "chaîne en entrée et fait le suivant pour valider le numéro de carte "
 "bancaire :"
 
-#: src/testing/exercise.md:9
+#: src/testing/exercise.md
 #, fuzzy
 msgid "Ignore all spaces. Reject number with less than two digits."
 msgstr ""
 "Ignorer tous les espaces. Numéro de rejet comportant moins de deux chiffres."
 
-#: src/testing/exercise.md:11
+#: src/testing/exercise.md
 #, fuzzy
 msgid ""
 "Moving from **right to left**, double every second digit: for the number "
@@ -10134,7 +10693,7 @@ msgstr ""
 "En se déplaçant de droite à gauche, doubler tous les deux chiffres : pour le "
 "nombre `1234`, on double '3' et '1'."
 
-#: src/testing/exercise.md:14
+#: src/testing/exercise.md
 #, fuzzy
 msgid ""
 "After doubling a digit, sum the digits if the result is greater than 9. So "
@@ -10143,25 +10702,25 @@ msgstr ""
 "Après avoir doublé un chiffre, additionnez les chiffres. Donc doubler '7' "
 "devient '14' ce qui devient '5'."
 
-#: src/testing/exercise.md:17
+#: src/testing/exercise.md
 #, fuzzy
 msgid "Sum all the undoubled and doubled digits."
 msgstr "Additionnez tous les chiffres non doublés et doublés."
 
-#: src/testing/exercise.md:19
+#: src/testing/exercise.md
 #, fuzzy
 msgid "The credit card number is valid if the sum ends with `0`."
 msgstr ""
 "Le numéro de carte de crédit est valide si la somme se termine par '0'."
 
-#: src/testing/exercise.md:21
+#: src/testing/exercise.md
 msgid ""
 "The provided code provides a buggy implementation of the luhn algorithm, "
 "along with two basic unit tests that confirm that most the algorithm is "
 "implemented correctly."
 msgstr ""
 
-#: src/testing/exercise.md:25
+#: src/testing/exercise.md
 #, fuzzy
 msgid ""
 "Copy the code below to <https://play.rust-lang.org/> and write additional "
@@ -10171,122 +10730,160 @@ msgstr ""
 "Copiez le code ci-dessous sur <https://play.rust-lang.org/> et remplissez "
 "les champs manquants fonctions et méthodes :"
 
-#: src/testing/exercise.md:60 src/testing/solution.md:75
+#: src/testing/exercise.md src/testing/solution.md
 msgid "\"4263 9826 4026 9299\""
 msgstr ""
 
-#: src/testing/exercise.md:61 src/testing/solution.md:76
+#: src/testing/exercise.md src/testing/solution.md
 msgid "\"4539 3195 0343 6467\""
 msgstr ""
 
-#: src/testing/exercise.md:62 src/testing/solution.md:77
+#: src/testing/exercise.md src/testing/solution.md
 msgid "\"7992 7398 713\""
 msgstr ""
 
-#: src/testing/exercise.md:67 src/testing/solution.md:82
+#: src/testing/exercise.md src/testing/solution.md
 msgid "\"4223 9826 4026 9299\""
 msgstr ""
 
-#: src/testing/exercise.md:68 src/testing/solution.md:83
+#: src/testing/exercise.md src/testing/solution.md
 msgid "\"4539 3195 0343 6476\""
 msgstr ""
 
-#: src/testing/exercise.md:69 src/testing/solution.md:84
+#: src/testing/exercise.md src/testing/solution.md
 msgid "\"8273 1232 7352 0569\""
 msgstr ""
 
-#: src/testing/solution.md:4
+#: src/testing/solution.md
 msgid "// This is the buggy version that appears in the problem.\n"
 msgstr ""
 
-#: src/testing/solution.md:30
+#: src/testing/solution.md
 msgid "// This is the solution and passes all of the tests below.\n"
 msgstr ""
 
-#: src/testing/solution.md:62
+#: src/testing/solution.md
 msgid "\"1234 5678 1234 5670\""
 msgstr ""
 
-#: src/testing/solution.md:64
+#: src/testing/solution.md
 msgid "\"Is {cc_number} a valid credit card number? {}\""
 msgstr ""
 
-#: src/testing/solution.md:65
+#: src/testing/solution.md
 msgid "\"yes\""
 msgstr ""
 
-#: src/testing/solution.md:65
+#: src/testing/solution.md
 msgid "\"no\""
 msgstr ""
 
-#: src/testing/solution.md:90
+#: src/testing/solution.md
 msgid "\"foo 0 0\""
 msgstr ""
 
-#: src/testing/solution.md:96
+#: src/testing/solution.md
 msgid "\" \""
 msgstr ""
 
-#: src/testing/solution.md:97
+#: src/testing/solution.md
 msgid "\"  \""
 msgstr ""
 
-#: src/testing/solution.md:98
+#: src/testing/solution.md
 msgid "\"    \""
 msgstr ""
 
-#: src/testing/solution.md:103
+#: src/testing/solution.md
 msgid "\"0\""
 msgstr ""
 
-#: src/testing/solution.md:108
+#: src/testing/solution.md
 msgid "\" 0 0 \""
 msgstr ""
 
-#: src/error-handling/panics.md:3
+#: src/welcome-day-4-afternoon.md
+msgid "[Error Handling](./error-handling.md) (45 minutes)"
+msgstr ""
+
+#: src/welcome-day-4-afternoon.md
+msgid "[Unsafe Rust](./unsafe-rust.md) (1 hour and 5 minutes)"
+msgstr ""
+
+#: src/welcome-day-4-afternoon.md
+msgid "Including 10 minute breaks, this session should take about 2 hours"
+msgstr ""
+
+#: src/error-handling.md
+msgid "[Panics](./error-handling/panics.md) (3 minutes)"
+msgstr ""
+
+#: src/error-handling.md
+msgid "[Try Operator](./error-handling/try.md) (5 minutes)"
+msgstr ""
+
+#: src/error-handling.md
+msgid "[Try Conversions](./error-handling/try-conversions.md) (5 minutes)"
+msgstr ""
+
+#: src/error-handling.md
+msgid "[Error Trait](./error-handling/error.md) (5 minutes)"
+msgstr ""
+
+#: src/error-handling.md
+msgid ""
+"[thiserror and anyhow](./error-handling/thiserror-and-anyhow.md) (5 minutes)"
+msgstr ""
+
+#: src/error-handling.md
+msgid ""
+"[Exercise: Rewriting with Result](./error-handling/exercise.md) (20 minutes)"
+msgstr ""
+
+#: src/error-handling/panics.md
 msgid "Rust handles fatal errors with a \"panic\"."
 msgstr ""
 
-#: src/error-handling/panics.md:5
+#: src/error-handling/panics.md
 #, fuzzy
 msgid "Rust will trigger a panic if a fatal error happens at runtime:"
 msgstr ""
 "Rust déclenchera une panique si une erreur fatale se produit lors de "
 "l'exécution :"
 
-#: src/error-handling/panics.md:10
+#: src/error-handling/panics.md
 msgid "\"v[100]: {}\""
 msgstr ""
 
-#: src/error-handling/panics.md:14
+#: src/error-handling/panics.md
 #, fuzzy
 msgid "Panics are for unrecoverable and unexpected errors."
 msgstr "Les paniques concernent les erreurs irrécupérables et inattendues."
 
-#: src/error-handling/panics.md:15
+#: src/error-handling/panics.md
 #, fuzzy
 msgid "Panics are symptoms of bugs in the program."
 msgstr "Les paniques sont des symptômes de bogues dans le programme."
 
-#: src/error-handling/panics.md:16
+#: src/error-handling/panics.md
 msgid "Runtime failures like failed bounds checks can panic"
 msgstr ""
 
-#: src/error-handling/panics.md:17
+#: src/error-handling/panics.md
 msgid "Assertions (such as `assert!`) panic on failure"
 msgstr ""
 
-#: src/error-handling/panics.md:18
+#: src/error-handling/panics.md
 msgid "Purpose-specific panics can use the `panic!` macro."
 msgstr ""
 
-#: src/error-handling/panics.md:19
+#: src/error-handling/panics.md
 msgid ""
 "A panic will \"unwind\" the stack, dropping values just as if the functions "
 "had returned."
 msgstr ""
 
-#: src/error-handling/panics.md:20
+#: src/error-handling/panics.md
 #, fuzzy
 msgid ""
 "Use non-panicking APIs (such as `Vec::get`) if crashing is not acceptable."
@@ -10294,7 +10891,7 @@ msgstr ""
 "Utilisez des API qui ne paniquent pas (telles que `Vec::get`) si le plantage "
 "n'est pas acceptable."
 
-#: src/error-handling/panics.md:24
+#: src/error-handling/panics.md
 #, fuzzy
 msgid ""
 "By default, a panic will cause the stack to unwind. The unwinding can be "
@@ -10303,25 +10900,25 @@ msgstr ""
 "Par défaut, une panique entraînera le déroulement de la pile. Le déroulement "
 "peut être rattrapé :"
 
-#: src/error-handling/panics.md:31
+#: src/error-handling/panics.md
 msgid "\"No problem here!\""
 msgstr ""
 
-#: src/error-handling/panics.md:33 src/error-handling/panics.md:38
+#: src/error-handling/panics.md
 msgid "\"{result:?}\""
 msgstr ""
 
-#: src/error-handling/panics.md:36
+#: src/error-handling/panics.md
 msgid "\"oh no!\""
 msgstr ""
 
-#: src/error-handling/panics.md:42
+#: src/error-handling/panics.md
 msgid ""
 "Catching is unusual; do not attempt to implement exceptions with "
 "`catch_unwind`!"
 msgstr ""
 
-#: src/error-handling/panics.md:43
+#: src/error-handling/panics.md
 #, fuzzy
 msgid ""
 "This can be useful in servers which should keep running even if a single "
@@ -10330,55 +10927,55 @@ msgstr ""
 "Cela peut être utile dans les serveurs qui doivent continuer à fonctionner "
 "même si un seul la demande se bloque."
 
-#: src/error-handling/panics.md:45
+#: src/error-handling/panics.md
 #, fuzzy
 msgid "This does not work if `panic = 'abort'` is set in your `Cargo.toml`."
 msgstr ""
 "Cela ne fonctionne pas si `panic = 'abort'` est défini dans votre `Cargo."
 "toml`."
 
-#: src/error-handling/try.md:3
+#: src/error-handling/try.md
 msgid ""
 "Runtime errors like connection-refused or file-not-found are handled with "
-"the `Result` type, but matching this type on every call can be cumbersome.  "
+"the `Result` type, but matching this type on every call can be cumbersome. "
 "The try-operator `?` is used to return errors to the caller. It lets you "
 "turn the common"
 msgstr ""
 
-#: src/error-handling/try.md:15
+#: src/error-handling/try.md
 #, fuzzy
 msgid "into the much simpler"
 msgstr "dans le plus simple"
 
-#: src/error-handling/try.md:21
+#: src/error-handling/try.md
 #, fuzzy
 msgid "We can use this to simplify our error handling code:"
 msgstr ""
 "Nous pouvons l'utiliser pour simplifier notre code de gestion des erreurs :"
 
-#: src/error-handling/try.md:42
+#: src/error-handling/try.md
 msgid "//fs::write(\"config.dat\", \"alice\").unwrap();\n"
 msgstr ""
 
-#: src/error-handling/try.md:43 src/error-handling/try-conversions.md:64
-#: src/error-handling/thiserror-and-anyhow.md:31
+#: src/error-handling/try.md src/error-handling/try-conversions.md
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "\"config.dat\""
 msgstr ""
 
-#: src/error-handling/try.md:44 src/error-handling/try-conversions.md:65
+#: src/error-handling/try.md src/error-handling/try-conversions.md
 msgid "\"username or error: {username:?}\""
 msgstr ""
 
-#: src/error-handling/try.md:50
+#: src/error-handling/try.md
 msgid "Simplify the `read_username` function to use `?`."
 msgstr ""
 
-#: src/error-handling/try.md:54
+#: src/error-handling/try.md
 #, fuzzy
 msgid "The `username` variable can be either `Ok(string)` or `Err(error)`."
 msgstr "La variable `username` peut être soit `Ok(string)` soit `Err(error)`."
 
-#: src/error-handling/try.md:55
+#: src/error-handling/try.md
 #, fuzzy
 msgid ""
 "Use the `fs::write` call to test out the different scenarios: no file, empty "
@@ -10387,7 +10984,7 @@ msgstr ""
 "Utilisez l'appel `fs::write` pour tester les différents scénarios : pas de "
 "fichier, fichier vide, fichier avec nom d'utilisateur."
 
-#: src/error-handling/try.md:56
+#: src/error-handling/try.md
 msgid ""
 "Note that `main` can return a `Result<(), E>` as long as it implements `std::"
 "process:Termination`. In practice, this means that `E` implements `Debug`. "
@@ -10395,7 +10992,7 @@ msgid ""
 "on error."
 msgstr ""
 
-#: src/error-handling/try-conversions.md:3
+#: src/error-handling/try-conversions.md
 #, fuzzy
 msgid ""
 "The effective expansion of `?` is a little more complicated than previously "
@@ -10404,12 +11001,12 @@ msgstr ""
 "L'expansion effective de `?` est un peu plus compliquée qu'indiqué "
 "précédemment :"
 
-#: src/error-handling/try-conversions.md:9
+#: src/error-handling/try-conversions.md
 #, fuzzy
 msgid "works the same as"
 msgstr "fonctionne de la même manière que"
 
-#: src/error-handling/try-conversions.md:18
+#: src/error-handling/try-conversions.md
 #, fuzzy
 msgid ""
 "The `From::from` call here means we attempt to convert the error type to the "
@@ -10419,70 +11016,53 @@ msgstr ""
 "L'appel `From::from` ici signifie que nous essayons de convertir le type "
 "d'erreur en type renvoyé par la fonction :"
 
-#: src/error-handling/try-conversions.md:41
+#: src/error-handling/try-conversions.md
 msgid "\"IO error: {e}\""
 msgstr ""
 
-#: src/error-handling/try-conversions.md:42
-msgid "\"Found no username in {filename}\""
+#: src/error-handling/try-conversions.md
+msgid "\"Found no username in {path}\""
 msgstr ""
 
-#: src/error-handling/try-conversions.md:63
-#: src/error-handling/thiserror-and-anyhow.md:30
+#: src/error-handling/try-conversions.md
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "//fs::write(\"config.dat\", \"\").unwrap();\n"
 msgstr ""
 
-#: src/error-handling/try-conversions.md:71
+#: src/error-handling/try-conversions.md
 msgid ""
-"The return type of the function has to be compatible with the nested "
-"functions it calls. For instance, a function returning a `Result<T, Err>` "
-"can only apply the `?` operator on a function returning a `Result<AnyT, "
-"Err>`. It cannot apply the `?` operator on a function returning an "
-"`Option<AnyT>` or `Result<T, OtherErr>` unless `OtherErr` implements "
-"`From<Err>`. Reciprocally, a function returning an `Option<T>` can only "
-"apply the `?` operator on a function returning an `Option<AnyT>`."
+"The `?` operator must return a value compatible with the return type of the "
+"function. For `Result`, it means that the error types have to be compatible. "
+"A function that returns `Result<T, ErrorOuter>` can only use `?` on a value "
+"of type `Result<U, ErrorInner>` if `ErrorOuter` and `ErrorInner` are the "
+"same type or if `ErrorOuter` implements `From<ErrorInner>`."
 msgstr ""
 
-#: src/error-handling/try-conversions.md:77
-msgid ""
-"You can convert incompatible types into one another with the different "
-"`Option` and `Result` methods such as `Option::ok_or`, `Result::ok`, "
-"`Result::err`."
-msgstr ""
-
-#: src/error-handling/try-conversions.md:81
-msgid ""
-"It is good practice for all error types that don't need to be `no_std` to "
-"implement `std::error::Error`, which requires `Debug` and `Display`. The "
-"`Error` crate for `core` is only available in [nightly](https://github.com/"
-"rust-lang/rust/issues/103765), so not fully `no_std` compatible yet."
-msgstr ""
-
-#: src/error-handling/try-conversions.md:83
-#, fuzzy
-msgid ""
-"It's generally helpful for them to implement `Clone` and `Eq` too where "
-"possible, to make life easier for tests and consumers of your library. In "
-"this case we can't easily do so, because `io::Error` doesn't implement them."
-msgstr ""
-"C'est une bonne pratique pour tous les types d'erreurs d'implémenter `std::"
-"error::Error`, qui nécessite `Debug` et 'Affichage'. Il est généralement "
-"utile pour eux d'implémenter `Clone` et `Eq` aussi lorsque cela est "
-"possible, pour faire la vie plus facile pour les testeurs et les "
-"consommateurs de votre bibliothèque. Dans ce cas, nous ne pouvons pas le "
-"faire facilement, car `io::Error` ne les implémente pas."
-
-#: src/error-handling/try-conversions.md:87
+#: src/error-handling/try-conversions.md
 msgid ""
 "A common alternative to a `From` implementation is `Result::map_err`, "
 "especially when the conversion only happens in one place."
 msgstr ""
 
-#: src/error-handling/error.md:1
+#: src/error-handling/try-conversions.md
+msgid ""
+"There is no compatibility requirement for `Option`. A function returning "
+"`Option<T>` can use the `?` operator on `Option<U>` for arbitrary `T` and "
+"`U` types."
+msgstr ""
+
+#: src/error-handling/try-conversions.md
+msgid ""
+"A function that returns `Result` cannot use `?` on `Option` and vice versa. "
+"However, `Option::ok_or` converts `Option` to `Result` whereas `Result::ok` "
+"turns `Result` into `Option`."
+msgstr ""
+
+#: src/error-handling/error.md
 msgid "Dynamic Error Types"
 msgstr "Types d'erreurs dynamiques"
 
-#: src/error-handling/error.md:3
+#: src/error-handling/error.md
 #, fuzzy
 msgid ""
 "Sometimes we want to allow any type of error to be returned without writing "
@@ -10494,29 +11074,29 @@ msgstr ""
 "écrire notre propre énumération couvrant toutes les différentes "
 "possibilités. `std::error::Error` rend cela facile."
 
-#: src/error-handling/error.md:20 src/error-handling/error.md:21
+#: src/error-handling/error.md
 msgid "\"count.dat\""
 msgstr ""
 
-#: src/error-handling/error.md:20
+#: src/error-handling/error.md
 msgid "\"1i3\""
 msgstr ""
 
-#: src/error-handling/error.md:22
+#: src/error-handling/error.md
 msgid "\"Count: {count}\""
 msgstr ""
 
-#: src/error-handling/error.md:23
+#: src/error-handling/error.md
 msgid "\"Error: {err}\""
 msgstr ""
 
-#: src/error-handling/error.md:30
+#: src/error-handling/error.md
 msgid ""
 "The `read_count` function can return `std::io::Error` (from file operations) "
 "or `std::num::ParseIntError` (from `String::parse`)."
 msgstr ""
 
-#: src/error-handling/error.md:33
+#: src/error-handling/error.md
 #, fuzzy
 msgid ""
 "Boxing errors saves on code, but gives up the ability to cleanly handle "
@@ -10532,53 +11112,80 @@ msgstr ""
 "option dans un programme où vous voulez juste afficher le message d'erreur "
 "quelque part."
 
-#: src/error-handling/thiserror-and-anyhow.md:1
-#, fuzzy
-msgid "`thiserror`  and `anyhow`"
-msgstr "`De` et `Dans`"
-
-#: src/error-handling/thiserror-and-anyhow.md:3
+#: src/error-handling/error.md
 msgid ""
-"The [`thiserror`](https://docs.rs/thiserror/)  and [`anyhow`](https://docs."
-"rs/anyhow/) crates are widley used to simplify error handling. `thiserror` "
-"helps create custom error types that implement `From<T>`. `anyhow` helps "
-"with error handling in functions, including adding contextual information to "
-"your errors."
+"Make sure to implement the `std::error::Error` trait when defining a custom "
+"error type so it can be boxed. But if you need to support the `no_std` "
+"attribute, keep in mind that the `std::error::Error` trait is currently "
+"compatible with `no_std` in [nightly](https://github.com/rust-lang/rust/"
+"issues/103765) only."
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:14
+#: src/error-handling/thiserror-and-anyhow.md
+#, fuzzy
+msgid ""
+"The [`thiserror`](https://docs.rs/thiserror/) and [`anyhow`](https://docs.rs/"
+"anyhow/) crates are widely used to simplify error handling."
+msgstr ""
+"La caisse [thiserror](https://docs.rs/thiserror/) est un moyen populaire de "
+"créer un error enum comme nous l'avons fait sur la page précédente :"
+
+#: src/error-handling/thiserror-and-anyhow.md
+msgid ""
+"`thiserror` is often used in libraries to create custom error types that "
+"implement `From<T>`."
+msgstr ""
+
+#: src/error-handling/thiserror-and-anyhow.md
+msgid ""
+"`anyhow` is often used by applications to help with error handling in "
+"functions, including adding contextual information to your errors."
+msgstr ""
+
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "\"Found no username in {0}\""
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:20
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "\"Failed to open {path}\""
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:22
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "\"Failed to read\""
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:32
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "\"Username: {username}\""
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:33
+#: src/error-handling/thiserror-and-anyhow.md
 msgid "\"Error: {err:?}\""
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:40
+#: src/error-handling/thiserror-and-anyhow.md
+#, fuzzy
+msgid "`thiserror`"
+msgstr "\"Erreur\""
+
+#: src/error-handling/thiserror-and-anyhow.md
 msgid ""
 "The `Error` derive macro is provided by `thiserror`, and has lots of useful "
-"attributes like `#[error]` to help define a useful error type."
+"attributes to help define error types in a compact way."
 msgstr ""
 
-#: src/error-handling/thiserror-and-anyhow.md:42
-#, fuzzy
-msgid "`anyhow::Result<V>` is a type alias for `Result<V, anyhow::Error>`."
+#: src/error-handling/thiserror-and-anyhow.md
+msgid "The `std::error::Error` trait is derived automatically."
 msgstr ""
-"`anyhow::Result<V>` est un alias de type pour `Result<V, anyhow::Error>`."
 
-#: src/error-handling/thiserror-and-anyhow.md:43
+#: src/error-handling/thiserror-and-anyhow.md
+msgid "The message from `#[error]` is used to derive the `Display` trait."
+msgstr ""
+
+#: src/error-handling/thiserror-and-anyhow.md
+msgid "`anyhow`"
+msgstr ""
+
+#: src/error-handling/thiserror-and-anyhow.md
 #, fuzzy
 msgid ""
 "`anyhow::Error` is essentially a wrapper around `Box<dyn Error>`. As such "
@@ -10589,7 +11196,13 @@ msgstr ""
 "En tant que tel, ce n'est généralement pas un bon choix pour l'API publique "
 "d'une bibliothèque, mais il est largement utilisé dans les applications."
 
-#: src/error-handling/thiserror-and-anyhow.md:45
+#: src/error-handling/thiserror-and-anyhow.md
+#, fuzzy
+msgid "`anyhow::Result<V>` is a type alias for `Result<V, anyhow::Error>`."
+msgstr ""
+"`anyhow::Result<V>` est un alias de type pour `Result<V, anyhow::Error>`."
+
+#: src/error-handling/thiserror-and-anyhow.md
 #, fuzzy
 msgid ""
 "Actual error type inside of it can be extracted for examination if necessary."
@@ -10597,7 +11210,7 @@ msgstr ""
 "Le type d'erreur réel à l'intérieur peut être extrait pour examen si "
 "nécessaire."
 
-#: src/error-handling/thiserror-and-anyhow.md:46
+#: src/error-handling/thiserror-and-anyhow.md
 #, fuzzy
 msgid ""
 "Functionality provided by `anyhow::Result<T>` may be familiar to Go "
@@ -10608,11 +11221,18 @@ msgstr ""
 "développeurs Go, car elle fournit modèles d'utilisation et ergonomie "
 "similaires à `(T, erreur)` de Go."
 
-#: src/error-handling/exercise.md:1
+#: src/error-handling/thiserror-and-anyhow.md
+msgid ""
+"`anyhow::Context` is a trait implemented for the standard `Result` and "
+"`Option` types. `use anyhow::Context` is necessary to enable `.context()` "
+"and `.with_context()` on those types."
+msgstr ""
+
+#: src/error-handling/exercise.md
 msgid "Exercise: Rewriting with Result"
 msgstr ""
 
-#: src/error-handling/exercise.md:3
+#: src/error-handling/exercise.md
 msgid ""
 "The following implements a very simple parser for an expression language. "
 "However, it handles errors by panicking. Rewrite it to instead use idiomatic "
@@ -10620,110 +11240,138 @@ msgid ""
 "use `thiserror` and `anyhow`."
 msgstr ""
 
-#: src/error-handling/exercise.md:8
+#: src/error-handling/exercise.md
 msgid ""
 "HINT: start by fixing error handling in the `parse` function. Once that is "
 "working correctly, update `Tokenizer` to implement "
 "`Iterator<Item=Result<Token, TokenizerError>>` and handle that in the parser."
 msgstr ""
 
-#: src/error-handling/exercise.md:15 src/error-handling/solution.md:8
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "/// An arithmetic operator.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:22 src/error-handling/solution.md:15
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "/// A token in the expression language.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:30 src/error-handling/solution.md:23
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "/// An expression in the expression language.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:34 src/error-handling/solution.md:27
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "/// A reference to a variable.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:36 src/error-handling/solution.md:29
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "/// A literal number.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:38 src/error-handling/solution.md:31
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "/// A binary operation.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:64 src/error-handling/exercise.md:66
-#: src/error-handling/solution.md:63 src/error-handling/solution.md:65
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "'z'"
 msgstr ""
 
-#: src/error-handling/exercise.md:66 src/error-handling/solution.md:65
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "'_'"
 msgstr ""
 
-#: src/error-handling/exercise.md:72 src/error-handling/solution.md:71
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "'+'"
 msgstr ""
 
-#: src/error-handling/exercise.md:73 src/error-handling/solution.md:72
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "'-'"
 msgstr ""
 
-#: src/error-handling/exercise.md:74
+#: src/error-handling/exercise.md
 msgid "\"Unexpected character {c}\""
 msgstr ""
 
-#: src/error-handling/exercise.md:84 src/error-handling/solution.md:82
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "\"Unexpected end of input\""
 msgstr ""
 
-#: src/error-handling/exercise.md:88
+#: src/error-handling/exercise.md
 msgid "\"Invalid 32-bit integer'\""
 msgstr ""
 
-#: src/error-handling/exercise.md:92 src/error-handling/exercise.md:100
+#: src/error-handling/exercise.md
 msgid "\"Unexpected token {tok:?}\""
 msgstr ""
 
-#: src/error-handling/exercise.md:94 src/error-handling/solution.md:105
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "// Look ahead to parse a binary operation if present.\n"
 msgstr ""
 
-#: src/error-handling/exercise.md:108 src/error-handling/solution.md:120
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "\"10+foo+20-30\""
 msgstr ""
 
-#: src/error-handling/exercise.md:109 src/error-handling/solution.md:121
+#: src/error-handling/exercise.md src/error-handling/solution.md
 msgid "\"{expr:?}\""
 msgstr ""
 
-#: src/error-handling/solution.md:41
+#: src/error-handling/solution.md
 msgid "\"Unexpected character '{0}' in input\""
 msgstr ""
 
-#: src/error-handling/solution.md:80
+#: src/error-handling/solution.md
 msgid "\"Tokenizer error: {0}\""
 msgstr ""
 
-#: src/error-handling/solution.md:84
+#: src/error-handling/solution.md
 msgid "\"Unexpected token {0:?}\""
 msgstr ""
 
-#: src/error-handling/solution.md:86
+#: src/error-handling/solution.md
 msgid "\"Invalid number\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe.md:3
+#: src/unsafe-rust.md
+msgid "[Unsafe](./unsafe-rust/unsafe.md) (5 minutes)"
+msgstr ""
+
+#: src/unsafe-rust.md
+msgid ""
+"[Dereferencing Raw Pointers](./unsafe-rust/dereferencing.md) (10 minutes)"
+msgstr ""
+
+#: src/unsafe-rust.md
+msgid "[Mutable Static Variables](./unsafe-rust/mutable-static.md) (5 minutes)"
+msgstr ""
+
+#: src/unsafe-rust.md
+msgid "[Unions](./unsafe-rust/unions.md) (5 minutes)"
+msgstr ""
+
+#: src/unsafe-rust.md
+msgid "[Unsafe Functions](./unsafe-rust/unsafe-functions.md) (5 minutes)"
+msgstr ""
+
+#: src/unsafe-rust.md
+msgid "[Unsafe Traits](./unsafe-rust/unsafe-traits.md) (5 minutes)"
+msgstr ""
+
+#: src/unsafe-rust.md
+msgid "[Exercise: FFI Wrapper](./unsafe-rust/exercise.md) (30 minutes)"
+msgstr ""
+
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "The Rust language has two parts:"
 msgstr "Le langage Rust comporte deux parties :"
 
-#: src/unsafe-rust/unsafe.md:5
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "**Safe Rust:** memory safe, no undefined behavior possible."
 msgstr ""
 "**Safe Rust :** mémoire sécurisée, aucun comportement indéfini possible."
 
-#: src/unsafe-rust/unsafe.md:6
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid ""
 "**Unsafe Rust:** can trigger undefined behavior if preconditions are "
@@ -10732,7 +11380,7 @@ msgstr ""
 "**Unsafe Rust :** peut déclencher un comportement indéfini si les conditions "
 "préalables ne sont pas respectées."
 
-#: src/unsafe-rust/unsafe.md:8
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid ""
 "We saw mostly safe Rust in this course, but it's important to know what "
@@ -10741,7 +11389,7 @@ msgstr ""
 "Nous verrons principalement Rust sûr dans ce cours, mais il est important de "
 "savoir ce qu'est Rust non securisé (_unsafe_)."
 
-#: src/unsafe-rust/unsafe.md:11
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid ""
 "Unsafe code is usually small and isolated, and its correctness should be "
@@ -10751,38 +11399,38 @@ msgstr ""
 "être soigneusement documenté. Il est généralement enveloppé dans une couche "
 "d'abstraction sûre."
 
-#: src/unsafe-rust/unsafe.md:14
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "Unsafe Rust gives you access to five new capabilities:"
 msgstr "Unsafe Rust vous donne accès à cinq nouvelles fonctionnalités :"
 
-#: src/unsafe-rust/unsafe.md:16
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "Dereference raw pointers."
 msgstr "Déréférencer les pointeurs bruts."
 
-#: src/unsafe-rust/unsafe.md:17
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "Access or modify mutable static variables."
 msgstr "Accéder ou modifier des variables statiques mutables."
 
-#: src/unsafe-rust/unsafe.md:18
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "Access `union` fields."
 msgstr "Accéder aux champs \"union\"."
 
-#: src/unsafe-rust/unsafe.md:19
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid "Call `unsafe` functions, including `extern` functions."
 msgstr ""
 "Appelez les fonctions `unsafe`, y compris les fonctions `extern`. \\* Mettre "
 "en œuvre les traits \" non sécurisés \"."
 
-#: src/unsafe-rust/unsafe.md:20
+#: src/unsafe-rust/unsafe.md
 msgid "Implement `unsafe` traits."
 msgstr ""
 
-#: src/unsafe-rust/unsafe.md:22
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid ""
 "We will briefly cover unsafe capabilities next. For full details, please see "
@@ -10794,7 +11442,7 @@ msgstr ""
 "lang.org/book/ch19-01-unsafe-rust.html) et le [Rustonomicon](https://doc."
 "rust-lang.org/nomicon/)."
 
-#: src/unsafe-rust/unsafe.md:28
+#: src/unsafe-rust/unsafe.md
 #, fuzzy
 msgid ""
 "Unsafe Rust does not mean the code is incorrect. It means that developers "
@@ -10807,18 +11455,18 @@ msgstr ""
 "doit écrire le code correct en eux-mêmes. Cela signifie que le compilateur "
 "n'applique plus les règles de sécurité de la mémoire de Rust."
 
-#: src/unsafe-rust/dereferencing.md:3
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid "Creating pointers is safe, but dereferencing them requires `unsafe`:"
 msgstr ""
 "La création de pointeurs est sûre, mais leur déréférencement nécessite "
 "`unsafe` :"
 
-#: src/unsafe-rust/dereferencing.md:7
+#: src/unsafe-rust/dereferencing.md
 msgid "\"careful!\""
 msgstr ""
 
-#: src/unsafe-rust/dereferencing.md:12
+#: src/unsafe-rust/dereferencing.md
 msgid ""
 "// Safe because r1 and r2 were obtained from references and so are\n"
 "    // guaranteed to be non-null and properly aligned, the objects "
@@ -10828,19 +11476,19 @@ msgid ""
 "    // references or concurrently through any other pointers.\n"
 msgstr ""
 
-#: src/unsafe-rust/dereferencing.md:18
+#: src/unsafe-rust/dereferencing.md
 msgid "\"r1 is: {}\""
 msgstr ""
 
-#: src/unsafe-rust/dereferencing.md:19
+#: src/unsafe-rust/dereferencing.md
 msgid "\"uhoh\""
 msgstr ""
 
-#: src/unsafe-rust/dereferencing.md:20
+#: src/unsafe-rust/dereferencing.md
 msgid "\"r2 is: {}\""
 msgstr ""
 
-#: src/unsafe-rust/dereferencing.md:23
+#: src/unsafe-rust/dereferencing.md
 msgid ""
 "// NOT SAFE. DO NOT DO THIS.\n"
 "    /*\n"
@@ -10850,7 +11498,7 @@ msgid ""
 "    */"
 msgstr ""
 
-#: src/unsafe-rust/dereferencing.md:34
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid ""
 "It is good practice (and required by the Android Rust style guide) to write "
@@ -10862,7 +11510,7 @@ msgstr ""
 "l'intérieur satisfait aux exigences de sécurité de l'unsafe opérations qu'il "
 "effectue."
 
-#: src/unsafe-rust/dereferencing.md:38
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid ""
 "In the case of pointer dereferences, this means that the pointers must be "
@@ -10872,12 +11520,12 @@ msgstr ""
 "pointeurs doivent être [_valid_](https://doc.rust-lang.org/std/ptr/index."
 "html#safety), c'est-à-dire :"
 
-#: src/unsafe-rust/dereferencing.md:41
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid "The pointer must be non-null."
 msgstr "Le pointeur doit être non nul."
 
-#: src/unsafe-rust/dereferencing.md:42
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid ""
 "The pointer must be _dereferenceable_ (within the bounds of a single "
@@ -10886,17 +11534,17 @@ msgstr ""
 "Le pointeur doit être _dereferenceable_ (dans les limites d'un seul objet "
 "alloué)."
 
-#: src/unsafe-rust/dereferencing.md:43
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid "The object must not have been deallocated."
 msgstr "L'objet ne doit pas avoir été désalloué."
 
-#: src/unsafe-rust/dereferencing.md:44
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid "There must not be concurrent accesses to the same location."
 msgstr "Il ne doit pas y avoir d'accès simultanés au même endroit."
 
-#: src/unsafe-rust/dereferencing.md:45
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid ""
 "If the pointer was obtained by casting a reference, the underlying object "
@@ -10906,34 +11554,34 @@ msgstr ""
 "jacent doit être actif et non référence peut être utilisée pour accéder à la "
 "mémoire."
 
-#: src/unsafe-rust/dereferencing.md:48
+#: src/unsafe-rust/dereferencing.md
 #, fuzzy
 msgid "In most cases the pointer must also be properly aligned."
 msgstr ""
 "Dans la plupart des cas, le pointeur doit également être correctement aligné."
 
-#: src/unsafe-rust/dereferencing.md:50
+#: src/unsafe-rust/dereferencing.md
 msgid ""
-"The \"NOT SAFE\" sectoin gives an example of a common kind of UB bug: `*r1` "
+"The \"NOT SAFE\" section gives an example of a common kind of UB bug: `*r1` "
 "has the `'static` lifetime, so `r3` has type `&'static String`, and thus "
 "outlives `s`. Creating a reference from a pointer requires _great care_."
 msgstr ""
 
-#: src/unsafe-rust/mutable-static.md:3
+#: src/unsafe-rust/mutable-static.md
 #, fuzzy
 msgid "It is safe to read an immutable static variable:"
 msgstr "Il est sûr de lire une variable statique immuable :"
 
-#: src/unsafe-rust/mutable-static.md:6
+#: src/unsafe-rust/mutable-static.md
 #, fuzzy
 msgid "\"Hello, world!\""
 msgstr "Bonjour le monde!"
 
-#: src/unsafe-rust/mutable-static.md:9
+#: src/unsafe-rust/mutable-static.md
 msgid "\"HELLO_WORLD: {HELLO_WORLD}\""
 msgstr ""
 
-#: src/unsafe-rust/mutable-static.md:13
+#: src/unsafe-rust/mutable-static.md
 #, fuzzy
 msgid ""
 "However, since data races can occur, it is unsafe to read and write mutable "
@@ -10942,15 +11590,11 @@ msgstr ""
 "Cependant, étant donné que des courses de données peuvent se produire, il "
 "n'est pas sûr de lire et d'écrire mutable variables statiques :"
 
-#: src/unsafe-rust/mutable-static.md:20 src/unsafe-rust/mutable-static.md:26
-msgid "// Potential data race!\n"
-msgstr ""
-
-#: src/unsafe-rust/mutable-static.md:26
+#: src/unsafe-rust/mutable-static.md
 msgid "\"COUNTER: {COUNTER}\""
 msgstr ""
 
-#: src/unsafe-rust/mutable-static.md:32
+#: src/unsafe-rust/mutable-static.md
 msgid ""
 "The program here is safe because it is single-threaded. However, the Rust "
 "compiler is conservative and will assume the worst. Try removing the "
@@ -10958,7 +11602,7 @@ msgid ""
 "mutate a static from multiple threads."
 msgstr ""
 
-#: src/unsafe-rust/mutable-static.md:36
+#: src/unsafe-rust/mutable-static.md
 #, fuzzy
 msgid ""
 "Using a mutable static is generally a bad idea, but there are some cases "
@@ -10970,27 +11614,27 @@ msgstr ""
 "niveau, comme l'implémentation d'un allocation de tas ou l'utilisation de "
 "certaines API C."
 
-#: src/unsafe-rust/unions.md:3
+#: src/unsafe-rust/unions.md
 #, fuzzy
 msgid "Unions are like enums, but you need to track the active field yourself:"
 msgstr ""
 "Les unions sont comme des énumérations, mais vous devez suivre vous-même le "
 "champ actif :"
 
-#: src/unsafe-rust/unions.md:14
+#: src/unsafe-rust/unions.md
 msgid "\"int: {}\""
 msgstr ""
 
-#: src/unsafe-rust/unions.md:15
+#: src/unsafe-rust/unions.md
 msgid "\"bool: {}\""
 msgstr ""
 
-#: src/unsafe-rust/unions.md:15
+#: src/unsafe-rust/unions.md
 #, fuzzy
 msgid "// Undefined behavior!\n"
 msgstr "Aucun comportement indéfini à l'exécution :"
 
-#: src/unsafe-rust/unions.md:21
+#: src/unsafe-rust/unions.md
 #, fuzzy
 msgid ""
 "Unions are very rarely needed in Rust as you can usually use an enum. They "
@@ -11000,7 +11644,7 @@ msgstr ""
 "généralement utiliser une énumération. Ils sont parfois nécessaires pour "
 "interagir avec les API de la bibliothèque C."
 
-#: src/unsafe-rust/unions.md:24
+#: src/unsafe-rust/unions.md
 #, fuzzy
 msgid ""
 "If you just want to reinterpret bytes as a different type, you probably want "
@@ -11013,11 +11657,11 @@ msgstr ""
 "stable/std/mem/fn.transmute.html) ou un coffre-fort wrapper tel que la "
 "caisse [`zerocopy`](https://crates.io/crates/zerocopy)."
 
-#: src/unsafe-rust/unsafe-functions.md:3 src/unsafe-rust/unsafe-functions.md:73
+#: src/unsafe-rust/unsafe-functions.md
 msgid "Calling Unsafe Functions"
 msgstr "Appel de fonctions non sécurisées"
 
-#: src/unsafe-rust/unsafe-functions.md:5
+#: src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid ""
 "A function or method can be marked `unsafe` if it has extra preconditions "
@@ -11027,68 +11671,57 @@ msgstr ""
 "conditions préalables supplémentaires que vous doit respecter pour éviter un "
 "comportement indéfini :"
 
-#: src/unsafe-rust/unsafe-functions.md:9 src/unsafe-rust/exercise.md:89
-#: src/unsafe-rust/solution.md:41 src/android/interoperability/with-c.md:9
-#: src/android/interoperability/with-c/rust.md:15
-#: src/android/interoperability/with-c/rust.md:30
-#: src/android/interoperability/cpp/cpp-bridge.md:29
-#: src/android/interoperability/cpp/cpp-bridge.md:38
-#: src/exercises/chromium/build-rules.md:7
-#: src/exercises/chromium/build-rules.md:19
-#: src/bare-metal/aps/inline-assembly.md:18
-#: src/bare-metal/aps/better-uart/using.md:24
-#: src/bare-metal/aps/logging/using.md:23 src/exercises/bare-metal/rtc.md:46
-#: src/exercises/bare-metal/rtc.md:100 src/exercises/bare-metal/rtc.md:106
-#: src/exercises/bare-metal/rtc.md:113 src/exercises/bare-metal/rtc.md:119
-#: src/exercises/bare-metal/rtc.md:125 src/exercises/bare-metal/rtc.md:131
-#: src/exercises/bare-metal/rtc.md:137 src/exercises/bare-metal/rtc.md:143
-#: src/exercises/bare-metal/solutions-afternoon.md:43
+#: src/unsafe-rust/unsafe-functions.md src/unsafe-rust/exercise.md
+#: src/unsafe-rust/solution.md src/android/interoperability/with-c.md
+#: src/android/interoperability/with-c/rust.md
+#: src/android/interoperability/cpp/cpp-bridge.md
+#: src/exercises/chromium/build-rules.md src/bare-metal/aps/inline-assembly.md
+#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"C\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:14
+#: src/unsafe-rust/unsafe-functions.md
 msgid "\"🗻∈🌏\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:16
+#: src/unsafe-rust/unsafe-functions.md
 msgid ""
 "// Safe because the indices are in the correct order, within the bounds of\n"
 "    // the string slice, and lie on UTF-8 sequence boundaries.\n"
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:19
-#: src/unsafe-rust/unsafe-functions.md:20
-#: src/unsafe-rust/unsafe-functions.md:21
+#: src/unsafe-rust/unsafe-functions.md
 msgid "\"emoji: {}\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:24
+#: src/unsafe-rust/unsafe-functions.md
 msgid "\"char count: {}\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:27
+#: src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid "// Undefined behavior if abs misbehaves.\n"
 msgstr "Aucun comportement indéfini à l'exécution :"
 
-#: src/unsafe-rust/unsafe-functions.md:28
+#: src/unsafe-rust/unsafe-functions.md
 msgid "\"Absolute value of -3 according to C: {}\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:31
+#: src/unsafe-rust/unsafe-functions.md
 msgid ""
 "// Not upholding the UTF-8 encoding requirement breaks memory safety!\n"
 "    // println!(\"emoji: {}\", unsafe { emojis.get_unchecked(0..3) });\n"
-"    // println!(\"char count: {}\", count_chars(unsafe { emojis."
-"get_unchecked(0..3) }));\n"
+"    // println!(\"char count: {}\", count_chars(unsafe {\n"
+"    // emojis.get_unchecked(0..3) }));\n"
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:41
-#: src/unsafe-rust/unsafe-functions.md:85
+#: src/unsafe-rust/unsafe-functions.md
 msgid "Writing Unsafe Functions"
 msgstr "Ecrire des fonctions non sécurisées"
 
-#: src/unsafe-rust/unsafe-functions.md:43
+#: src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid ""
 "You can mark your own functions as `unsafe` if they require particular "
@@ -11097,7 +11730,7 @@ msgstr ""
 "Vous pouvez marquer vos propres fonctions comme \"non sécurisées\" si elles "
 "nécessitent des conditions particulières pour éviter undefined comportement."
 
-#: src/unsafe-rust/unsafe-functions.md:47
+#: src/unsafe-rust/unsafe-functions.md
 msgid ""
 "/// Swaps the values pointed to by the given pointers.\n"
 "///\n"
@@ -11106,20 +11739,20 @@ msgid ""
 "/// The pointers must be valid and properly aligned.\n"
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:62
+#: src/unsafe-rust/unsafe-functions.md
 msgid "// Safe because ...\n"
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:67
+#: src/unsafe-rust/unsafe-functions.md
 msgid "\"a = {}, b = {}\""
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:75
+#: src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid ""
 "`get_unchecked`, like most `_unchecked` functions, is unsafe, because it can "
 "create UB if the range is incorrect. `abs` is incorrect for a different "
-"reason: it is an external function (FFI).  Calling external functions is "
+"reason: it is an external function (FFI). Calling external functions is "
 "usually only a problem when those functions do things with pointers which "
 "might violate Rust's memory model, but in general any C function might have "
 "undefined behaviour under any arbitrary circumstances."
@@ -11129,13 +11762,13 @@ msgstr ""
 "Rust, mais en général, toute fonction C peut avoir un comportement indéfini "
 "sous n'importe quel circonstances arbitraires."
 
-#: src/unsafe-rust/unsafe-functions.md:82
+#: src/unsafe-rust/unsafe-functions.md
 msgid ""
 "The `\"C\"` in this example is the ABI; [other ABIs are available too]"
 "(https://doc.rust-lang.org/reference/items/external-blocks.html)."
 msgstr ""
 
-#: src/unsafe-rust/unsafe-functions.md:87
+#: src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid ""
 "We wouldn't actually use pointers for a `swap` function - it can be done "
@@ -11144,7 +11777,7 @@ msgstr ""
 "Nous n'utiliserions pas de pointeurs pour cela car cela peut être fait en "
 "toute sécurité avec des références."
 
-#: src/unsafe-rust/unsafe-functions.md:90
+#: src/unsafe-rust/unsafe-functions.md
 #, fuzzy
 msgid ""
 "Note that unsafe code is allowed within an unsafe function without an "
@@ -11157,11 +11790,11 @@ msgstr ""
 "`#[deny(unsafe_op_in_unsafe_fn)]`. Essayez de l'ajouter et voyez ce qui se "
 "passe."
 
-#: src/unsafe-rust/unsafe-traits.md:1
+#: src/unsafe-rust/unsafe-traits.md
 msgid "Implementing Unsafe Traits"
 msgstr "Implémentation de traits non sécurisés"
 
-#: src/unsafe-rust/unsafe-traits.md:3
+#: src/unsafe-rust/unsafe-traits.md
 #, fuzzy
 msgid ""
 "Like with functions, you can mark a trait as `unsafe` if the implementation "
@@ -11171,7 +11804,7 @@ msgstr ""
 "sécurisé\" si l'implémentation doit garantir conditions particulières pour "
 "éviter un comportement indéfini."
 
-#: src/unsafe-rust/unsafe-traits.md:6
+#: src/unsafe-rust/unsafe-traits.md
 #, fuzzy
 msgid ""
 "For example, the `zerocopy` crate has an unsafe trait that looks [something "
@@ -11181,18 +11814,18 @@ msgstr ""
 "[quelque chose comme ça](https://docs.rs/zerocopy/latest/zerocopy/trait."
 "AsBytes.html):"
 
-#: src/unsafe-rust/unsafe-traits.md:12
+#: src/unsafe-rust/unsafe-traits.md
 msgid ""
 "/// ...\n"
 "/// # Safety\n"
 "/// The type must have a defined representation and no padding.\n"
 msgstr ""
 
-#: src/unsafe-rust/unsafe-traits.md:23
+#: src/unsafe-rust/unsafe-traits.md
 msgid "// Safe because u32 has a defined representation and no padding.\n"
 msgstr ""
 
-#: src/unsafe-rust/unsafe-traits.md:30
+#: src/unsafe-rust/unsafe-traits.md
 #, fuzzy
 msgid ""
 "There should be a `# Safety` section on the Rustdoc for the trait explaining "
@@ -11201,7 +11834,7 @@ msgstr ""
 "Il devrait y avoir une section `# Sécurité` sur le Rustdoc pour le trait "
 "expliquant les exigences pour le trait à mettre en œuvre en toute sécurité."
 
-#: src/unsafe-rust/unsafe-traits.md:33
+#: src/unsafe-rust/unsafe-traits.md
 #, fuzzy
 msgid ""
 "The actual safety section for `AsBytes` is rather longer and more "
@@ -11210,16 +11843,16 @@ msgstr ""
 "La section de sécurité actuelle pour `AsBytes` est plutôt plus longue et "
 "plus compliquée."
 
-#: src/unsafe-rust/unsafe-traits.md:35
+#: src/unsafe-rust/unsafe-traits.md
 #, fuzzy
 msgid "The built-in `Send` and `Sync` traits are unsafe."
 msgstr "Les traits intégrés \"Envoyer\" et \"Synchroniser\" ne sont pas sûrs."
 
-#: src/unsafe-rust/exercise.md:1
+#: src/unsafe-rust/exercise.md
 msgid "Safe FFI Wrapper"
 msgstr "Enveloppe FFI sécurisée"
 
-#: src/unsafe-rust/exercise.md:3
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid ""
 "Rust has great support for calling functions through a _foreign function "
@@ -11231,128 +11864,128 @@ msgstr ""
 "sûr pour la `libc` fonctions que vous utiliseriez à partir de C pour lire "
 "les noms de fichiers d'un répertoire."
 
-#: src/unsafe-rust/exercise.md:7
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid "You will want to consult the manual pages:"
 msgstr "Vous voudrez consulter les pages de manuel :"
 
-#: src/unsafe-rust/exercise.md:9
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid "[`opendir(3)`](https://man7.org/linux/man-pages/man3/opendir.3.html)"
 msgstr "[`opendir(3)`](https://man7.org/linux/man-pages/man3/opendir.3.html)"
 
-#: src/unsafe-rust/exercise.md:10
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid "[`readdir(3)`](https://man7.org/linux/man-pages/man3/readdir.3.html)"
 msgstr "[`readdir(3)`](https://man7.org/linux/man-pages/man3/readdir.3.html)"
 
-#: src/unsafe-rust/exercise.md:11
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid "[`closedir(3)`](https://man7.org/linux/man-pages/man3/closedir.3.html)"
 msgstr "[`closedir(3)`](https://man7.org/linux/man-pages/man3/closedir.3.html)"
 
-#: src/unsafe-rust/exercise.md:13
+#: src/unsafe-rust/exercise.md
 msgid ""
 "You will also want to browse the [`std::ffi`](https://doc.rust-lang.org/std/"
 "ffi/) module. There you find a number of string types which you need for the "
 "exercise:"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:16
+#: src/unsafe-rust/exercise.md
 msgid "Encoding"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:16
+#: src/unsafe-rust/exercise.md
 msgid "Use"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:18
+#: src/unsafe-rust/exercise.md
 msgid ""
 "[`str`](https://doc.rust-lang.org/std/primitive.str.html) and [`String`]"
 "(https://doc.rust-lang.org/std/string/struct.String.html)"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:18
+#: src/unsafe-rust/exercise.md
 msgid "UTF-8"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:18
+#: src/unsafe-rust/exercise.md
 msgid "Text processing in Rust"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:19
+#: src/unsafe-rust/exercise.md
 msgid ""
 "[`CStr`](https://doc.rust-lang.org/std/ffi/struct.CStr.html) and [`CString`]"
 "(https://doc.rust-lang.org/std/ffi/struct.CString.html)"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:19
+#: src/unsafe-rust/exercise.md
 msgid "NUL-terminated"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:19
+#: src/unsafe-rust/exercise.md
 msgid "Communicating with C functions"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:20
+#: src/unsafe-rust/exercise.md
 msgid ""
 "[`OsStr`](https://doc.rust-lang.org/std/ffi/struct.OsStr.html) and "
 "[`OsString`](https://doc.rust-lang.org/std/ffi/struct.OsString.html)"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:20
+#: src/unsafe-rust/exercise.md
 msgid "OS-specific"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:20
+#: src/unsafe-rust/exercise.md
 msgid "Communicating with the OS"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:22
+#: src/unsafe-rust/exercise.md
 msgid "You will convert between all these types:"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:24
+#: src/unsafe-rust/exercise.md
 msgid ""
 "`&str` to `CString`: you need to allocate space for a trailing `\\0` "
 "character,"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:25
+#: src/unsafe-rust/exercise.md
 msgid "`CString` to `*const i8`: you need a pointer to call C functions,"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:26
+#: src/unsafe-rust/exercise.md
 msgid ""
 "`*const i8` to `&CStr`: you need something which can find the trailing `\\0` "
 "character,"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:27
+#: src/unsafe-rust/exercise.md
 msgid ""
 "`&CStr` to `&[u8]`: a slice of bytes is the universal interface for \"some "
 "unknown data\","
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:28
+#: src/unsafe-rust/exercise.md
 msgid ""
 "`&[u8]` to `&OsStr`: `&OsStr` is a step towards `OsString`, use [`OsStrExt`]"
 "(https://doc.rust-lang.org/std/os/unix/ffi/trait.OsStrExt.html) to create it,"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:31
+#: src/unsafe-rust/exercise.md
 msgid ""
 "`&OsStr` to `OsString`: you need to clone the data in `&OsStr` to be able to "
 "return it and call `readdir` again."
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:34
+#: src/unsafe-rust/exercise.md
 msgid ""
 "The [Nomicon](https://doc.rust-lang.org/nomicon/ffi.html) also has a very "
 "useful chapter about FFI."
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:45
+#: src/unsafe-rust/exercise.md
 #, fuzzy
 msgid ""
 "Copy the code below to <https://play.rust-lang.org/> and fill in the missing "
@@ -11361,35 +11994,30 @@ msgstr ""
 "Copiez le code ci-dessous sur <https://play.rust-lang.org/> et remplissez "
 "les champs manquants fonctions et méthodes :"
 
-#: src/unsafe-rust/exercise.md:54 src/unsafe-rust/exercise.md:67
-#: src/unsafe-rust/exercise.md:78 src/unsafe-rust/exercise.md:92
-#: src/unsafe-rust/exercise.md:100 src/unsafe-rust/solution.md:6
-#: src/unsafe-rust/solution.md:19 src/unsafe-rust/solution.md:30
-#: src/unsafe-rust/solution.md:44 src/unsafe-rust/solution.md:52
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "\"macos\""
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:57 src/unsafe-rust/solution.md:9
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "// Opaque type. See https://doc.rust-lang.org/nomicon/ffi.html.\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:64 src/unsafe-rust/solution.md:16
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid ""
 "// Layout according to the Linux man page for readdir(3), where ino_t and\n"
 "    // off_t are resolved according to the definitions in\n"
 "    // /usr/include/x86_64-linux-gnu/{sys/types.h, bits/typesizes.h}.\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:77 src/unsafe-rust/solution.md:29
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "// Layout according to the macOS man page for dir(5).\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:92 src/unsafe-rust/exercise.md:100
-#: src/unsafe-rust/solution.md:44 src/unsafe-rust/solution.md:52
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "\"x86_64\""
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:95 src/unsafe-rust/solution.md:47
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid ""
 "// See https://github.com/rust-lang/libc/issues/414 and the section on\n"
 "        // _DARWIN_FEATURE_64_BIT_INODE in the macOS man page for stat(2).\n"
@@ -11400,112 +12028,111 @@ msgid ""
 "PowerPC.\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:101 src/unsafe-rust/solution.md:53
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "\"readdir$INODE64\""
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:119 src/unsafe-rust/solution.md:71
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid ""
 "// Call opendir and return a Ok value if that worked,\n"
 "        // otherwise return Err with a message.\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:128
+#: src/unsafe-rust/exercise.md
 msgid "// Keep calling readdir until we get a NULL pointer back.\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:135 src/unsafe-rust/solution.md:104
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "// Call closedir as needed.\n"
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:141 src/unsafe-rust/solution.md:115
-#: src/unsafe-rust/solution.md:139 src/unsafe-rust/solution.md:154
-#: src/android/interoperability/with-c/rust.md:44
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
+#: src/android/interoperability/with-c/rust.md
 msgid "\".\""
 msgstr ""
 
-#: src/unsafe-rust/exercise.md:142 src/unsafe-rust/solution.md:116
+#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md
 msgid "\"files: {:#?}\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:73
+#: src/unsafe-rust/solution.md
 msgid "\"Invalid path: {err}\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:74
+#: src/unsafe-rust/solution.md
 msgid "// SAFETY: path.as_ptr() cannot be NULL.\n"
 msgstr ""
 
-#: src/unsafe-rust/solution.md:77
+#: src/unsafe-rust/solution.md
 msgid "\"Could not open {:?}\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:87
+#: src/unsafe-rust/solution.md
 msgid ""
 "// Keep calling readdir until we get a NULL pointer back.\n"
 "        // SAFETY: self.dir is never NULL.\n"
 msgstr ""
 
-#: src/unsafe-rust/solution.md:91
+#: src/unsafe-rust/solution.md
 msgid "// We have reached the end of the directory.\n"
 msgstr ""
 
-#: src/unsafe-rust/solution.md:94
+#: src/unsafe-rust/solution.md
 msgid ""
 "// SAFETY: dirent is not NULL and dirent.d_name is NUL\n"
 "        // terminated.\n"
 msgstr ""
 
-#: src/unsafe-rust/solution.md:106
+#: src/unsafe-rust/solution.md
 msgid "// SAFETY: self.dir is not NULL.\n"
 msgstr ""
 
-#: src/unsafe-rust/solution.md:108
+#: src/unsafe-rust/solution.md
 msgid "\"Could not close {:?}\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:127
+#: src/unsafe-rust/solution.md
 msgid "\"no-such-directory\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:135 src/unsafe-rust/solution.md:150
+#: src/unsafe-rust/solution.md
 msgid "\"Non UTF-8 character in path\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:139 src/unsafe-rust/solution.md:154
+#: src/unsafe-rust/solution.md
 msgid "\"..\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:146 src/unsafe-rust/solution.md:154
+#: src/unsafe-rust/solution.md
 msgid "\"foo.txt\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:146
+#: src/unsafe-rust/solution.md
 msgid "\"The Foo Diaries\\n\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:147 src/unsafe-rust/solution.md:154
+#: src/unsafe-rust/solution.md
 msgid "\"bar.png\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:147
+#: src/unsafe-rust/solution.md
 msgid "\"<PNG>\\n\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:148 src/unsafe-rust/solution.md:154
+#: src/unsafe-rust/solution.md
 msgid "\"crab.rs\""
 msgstr ""
 
-#: src/unsafe-rust/solution.md:148
+#: src/unsafe-rust/solution.md
 msgid "\"//! Crab\\n\""
 msgstr ""
 
-#: src/android.md:1
+#: src/android.md
 #, fuzzy
 msgid "Welcome to Rust in Android"
 msgstr "Bienvenue au jour 1"
 
-#: src/android.md:3
+#: src/android.md
 #, fuzzy
 msgid ""
 "Rust is supported for system software on Android. This means that you can "
@@ -11517,7 +12144,7 @@ msgstr ""
 "système d'exploitation dans Rust, ainsi que l'extension prestations "
 "existantes."
 
-#: src/android.md:7
+#: src/android.md
 msgid ""
 "We will attempt to call Rust from one of your own projects today. So try to "
 "find a little corner of your code base where we can move some lines of code "
@@ -11530,37 +12157,37 @@ msgstr ""
 "dépendances et de types \"exotiques\", le mieux c'est. Quelque chose qui "
 "analyse quelques octets de donnée brute serait idéal."
 
-#: src/android.md:14
+#: src/android.md
 msgid ""
 "The speaker may mention any of the following given the increased use of Rust "
 "in Android:"
 msgstr ""
 
-#: src/android.md:17
+#: src/android.md
 msgid ""
 "Service example: [DNS over HTTP](https://security.googleblog.com/2022/07/dns-"
 "over-http3-in-android.html)"
 msgstr ""
 
-#: src/android.md:19
+#: src/android.md
 msgid ""
 "Libraries: [Rutabaga Virtual Graphics Interface](https://crosvm.dev/book/"
 "appendix/rutabaga_gfx.html)"
 msgstr ""
 
-#: src/android.md:21
+#: src/android.md
 msgid ""
 "Kernel Drivers: [Binder](https://lore.kernel.org/rust-for-linux/20231101-"
 "rust-binder-v1-0-08ba9197f637@google.com/)"
 msgstr ""
 
-#: src/android.md:23
+#: src/android.md
 msgid ""
 "Firmware: [pKVM firmware](https://security.googleblog.com/2023/10/bare-metal-"
 "rust-in-android.html)"
 msgstr ""
 
-#: src/android/setup.md:3
+#: src/android/setup.md
 #, fuzzy
 msgid ""
 "We will be using a Cuttlefish Android Virtual Device to test our code. Make "
@@ -11569,7 +12196,7 @@ msgstr ""
 "Nous utiliserons un appareil virtuel Android pour tester notre code. Assurez-"
 "vous que vous avez accéder à un ou en créer un nouveau avec :"
 
-#: src/android/setup.md:12
+#: src/android/setup.md
 #, fuzzy
 msgid ""
 "Please see the [Android Developer Codelab](https://source.android.com/docs/"
@@ -11578,62 +12205,62 @@ msgstr ""
 "Veuillez consulter le \\[Développeur Android Codelab\\] (https://source."
 "android.com/docs/setup/start) pour plus de détails."
 
-#: src/android/setup.md:19
+#: src/android/setup.md
 msgid ""
 "Cuttlefish is a reference Android device designed to work on generic Linux "
-"desktops.  MacOS support is also planned."
+"desktops. MacOS support is also planned."
 msgstr ""
 
-#: src/android/setup.md:21
+#: src/android/setup.md
 msgid ""
 "The Cuttlefish system image maintains high fidelity to real devices, and is "
 "the ideal emulator to run many Rust use cases."
 msgstr ""
 
-#: src/android/build-rules.md:3
+#: src/android/build-rules.md
 #, fuzzy
 msgid "The Android build system (Soong) supports Rust via a number of modules:"
 msgstr ""
 "Le système de construction Android (Soong) prend en charge Rust via un "
 "certain nombre de modules :"
 
-#: src/android/build-rules.md:5
+#: src/android/build-rules.md
 #, fuzzy
 msgid "Module Type"
 msgstr "Type de module"
 
-#: src/android/build-rules.md:5
+#: src/android/build-rules.md
 #, fuzzy
 msgid "Description"
 msgstr "Descriptif"
 
-#: src/android/build-rules.md:7
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_binary`"
 msgstr "`rust_binaire`"
 
-#: src/android/build-rules.md:7
+#: src/android/build-rules.md
 #, fuzzy
 msgid "Produces a Rust binary."
 msgstr "Produit un binaire Rust."
 
-#: src/android/build-rules.md:8
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_library`"
 msgstr "`rust_library`"
 
-#: src/android/build-rules.md:8
+#: src/android/build-rules.md
 #, fuzzy
 msgid "Produces a Rust library, and provides both `rlib` and `dylib` variants."
 msgstr ""
 "Produit une bibliothèque Rust et fournit les variantes `rlib` et `dylib`."
 
-#: src/android/build-rules.md:9
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_ffi`"
 msgstr "`rust_ffi`"
 
-#: src/android/build-rules.md:9
+#: src/android/build-rules.md
 #, fuzzy
 msgid ""
 "Produces a Rust C library usable by `cc` modules, and provides both static "
@@ -11642,12 +12269,12 @@ msgstr ""
 "Produit une bibliothèque Rust C utilisable par les modules `cc` et fournit "
 "des variantes statiques et partagées."
 
-#: src/android/build-rules.md:10
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_proc_macro`"
 msgstr "`rust_proc_macro`"
 
-#: src/android/build-rules.md:10
+#: src/android/build-rules.md
 #, fuzzy
 msgid ""
 "Produces a `proc-macro` Rust library. These are analogous to compiler "
@@ -11656,33 +12283,33 @@ msgstr ""
 "Produit une bibliothèque Rust `proc-macro`. Ceux-ci sont analogues aux "
 "plugins du compilateur."
 
-#: src/android/build-rules.md:11
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_test`"
 msgstr "`rust_test`"
 
-#: src/android/build-rules.md:11
+#: src/android/build-rules.md
 #, fuzzy
 msgid "Produces a Rust test binary that uses the standard Rust test harness."
 msgstr ""
 "Produit un binaire de test Rust qui utilise le harnais de test Rust standard."
 
-#: src/android/build-rules.md:12
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_fuzz`"
 msgstr "`rust_fuzz`"
 
-#: src/android/build-rules.md:12
+#: src/android/build-rules.md
 #, fuzzy
 msgid "Produces a Rust fuzz binary leveraging `libfuzzer`."
 msgstr "Produit un exécutable Rust fuzz utilisant `libfuzzer`."
 
-#: src/android/build-rules.md:13
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_protobuf`"
 msgstr "`rust_protobuf`"
 
-#: src/android/build-rules.md:13
+#: src/android/build-rules.md
 #, fuzzy
 msgid ""
 "Generates source and produces a Rust library that provides an interface for "
@@ -11691,12 +12318,12 @@ msgstr ""
 "Génère la source et produit une bibliothèque Rust qui fournit une interface "
 "pour un protobuf particulier."
 
-#: src/android/build-rules.md:14
+#: src/android/build-rules.md
 #, fuzzy
 msgid "`rust_bindgen`"
 msgstr "`rust_bindgen`"
 
-#: src/android/build-rules.md:14
+#: src/android/build-rules.md
 #, fuzzy
 msgid ""
 "Generates source and produces a Rust library containing Rust bindings to C "
@@ -11705,34 +12332,34 @@ msgstr ""
 "Génère la source et produit une bibliothèque Rust contenant des liaisons "
 "Rust aux bibliothèques C."
 
-#: src/android/build-rules.md:16
+#: src/android/build-rules.md
 #, fuzzy
 msgid "We will look at `rust_binary` and `rust_library` next."
 msgstr "Nous examinerons ensuite `rust_binary` et `rust_library`."
 
-#: src/android/build-rules.md:20
+#: src/android/build-rules.md
 msgid "Additional items speaker may mention:"
 msgstr ""
 
-#: src/android/build-rules.md:22
+#: src/android/build-rules.md
 msgid ""
 "Cargo is not optimized for multi-language repos, and also downloads packages "
 "from the internet."
 msgstr ""
 
-#: src/android/build-rules.md:24
+#: src/android/build-rules.md
 msgid ""
-"For compliance and performance, Android must have crates in-tree.  It must "
-"also interop with C/C++/Java code.  Soong fills that gap."
+"For compliance and performance, Android must have crates in-tree. It must "
+"also interop with C/C++/Java code. Soong fills that gap."
 msgstr ""
 
-#: src/android/build-rules.md:26
+#: src/android/build-rules.md
 msgid ""
 "Soong has many similarities to Bazel, which is the open-source variant of "
 "Blaze (used in google3)."
 msgstr ""
 
-#: src/android/build-rules.md:28
+#: src/android/build-rules.md
 msgid ""
 "There is a plan to transition [Android](https://source.android.com/docs/"
 "setup/build/bazel/introduction), [ChromeOS](https://chromium.googlesource."
@@ -11740,19 +12367,19 @@ msgid ""
 "build/bazel/introduction) to Bazel."
 msgstr ""
 
-#: src/android/build-rules.md:30
+#: src/android/build-rules.md
 msgid "Learning Bazel-like build rules is useful for all Rust OS developers."
 msgstr ""
 
-#: src/android/build-rules.md:32
+#: src/android/build-rules.md
 msgid "Fun fact: Data from Star Trek is a Soong-type Android."
 msgstr ""
 
-#: src/android/build-rules/binary.md:1
+#: src/android/build-rules/binary.md
 msgid "Rust Binaries"
 msgstr "Binaires Rust"
 
-#: src/android/build-rules/binary.md:3
+#: src/android/build-rules/binary.md
 #, fuzzy
 msgid ""
 "Let us start with a simple application. At the root of an AOSP checkout, "
@@ -11761,44 +12388,44 @@ msgstr ""
 "Commençons par une application simple. A la racine d'une caisse AOSP, créez "
 "les fichiers suivants :"
 
-#: src/android/build-rules/binary.md:6 src/android/build-rules/library.md:13
+#: src/android/build-rules/binary.md src/android/build-rules/library.md
 #, fuzzy
 msgid "_hello_rust/Android.bp_:"
 msgstr "_hello_rust/Android.bp_ :"
 
-#: src/android/build-rules/binary.md:10 src/android/build-rules/binary.md:11
+#: src/android/build-rules/binary.md
 msgid "\"hello_rust\""
 msgstr ""
 
-#: src/android/build-rules/binary.md:12 src/android/build-rules/library.md:19
-#: src/android/logging.md:12
+#: src/android/build-rules/binary.md src/android/build-rules/library.md
+#: src/android/logging.md
 #, fuzzy
 msgid "\"src/main.rs\""
 msgstr "`src/main.rs` :"
 
-#: src/android/build-rules/binary.md:16 src/android/build-rules/library.md:33
+#: src/android/build-rules/binary.md src/android/build-rules/library.md
 #, fuzzy
 msgid "_hello_rust/src/main.rs_:"
 msgstr "_hello_rust/src/main.rs_ :"
 
-#: src/android/build-rules/binary.md:19 src/android/build-rules/library.md:36
+#: src/android/build-rules/binary.md src/android/build-rules/library.md
 msgid "//! Rust demo.\n"
 msgstr ""
 
-#: src/android/build-rules/binary.md:20 src/android/build-rules/library.md:40
+#: src/android/build-rules/binary.md src/android/build-rules/library.md
 msgid "/// Prints a greeting to standard output.\n"
 msgstr ""
 
-#: src/android/build-rules/binary.md:23 src/exercises/chromium/build-rules.md:8
+#: src/android/build-rules/binary.md src/exercises/chromium/build-rules.md
 msgid "\"Hello from Rust!\""
 msgstr ""
 
-#: src/android/build-rules/binary.md:27
+#: src/android/build-rules/binary.md
 #, fuzzy
 msgid "You can now build, push, and run the binary:"
 msgstr "Vous pouvez maintenant compiler, envoyer et exécuter le binaire :"
 
-#: src/android/build-rules/binary.md:29
+#: src/android/build-rules/binary.md
 msgid ""
 "```shell\n"
 "m hello_rust\n"
@@ -11807,28 +12434,28 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/android/build-rules/library.md:1
+#: src/android/build-rules/library.md
 msgid "Rust Libraries"
 msgstr "Bibliothèques Rust"
 
-#: src/android/build-rules/library.md:3
+#: src/android/build-rules/library.md
 #, fuzzy
 msgid "You use `rust_library` to create a new Rust library for Android."
 msgstr ""
 "Vous utilisez `rust_library` pour créer une nouvelle bibliothèque Rust pour "
 "Android."
 
-#: src/android/build-rules/library.md:5
+#: src/android/build-rules/library.md
 #, fuzzy
 msgid "Here we declare a dependency on two libraries:"
 msgstr "Ici, nous déclarons une dépendance sur deux bibliothèques :"
 
-#: src/android/build-rules/library.md:7
+#: src/android/build-rules/library.md
 #, fuzzy
 msgid "`libgreeting`, which we define below,"
 msgstr "`libgreeting`, que nous définissons ci-dessous,"
 
-#: src/android/build-rules/library.md:8
+#: src/android/build-rules/library.md
 #, fuzzy
 msgid ""
 "`libtextwrap`, which is a crate already vendored in [`external/rust/crates/`]"
@@ -11838,51 +12465,55 @@ msgstr ""
 "`libtextwrap`, qui est une caisse déjà disponible dans \\[`external/rust/"
 "crates/`\\]\\[crates\\]."
 
-#: src/android/build-rules/library.md:17 src/android/build-rules/library.md:18
+#: src/android/build-rules/library.md
 msgid "\"hello_rust_with_dep\""
 msgstr ""
 
-#: src/android/build-rules/library.md:21 src/android/build-rules/library.md:27
+#: src/android/build-rules/library.md
 msgid "\"libgreetings\""
 msgstr ""
 
-#: src/android/build-rules/library.md:22
+#: src/android/build-rules/library.md
 msgid "\"libtextwrap\""
 msgstr ""
 
-#: src/android/build-rules/library.md:28
+#: src/android/build-rules/library.md
+msgid "// Need this to avoid dynamic link error.\n"
+msgstr ""
+
+#: src/android/build-rules/library.md
 msgid "\"greetings\""
 msgstr ""
 
-#: src/android/build-rules/library.md:29 src/android/aidl/implementation.md:31
-#: src/android/interoperability/java.md:38
+#: src/android/build-rules/library.md src/android/aidl/implementation.md
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "\"src/lib.rs\""
 msgstr "`src/main.rs` :"
 
-#: src/android/build-rules/library.md:47
+#: src/android/build-rules/library.md
 #, fuzzy
 msgid "_hello_rust/src/lib.rs_:"
 msgstr "_hello_rust/src/lib.rs_ :"
 
-#: src/android/build-rules/library.md:50
+#: src/android/build-rules/library.md
 msgid "//! Greeting library.\n"
 msgstr ""
 
-#: src/android/build-rules/library.md:51
+#: src/android/build-rules/library.md
 msgid "/// Greet `name`.\n"
 msgstr ""
 
-#: src/android/build-rules/library.md:54
+#: src/android/build-rules/library.md
 msgid "\"Hello {name}, it is very nice to meet you!\""
 msgstr ""
 
-#: src/android/build-rules/library.md:58
+#: src/android/build-rules/library.md
 #, fuzzy
 msgid "You build, push, and run the binary like before:"
 msgstr "Vous construisez, poussez et exécutez le binaire comme avant :"
 
-#: src/android/build-rules/library.md:60
+#: src/android/build-rules/library.md
 msgid ""
 "```shell\n"
 "m hello_rust_with_dep\n"
@@ -11892,7 +12523,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/android/aidl.md:3
+#: src/android/aidl.md
 #, fuzzy
 msgid ""
 "The [Android Interface Definition Language (AIDL)](https://developer.android."
@@ -11901,27 +12532,27 @@ msgstr ""
 "Le [langage de définition d'interface Android (AIDL)](https://developer."
 "android.com/guide/components/aidl) est pris en charge dans Rust :"
 
-#: src/android/aidl.md:6
+#: src/android/aidl.md
 #, fuzzy
 msgid "Rust code can call existing AIDL servers,"
 msgstr "Le code Rust peut appeler des serveurs AIDL existants,"
 
-#: src/android/aidl.md:7
+#: src/android/aidl.md
 #, fuzzy
 msgid "You can create new AIDL servers in Rust."
 msgstr "Vous pouvez créer de nouveaux serveurs AIDL dans Rust."
 
-#: src/android/aidl/interface.md:1
+#: src/android/aidl/interface.md
 #, fuzzy
 msgid "AIDL Interfaces"
 msgstr "Interfaces AIDL"
 
-#: src/android/aidl/interface.md:3
+#: src/android/aidl/interface.md
 #, fuzzy
 msgid "You declare the API of your service using an AIDL interface:"
 msgstr "Vous déclarez l'API de votre service à l'aide d'une interface AIDL :"
 
-#: src/android/aidl/interface.md:5
+#: src/android/aidl/interface.md
 #, fuzzy
 msgid ""
 "_birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl_:"
@@ -11929,35 +12560,35 @@ msgstr ""
 "_service_anniversaire/aidl/com/exemple/serviceanniversaire/IBirthdayService."
 "aidl_ :"
 
-#: src/android/aidl/interface.md:9 src/android/aidl/changing.md:8
+#: src/android/aidl/interface.md src/android/aidl/changing.md
 msgid "/** Birthday service interface. */"
 msgstr ""
 
-#: src/android/aidl/interface.md:12 src/android/aidl/changing.md:11
+#: src/android/aidl/interface.md src/android/aidl/changing.md
 msgid "/** Generate a Happy Birthday message. */"
 msgstr ""
 
-#: src/android/aidl/interface.md:17
+#: src/android/aidl/interface.md
 #, fuzzy
 msgid "_birthday_service/aidl/Android.bp_:"
 msgstr "_service_anniversaire/aidl/Android.bp_ :"
 
-#: src/android/aidl/interface.md:21
+#: src/android/aidl/interface.md
 msgid "\"com.example.birthdayservice\""
 msgstr ""
 
-#: src/android/aidl/interface.md:22
+#: src/android/aidl/interface.md
 #, fuzzy
 msgid "\"com/example/birthdayservice/*.aidl\""
 msgstr ""
 "_service_anniversaire/aidl/com/exemple/serviceanniversaire/IBirthdayService."
 "aidl_ :"
 
-#: src/android/aidl/interface.md:25
+#: src/android/aidl/interface.md
 msgid "// Rust is not enabled by default\n"
 msgstr ""
 
-#: src/android/aidl/interface.md:32
+#: src/android/aidl/interface.md
 #, fuzzy
 msgid ""
 "Add `vendor_available: true` if your AIDL file is used by a binary in the "
@@ -11966,175 +12597,180 @@ msgstr ""
 "Ajoutez `vendor_available : true` si votre fichier AIDL est utilisé par un "
 "binaire dans le fournisseur cloison."
 
-#: src/android/aidl/implementation.md:1
+#: src/android/aidl/implementation.md
 #, fuzzy
 msgid "Service Implementation"
 msgstr "Mise en œuvre des services"
 
-#: src/android/aidl/implementation.md:3
+#: src/android/aidl/implementation.md
 #, fuzzy
 msgid "We can now implement the AIDL service:"
 msgstr "Nous pouvons maintenant implémenter le service AIDL :"
 
-#: src/android/aidl/implementation.md:5
+#: src/android/aidl/implementation.md
 #, fuzzy
 msgid "_birthday_service/src/lib.rs_:"
 msgstr "_service_anniversaire/src/lib.rs_ :"
 
-#: src/android/aidl/implementation.md:8
+#: src/android/aidl/implementation.md
 msgid "//! Implementation of the `IBirthdayService` AIDL interface.\n"
 msgstr ""
 
-#: src/android/aidl/implementation.md:11
+#: src/android/aidl/implementation.md
 #, fuzzy
 msgid "/// The `IBirthdayService` implementation.\n"
 msgstr "Mise en œuvre des services"
 
-#: src/android/aidl/implementation.md:20
+#: src/android/aidl/implementation.md
 msgid "\"Happy Birthday {name}, congratulations with the {years} years!\""
 msgstr ""
 
-#: src/android/aidl/implementation.md:26 src/android/aidl/server.md:28
-#: src/android/aidl/client.md:37
+#: src/android/aidl/implementation.md src/android/aidl/server.md
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "_birthday_service/Android.bp_:"
 msgstr "_service_anniversaire/Android.bp_ :"
 
-#: src/android/aidl/implementation.md:30 src/android/aidl/server.md:38
+#: src/android/aidl/implementation.md src/android/aidl/server.md
 #, fuzzy
 msgid "\"libbirthdayservice\""
 msgstr "_service_anniversaire/src/lib.rs_ :"
 
-#: src/android/aidl/implementation.md:32 src/android/aidl/server.md:13
-#: src/android/aidl/client.md:12
+#: src/android/aidl/implementation.md src/android/aidl/server.md
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "\"birthdayservice\""
 msgstr "_service_anniversaire/src/lib.rs_ :"
 
-#: src/android/aidl/implementation.md:34 src/android/aidl/server.md:36
-#: src/android/aidl/client.md:45
+#: src/android/aidl/implementation.md src/android/aidl/server.md
+#: src/android/aidl/client.md
 msgid "\"com.example.birthdayservice-rust\""
 msgstr ""
 
-#: src/android/aidl/implementation.md:35 src/android/aidl/server.md:37
-#: src/android/aidl/client.md:46
+#: src/android/aidl/implementation.md src/android/aidl/server.md
+#: src/android/aidl/client.md
 msgid "\"libbinder_rs\""
 msgstr ""
 
-#: src/android/aidl/server.md:1
+#: src/android/aidl/server.md
 #, fuzzy
 msgid "AIDL Server"
 msgstr "Serveur AIDL"
 
-#: src/android/aidl/server.md:3
+#: src/android/aidl/server.md
 #, fuzzy
 msgid "Finally, we can create a server which exposes the service:"
 msgstr "Enfin, nous pouvons créer un serveur qui expose le service :"
 
-#: src/android/aidl/server.md:5
+#: src/android/aidl/server.md
 #, fuzzy
 msgid "_birthday_service/src/server.rs_:"
 msgstr "_service_anniversaire/src/server.rs_ :"
 
-#: src/android/aidl/server.md:8 src/android/aidl/client.md:8
+#: src/android/aidl/server.md src/android/aidl/client.md
 msgid "//! Birthday service.\n"
 msgstr ""
 
-#: src/android/aidl/server.md:14
+#: src/android/aidl/server.md
 msgid "/// Entry point for birthday service.\n"
 msgstr ""
 
-#: src/android/aidl/server.md:23
+#: src/android/aidl/server.md
 msgid "\"Failed to register service\""
 msgstr ""
 
-#: src/android/aidl/server.md:32 src/android/aidl/server.md:33
+#: src/android/aidl/server.md
 #, fuzzy
 msgid "\"birthday_server\""
 msgstr "_service_anniversaire/src/lib.rs_ :"
 
-#: src/android/aidl/server.md:34
+#: src/android/aidl/server.md
 #, fuzzy
 msgid "\"src/server.rs\""
 msgstr "`src/main.rs` :"
 
-#: src/android/aidl/deploy.md:3
+#: src/android/aidl/server.md src/android/aidl/client.md
+msgid "// To avoid dynamic link error.\n"
+msgstr ""
+
+#: src/android/aidl/deploy.md
 #, fuzzy
 msgid "We can now build, push, and start the service:"
 msgstr "Nous pouvons maintenant créer, pousser et démarrer le service :"
 
-#: src/android/aidl/deploy.md:5
+#: src/android/aidl/deploy.md
 msgid ""
 "```shell\n"
 "m birthday_server\n"
 "adb push \"$ANDROID_PRODUCT_OUT/system/bin/birthday_server\" /data/local/"
 "tmp\n"
+"adb root\n"
 "adb shell /data/local/tmp/birthday_server\n"
 "```"
 msgstr ""
 
-#: src/android/aidl/deploy.md:11
+#: src/android/aidl/deploy.md
 #, fuzzy
 msgid "In another terminal, check that the service runs:"
 msgstr "Dans un autre terminal, vérifiez que le service s'exécute :"
 
-#: src/android/aidl/deploy.md:21
+#: src/android/aidl/deploy.md
 #, fuzzy
 msgid "You can also call the service with `service call`:"
 msgstr "Vous pouvez également appeler le service avec `service call` :"
 
-#: src/android/aidl/client.md:1
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "AIDL Client"
 msgstr "Client AIDL"
 
-#: src/android/aidl/client.md:3
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "Finally, we can create a Rust client for our new service."
 msgstr "Enfin, nous pouvons créer un client Rust pour notre nouveau service."
 
-#: src/android/aidl/client.md:5
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "_birthday_service/src/client.rs_:"
 msgstr "_service_anniversaire/src/client.rs_ :"
 
-#: src/android/aidl/client.md:13
+#: src/android/aidl/client.md
 msgid "/// Connect to the BirthdayService.\n"
 msgstr ""
 
-#: src/android/aidl/client.md:18
+#: src/android/aidl/client.md
 msgid "/// Call the birthday service.\n"
 msgstr ""
 
-#: src/android/aidl/client.md:30
+#: src/android/aidl/client.md
 msgid "\"Failed to connect to BirthdayService\""
 msgstr ""
 
-#: src/android/aidl/client.md:32
+#: src/android/aidl/client.md
 msgid "\"{msg}\""
 msgstr ""
 
-#: src/android/aidl/client.md:41 src/android/aidl/client.md:42
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "\"birthday_client\""
 msgstr "_service_anniversaire/src/client.rs_ :"
 
-#: src/android/aidl/client.md:43
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "\"src/client.rs\""
 msgstr "`src/main.rs` :"
 
-#: src/android/aidl/client.md:51
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "Notice that the client does not depend on `libbirthdayservice`."
 msgstr "Notez que le client ne dépend pas de `libbirthdayservice`."
 
-#: src/android/aidl/client.md:53
+#: src/android/aidl/client.md
 #, fuzzy
 msgid "Build, push, and run the client on your device:"
 msgstr "Créez, transférez et exécutez le client sur votre appareil :"
 
-#: src/android/aidl/client.md:55
+#: src/android/aidl/client.md
 msgid ""
 "```shell\n"
 "m birthday_client\n"
@@ -12144,7 +12780,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/android/aidl/changing.md:3
+#: src/android/aidl/changing.md
 #, fuzzy
 msgid ""
 "Let us extend the API with more functionality: we want to let clients "
@@ -12153,7 +12789,7 @@ msgstr ""
 "Étendons l'API avec plus de fonctionnalités : nous voulons laisser les "
 "clients spécifier un liste des lignes pour la carte d'anniversaire :"
 
-#: src/android/logging.md:3
+#: src/android/logging.md
 #, fuzzy
 msgid ""
 "You should use the `log` crate to automatically log to `logcat` (on-device) "
@@ -12162,60 +12798,60 @@ msgstr ""
 "Vous devez utiliser la caisse `log` pour vous connecter automatiquement à "
 "`logcat` (sur l'appareil) ou `stdout` (sur l'hôte) :"
 
-#: src/android/logging.md:6
+#: src/android/logging.md
 #, fuzzy
 msgid "_hello_rust_logs/Android.bp_:"
 msgstr "_hello_rust_logs/Android.bp_ :"
 
-#: src/android/logging.md:10 src/android/logging.md:11
+#: src/android/logging.md
 #, fuzzy
 msgid "\"hello_rust_logs\""
 msgstr "_hello_rust_logs/Android.bp_ :"
 
-#: src/android/logging.md:14
+#: src/android/logging.md
 msgid "\"liblog_rust\""
 msgstr ""
 
-#: src/android/logging.md:15
+#: src/android/logging.md
 msgid "\"liblogger\""
 msgstr ""
 
-#: src/android/logging.md:21
+#: src/android/logging.md
 #, fuzzy
 msgid "_hello_rust_logs/src/main.rs_:"
 msgstr "_hello_rust_logs/src/main.rs_ :"
 
-#: src/android/logging.md:24
+#: src/android/logging.md
 msgid "//! Rust logging demo.\n"
 msgstr ""
 
-#: src/android/logging.md:27
+#: src/android/logging.md
 msgid "/// Logs a greeting.\n"
 msgstr ""
 
-#: src/android/logging.md:32
+#: src/android/logging.md
 msgid "\"rust\""
 msgstr ""
 
-#: src/android/logging.md:35
+#: src/android/logging.md
 msgid "\"Starting program.\""
 msgstr ""
 
-#: src/android/logging.md:36
+#: src/android/logging.md
 msgid "\"Things are going fine.\""
 msgstr ""
 
-#: src/android/logging.md:37
+#: src/android/logging.md
 msgid "\"Something went wrong!\""
 msgstr ""
 
-#: src/android/logging.md:41 src/android/interoperability/with-c/bindgen.md:98
-#: src/android/interoperability/with-c/rust.md:73
+#: src/android/logging.md src/android/interoperability/with-c/bindgen.md
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "Build, push, and run the binary on your device:"
 msgstr "Compilez, transférez et exécutez le binaire sur votre appareil :"
 
-#: src/android/logging.md:43
+#: src/android/logging.md
 msgid ""
 "```shell\n"
 "m hello_rust_logs\n"
@@ -12225,12 +12861,12 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/android/logging.md:49
+#: src/android/logging.md
 #, fuzzy
 msgid "The logs show up in `adb logcat`:"
 msgstr "Les journaux s'affichent dans `adb logcat` :"
 
-#: src/android/interoperability.md:3
+#: src/android/interoperability.md
 #, fuzzy
 msgid ""
 "Rust has excellent support for interoperability with other languages. This "
@@ -12239,17 +12875,17 @@ msgstr ""
 "Rust a un excellent support pour l'interopérabilité avec d'autres langages. "
 "Ça signifie Que tu peux:"
 
-#: src/android/interoperability.md:6
+#: src/android/interoperability.md
 #, fuzzy
 msgid "Call Rust functions from other languages."
 msgstr "Appelez les fonctions Rust à partir d'autres langues."
 
-#: src/android/interoperability.md:7
+#: src/android/interoperability.md
 #, fuzzy
 msgid "Call functions written in other languages from Rust."
 msgstr "Fonctions d'appel écrites dans d'autres langages depuis Rust."
 
-#: src/android/interoperability.md:9
+#: src/android/interoperability.md
 #, fuzzy
 msgid ""
 "When you call functions in a foreign language we say that you're using a "
@@ -12259,12 +12895,12 @@ msgstr ""
 "que vous utilisez un _interface de fonction étrangère_, également connue "
 "sous le nom de FFI."
 
-#: src/android/interoperability/with-c.md:1
+#: src/android/interoperability/with-c.md
 #, fuzzy
 msgid "Interoperability with C"
 msgstr "Interopérabilité avec C"
 
-#: src/android/interoperability/with-c.md:3
+#: src/android/interoperability/with-c.md
 #, fuzzy
 msgid ""
 "Rust has full support for linking object files with a C calling convention. "
@@ -12274,16 +12910,16 @@ msgstr ""
 "convention d'appel C. De même, vous pouvez exporter des fonctions Rust et "
 "les appeler depuis C."
 
-#: src/android/interoperability/with-c.md:6
+#: src/android/interoperability/with-c.md
 #, fuzzy
 msgid "You can do it by hand if you want:"
 msgstr "Vous pouvez le faire à la main si vous le souhaitez :"
 
-#: src/android/interoperability/with-c.md:16
+#: src/android/interoperability/with-c.md
 msgid "\"{x}, {abs_x}\""
 msgstr ""
 
-#: src/android/interoperability/with-c.md:20
+#: src/android/interoperability/with-c.md
 #, fuzzy
 msgid ""
 "We already saw this in the [Safe FFI Wrapper exercise](../../exercises/day-3/"
@@ -12292,7 +12928,7 @@ msgstr ""
 "Nous avons déjà vu cela dans le [Safe FFI Wrapper exercice](../../exercises/"
 "day-3/safe-ffi-wrapper.md)."
 
-#: src/android/interoperability/with-c.md:23
+#: src/android/interoperability/with-c.md
 #, fuzzy
 msgid ""
 "This assumes full knowledge of the target platform. Not recommended for "
@@ -12301,17 +12937,17 @@ msgstr ""
 "Cela suppose une parfaite connaissance de la plateforme cible. Non "
 "recommandé pour fabrication."
 
-#: src/android/interoperability/with-c.md:26
+#: src/android/interoperability/with-c.md
 #, fuzzy
 msgid "We will look at better options next."
 msgstr "Nous examinerons ensuite de meilleures options."
 
-#: src/android/interoperability/with-c/bindgen.md:1
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "Using Bindgen"
 msgstr "Utiliser Bindgen"
 
-#: src/android/interoperability/with-c/bindgen.md:3
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid ""
 "The [bindgen](https://rust-lang.github.io/rust-bindgen/introduction.html) "
@@ -12321,66 +12957,60 @@ msgstr ""
 "html) peut générer automatiquement des liaisons à partir d'un fichier d'en-"
 "tête C."
 
-#: src/android/interoperability/with-c/bindgen.md:6
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "First create a small C library:"
 msgstr "Créez d'abord une petite bibliothèque C :"
 
-#: src/android/interoperability/with-c/bindgen.md:8
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "_interoperability/bindgen/libbirthday.h_:"
 msgstr "_interoperability/bindgen/libbirthday.h_ :"
 
-#: src/android/interoperability/with-c/bindgen.md:19
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "_interoperability/bindgen/libbirthday.c_:"
 msgstr "_interoperability/bindgen/libbirthday.c_ :"
 
-#: src/android/interoperability/with-c/bindgen.md:22
+#: src/android/interoperability/with-c/bindgen.md
 msgid "<stdio.h>"
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:23
-#: src/android/interoperability/with-c/bindgen.md:50
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"libbirthday.h\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:26
-#: src/android/interoperability/with-c/bindgen.md:29
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"+--------------\\n\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:27
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"| Happy Birthday %s!\\n\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:28
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"| Congratulations with the %i years!\\n\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:33
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "Add this to your `Android.bp` file:"
 msgstr "Ajoutez ceci à votre fichier `Android.bp` :"
 
-#: src/android/interoperability/with-c/bindgen.md:35
-#: src/android/interoperability/with-c/bindgen.md:55
-#: src/android/interoperability/with-c/bindgen.md:69
-#: src/android/interoperability/with-c/bindgen.md:108
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "_interoperability/bindgen/Android.bp_:"
 msgstr "_interopérabilité/bindgen/Android.bp_ :"
 
-#: src/android/interoperability/with-c/bindgen.md:39
-#: src/android/interoperability/with-c/bindgen.md:63
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"libbirthday\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:40
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"libbirthday.c\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:44
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid ""
 "Create a wrapper header file for the library (not strictly needed in this "
@@ -12389,58 +13019,61 @@ msgstr ""
 "Créez un fichier d'en-tête wrapper pour la bibliothèque (pas strictement "
 "nécessaire dans ce exemple):"
 
-#: src/android/interoperability/with-c/bindgen.md:47
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "_interoperability/bindgen/libbirthday_wrapper.h_:"
 msgstr "_interoperability/bindgen/libbirthday_wrapper.h_ :"
 
-#: src/android/interoperability/with-c/bindgen.md:53
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "You can now auto-generate the bindings:"
 msgstr "Vous pouvez maintenant générer automatiquement les liaisons :"
 
-#: src/android/interoperability/with-c/bindgen.md:59
-#: src/android/interoperability/with-c/bindgen.md:75
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"libbirthday_bindgen\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:60
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "\"birthday_bindgen\""
 msgstr "`rust_bindgen`"
 
-#: src/android/interoperability/with-c/bindgen.md:61
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"libbirthday_wrapper.h\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:62
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"bindings\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:67
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "Finally, we can use the bindings in our Rust program:"
 msgstr "Enfin, nous pouvons utiliser les liaisons dans notre programme Rust :"
 
-#: src/android/interoperability/with-c/bindgen.md:73
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"print_birthday_card\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:74
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "\"main.rs\""
 msgstr "`main.rs` :"
 
-#: src/android/interoperability/with-c/bindgen.md:79
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "_interoperability/bindgen/main.rs_:"
 msgstr "_interopérabilité/bindgen/main.rs_ :"
 
-#: src/android/interoperability/with-c/bindgen.md:82
+#: src/android/interoperability/with-c/bindgen.md
 msgid "//! Bindgen demo.\n"
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:100
+#: src/android/interoperability/with-c/bindgen.md
+msgid "// SAFETY: `print_card` is safe to call with a valid `card` pointer.\n"
+msgstr ""
+
+#: src/android/interoperability/with-c/bindgen.md
 msgid ""
 "```shell\n"
 "m print_birthday_card\n"
@@ -12450,116 +13083,113 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:106
+#: src/android/interoperability/with-c/bindgen.md
 #, fuzzy
 msgid "Finally, we can run auto-generated tests to ensure the bindings work:"
 msgstr ""
 "Enfin, nous pouvons exécuter des tests générés automatiquement pour nous "
 "assurer que les liaisons fonctionnent :"
 
-#: src/android/interoperability/with-c/bindgen.md:112
-#: src/android/interoperability/with-c/bindgen.md:114
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"libbirthday_bindgen_test\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:113
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\":libbirthday_bindgen\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:115
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"general-tests\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:117
-#: src/android/interoperability/with-c/bindgen.md:118
+#: src/android/interoperability/with-c/bindgen.md
 msgid "\"none\""
 msgstr ""
 
-#: src/android/interoperability/with-c/bindgen.md:117
+#: src/android/interoperability/with-c/bindgen.md
 msgid "// Generated file, skip linting\n"
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:1
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "Calling Rust"
 msgstr "Appeler Rust"
 
-#: src/android/interoperability/with-c/rust.md:3
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "Exporting Rust functions and types to C is easy:"
 msgstr "Exporter des fonctions et des types Rust vers C est simple :"
 
-#: src/android/interoperability/with-c/rust.md:5
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "_interoperability/rust/libanalyze/analyze.rs_"
 msgstr "_interopérabilité/rust/libanalyze/analyze.rs_"
 
-#: src/android/interoperability/with-c/rust.md:8
+#: src/android/interoperability/with-c/rust.md
 msgid "//! Rust FFI demo.\n"
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:12
+#: src/android/interoperability/with-c/rust.md
 msgid "/// Analyze the numbers.\n"
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:17
+#: src/android/interoperability/with-c/rust.md
 msgid "\"x ({x}) is smallest!\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:19
+#: src/android/interoperability/with-c/rust.md
 msgid "\"y ({y}) is probably larger than x ({x})\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:24
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "_interoperability/rust/libanalyze/analyze.h_"
 msgstr "_interopérabilité/rust/libanalyze/analyze.h_"
 
-#: src/android/interoperability/with-c/rust.md:37
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "_interoperability/rust/libanalyze/Android.bp_"
 msgstr "_interopérabilité/rust/libanalyze/Android.bp_"
 
-#: src/android/interoperability/with-c/rust.md:41
-#: src/android/interoperability/with-c/rust.md:68
+#: src/android/interoperability/with-c/rust.md
 msgid "\"libanalyze_ffi\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:42
+#: src/android/interoperability/with-c/rust.md
 msgid "\"analyze_ffi\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:43
+#: src/android/interoperability/with-c/rust.md
 msgid "\"analyze.rs\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:48
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "We can now call this from a C binary:"
 msgstr "Nous pouvons maintenant appeler cela à partir d'un binaire C :"
 
-#: src/android/interoperability/with-c/rust.md:50
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid "_interoperability/rust/analyze/main.c_"
 msgstr "_interoperability/rust/analyze/main.c_"
 
-#: src/android/interoperability/with-c/rust.md:53
+#: src/android/interoperability/with-c/rust.md
 msgid "\"analyze.h\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:62
+#: src/android/interoperability/with-c/rust.md
 msgid "_interoperability/rust/analyze/Android.bp_"
 msgstr "_interoperability/rust/analyze/Android.bp_"
 
-#: src/android/interoperability/with-c/rust.md:66
+#: src/android/interoperability/with-c/rust.md
 msgid "\"analyze_numbers\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:67
+#: src/android/interoperability/with-c/rust.md
 msgid "\"main.c\""
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:75
+#: src/android/interoperability/with-c/rust.md
 msgid ""
 "```shell\n"
 "m analyze_numbers\n"
@@ -12569,7 +13199,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/android/interoperability/with-c/rust.md:83
+#: src/android/interoperability/with-c/rust.md
 #, fuzzy
 msgid ""
 "`#[no_mangle]` disables Rust's usual name mangling, so the exported symbol "
@@ -12581,11 +13211,7 @@ msgstr ""
 "également utiliser `#[export_name = \"some_name\"]` pour spécifier le nom "
 "que vous voulez."
 
-#: src/android/interoperability/cpp.md:1
-msgid "With C++"
-msgstr "Avec C++"
-
-#: src/android/interoperability/cpp.md:3
+#: src/android/interoperability/cpp.md
 #, fuzzy
 msgid ""
 "The [CXX crate](https://cxx.rs/) makes it possible to do safe "
@@ -12594,71 +13220,71 @@ msgstr ""
 "La [caisse CXX](https://cxx.rs/) permet de faire une interopérabilité sûre "
 "entre Rust et C++."
 
-#: src/android/interoperability/cpp.md:6
+#: src/android/interoperability/cpp.md
 #, fuzzy
 msgid "The overall approach looks like this:"
 msgstr "L'approche globale ressemble à ceci:"
 
-#: src/android/interoperability/cpp/bridge.md:3
+#: src/android/interoperability/cpp/bridge.md
 msgid ""
 "CXX relies on a description of the function signatures that will be exposed "
 "from each language to the other. You provide this description using extern "
 "blocks in a Rust module annotated with the `#[cxx::bridge]` attribute macro."
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:9
+#: src/android/interoperability/cpp/bridge.md
 msgid "\"org::blobstore\""
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:11
+#: src/android/interoperability/cpp/bridge.md
 msgid "// Shared structs with fields visible to both languages.\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:17
-#: src/android/interoperability/cpp/generated-cpp.md:6
+#: src/android/interoperability/cpp/bridge.md
+#: src/android/interoperability/cpp/generated-cpp.md
 msgid "// Rust types and signatures exposed to C++.\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:18
-#: src/android/interoperability/cpp/rust-bridge.md:6
-#: src/android/interoperability/cpp/generated-cpp.md:7
-#: src/android/interoperability/cpp/rust-result.md:6
-#: src/chromium/interoperability-with-cpp/example-bindings.md:9
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:10
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:9
+#: src/android/interoperability/cpp/bridge.md
+#: src/android/interoperability/cpp/rust-bridge.md
+#: src/android/interoperability/cpp/generated-cpp.md
+#: src/android/interoperability/cpp/rust-result.md
+#: src/chromium/interoperability-with-cpp/example-bindings.md
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 #, fuzzy
 msgid "\"Rust\""
 msgstr "Rustdoc"
 
-#: src/android/interoperability/cpp/bridge.md:24
-#: src/android/interoperability/cpp/cpp-bridge.md:6
+#: src/android/interoperability/cpp/bridge.md
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid "// C++ types and signatures exposed to Rust.\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:25
-#: src/android/interoperability/cpp/cpp-bridge.md:7
-#: src/android/interoperability/cpp/cpp-exception.md:6
-#: src/chromium/interoperability-with-cpp/example-bindings.md:15
+#: src/android/interoperability/cpp/bridge.md
+#: src/android/interoperability/cpp/cpp-bridge.md
+#: src/android/interoperability/cpp/cpp-exception.md
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "\"C++\""
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:26
-#: src/android/interoperability/cpp/cpp-bridge.md:8
+#: src/android/interoperability/cpp/bridge.md
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid "\"include/blobstore.h\""
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:40
+#: src/android/interoperability/cpp/bridge.md
 msgid "The bridge is generally declared in an `ffi` module within your crate."
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:41
+#: src/android/interoperability/cpp/bridge.md
 msgid ""
 "From the declarations made in the bridge module, CXX will generate matching "
 "Rust and C++ type/function definitions in order to expose those items to "
 "both languages."
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:44
+#: src/android/interoperability/cpp/bridge.md
 msgid ""
 "To view the generated Rust code, use [cargo-expand](https://github.com/"
 "dtolnay/cargo-expand) to view the expanded proc macro. For most of the "
@@ -12666,34 +13292,34 @@ msgid ""
 "(though this doesn't apply for Android projects)."
 msgstr ""
 
-#: src/android/interoperability/cpp/bridge.md:47
+#: src/android/interoperability/cpp/bridge.md
 msgid "To view the generated C++ code, look in `target/cxxbridge`."
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-bridge.md:1
+#: src/android/interoperability/cpp/rust-bridge.md
 msgid "Rust Bridge Declarations"
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-bridge.md:7
+#: src/android/interoperability/cpp/rust-bridge.md
 msgid "// Opaque type\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-bridge.md:8
+#: src/android/interoperability/cpp/rust-bridge.md
 msgid "// Method on `MyType`\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-bridge.md:9
+#: src/android/interoperability/cpp/rust-bridge.md
 #, fuzzy
 msgid "// Free function\n"
 msgstr "Fonctions"
 
-#: src/android/interoperability/cpp/rust-bridge.md:28
+#: src/android/interoperability/cpp/rust-bridge.md
 msgid ""
 "Items declared in the `extern \"Rust\"` reference items that are in scope in "
 "the parent module."
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-bridge.md:30
+#: src/android/interoperability/cpp/rust-bridge.md
 msgid ""
 "The CXX code generator uses your `extern \"Rust\"` section(s) to produce a C+"
 "+ header file containing the corresponding C++ declarations. The generated "
@@ -12701,48 +13327,48 @@ msgid ""
 "except with a .rs.h file extension."
 msgstr ""
 
-#: src/android/interoperability/cpp/generated-cpp.md:15
+#: src/android/interoperability/cpp/generated-cpp.md
 msgid "Results in (roughly) the following C++:"
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-bridge.md:1
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid "C++ Bridge Declarations"
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-bridge.md:20
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid "Results in (roughly) the following Rust:"
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-bridge.md:30
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid "\"org$blobstore$cxxbridge1$new_blobstore_client\""
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-bridge.md:39
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid "\"org$blobstore$cxxbridge1$BlobstoreClient$put\""
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-bridge.md:56
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid ""
 "The programmer does not need to promise that the signatures they have typed "
 "in are accurate. CXX performs static assertions that the signatures exactly "
 "correspond with what is declared in C++."
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-bridge.md:59
+#: src/android/interoperability/cpp/cpp-bridge.md
 msgid ""
 "`unsafe extern` blocks allow you to declare C++ functions that are safe to "
 "call from Rust."
 msgstr ""
 
-#: src/android/interoperability/cpp/shared-types.md:9
+#: src/android/interoperability/cpp/shared-types.md
 msgid "// A=1, J=11, Q=12, K=13\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/shared-types.md:23
+#: src/android/interoperability/cpp/shared-types.md
 msgid "Only C-like (unit) enums are supported."
 msgstr ""
 
-#: src/android/interoperability/cpp/shared-types.md:24
+#: src/android/interoperability/cpp/shared-types.md
 msgid ""
 "A limited number of traits are supported for `#[derive()]` on shared types. "
 "Corresponding functionality is also generated for the C++ code, e.g. if you "
@@ -12750,16 +13376,16 @@ msgid ""
 "corresponding C++ type."
 msgstr ""
 
-#: src/android/interoperability/cpp/shared-enums.md:15
+#: src/android/interoperability/cpp/shared-enums.md
 #, fuzzy
 msgid "Generated Rust:"
 msgstr "Rust non sécurisé (_unsafe_)"
 
-#: src/android/interoperability/cpp/shared-enums.md:33
+#: src/android/interoperability/cpp/shared-enums.md
 msgid "Generated C++:"
 msgstr ""
 
-#: src/android/interoperability/cpp/shared-enums.md:46
+#: src/android/interoperability/cpp/shared-enums.md
 msgid ""
 "On the Rust side, the code generated for shared enums is actually a struct "
 "wrapping a numeric value. This is because it is not UB in C++ for an enum "
@@ -12767,48 +13393,48 @@ msgid ""
 "Rust representation needs to have the same behavior."
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-result.md:13
+#: src/android/interoperability/cpp/rust-result.md
 msgid "\"fallible1 requires depth > 0\""
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-result.md:16
+#: src/android/interoperability/cpp/rust-result.md
 msgid "\"Success!\""
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-result.md:22
+#: src/android/interoperability/cpp/rust-result.md
 msgid ""
 "Rust functions that return `Result` are translated to exceptions on the C++ "
 "side."
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-result.md:24
+#: src/android/interoperability/cpp/rust-result.md
 msgid ""
 "The exception thrown will always be of type `rust::Error`, which primarily "
 "exposes a way to get the error message string. The error message will come "
 "from the error type's `Display` impl."
 msgstr ""
 
-#: src/android/interoperability/cpp/rust-result.md:27
+#: src/android/interoperability/cpp/rust-result.md
 msgid ""
 "A panic unwinding from Rust to C++ will always cause the process to "
 "immediately terminate."
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-exception.md:7
+#: src/android/interoperability/cpp/cpp-exception.md
 msgid "\"example/include/example.h\""
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-exception.md:14
+#: src/android/interoperability/cpp/cpp-exception.md
 msgid "\"Error: {}\""
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-exception.md:22
+#: src/android/interoperability/cpp/cpp-exception.md
 msgid ""
 "C++ functions declared to return a `Result` will catch any thrown exception "
 "on the C++ side and return it as an `Err` value to the calling Rust function."
 msgstr ""
 
-#: src/android/interoperability/cpp/cpp-exception.md:24
+#: src/android/interoperability/cpp/cpp-exception.md
 msgid ""
 "If an exception is thrown from an extern \"C++\" function that is not "
 "declared by the CXX bridge to return `Result`, the program calls C++'s `std::"
@@ -12816,161 +13442,161 @@ msgid ""
 "through a `noexcept` C++ function."
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:3
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "Rust Type"
 msgstr "Rust by Example"
 
-#: src/android/interoperability/cpp/type-mapping.md:3
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "C++ Type"
 msgstr "Exemple C++"
 
-#: src/android/interoperability/cpp/type-mapping.md:5
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`rust::String`"
 msgstr "`rust_bindgen`"
 
-#: src/android/interoperability/cpp/type-mapping.md:6
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`&str`"
 msgstr "`&str`"
 
-#: src/android/interoperability/cpp/type-mapping.md:6
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`rust::Str`"
 msgstr "`rust_test`"
 
-#: src/android/interoperability/cpp/type-mapping.md:7
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`CxxString`"
 msgstr "String"
 
-#: src/android/interoperability/cpp/type-mapping.md:7
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`std::string`"
 msgstr "String"
 
-#: src/android/interoperability/cpp/type-mapping.md:8
+#: src/android/interoperability/cpp/type-mapping.md
 msgid "`&[T]`/`&mut [T]`"
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:8
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`rust::Slice`"
 msgstr "`rust_ffi`"
 
-#: src/android/interoperability/cpp/type-mapping.md:9
+#: src/android/interoperability/cpp/type-mapping.md
 msgid "`rust::Box<T>`"
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:10
+#: src/android/interoperability/cpp/type-mapping.md
 msgid "`UniquePtr<T>`"
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:10
+#: src/android/interoperability/cpp/type-mapping.md
 msgid "`std::unique_ptr<T>`"
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:11
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`Vec<T>`"
 msgstr "`Vec`"
 
-#: src/android/interoperability/cpp/type-mapping.md:11
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`rust::Vec<T>`"
 msgstr "`mpsc::Récepteur<T>`"
 
-#: src/android/interoperability/cpp/type-mapping.md:12
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`CxxVector<T>`"
 msgstr "`Cellule<T>`"
 
-#: src/android/interoperability/cpp/type-mapping.md:12
+#: src/android/interoperability/cpp/type-mapping.md
 #, fuzzy
 msgid "`std::vector<T>`"
 msgstr "`mpsc::Récepteur<T>`"
 
-#: src/android/interoperability/cpp/type-mapping.md:16
+#: src/android/interoperability/cpp/type-mapping.md
 msgid ""
 "These types can be used in the fields of shared structs and the arguments "
 "and returns of extern functions."
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:18
+#: src/android/interoperability/cpp/type-mapping.md
 msgid ""
 "Note that Rust's `String` does not map directly to `std::string`. There are "
 "a few reasons for this:"
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:20
+#: src/android/interoperability/cpp/type-mapping.md
 msgid ""
 "`std::string` does not uphold the UTF-8 invariant that `String` requires."
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:21
+#: src/android/interoperability/cpp/type-mapping.md
 msgid ""
 "The two types have different layouts in memory and so can't be passed "
 "directly between languages."
 msgstr ""
 
-#: src/android/interoperability/cpp/type-mapping.md:23
+#: src/android/interoperability/cpp/type-mapping.md
 msgid ""
 "`std::string` requires move constructors that don't match Rust's move "
 "semantics, so a `std::string` can't be passed by value to Rust."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:1
-#: src/android/interoperability/cpp/android-cpp-genrules.md:1
-#: src/android/interoperability/cpp/android-build-rust.md:1
+#: src/android/interoperability/cpp/android-build-cpp.md
+#: src/android/interoperability/cpp/android-cpp-genrules.md
+#: src/android/interoperability/cpp/android-build-rust.md
 #, fuzzy
 msgid "Building in Android"
 msgstr "Rust pour Android"
 
-#: src/android/interoperability/cpp/android-build-cpp.md:3
+#: src/android/interoperability/cpp/android-build-cpp.md
 msgid ""
 "Create a `cc_library_static` to build the C++ library, including the CXX "
 "generated header and source file."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:8
-#: src/android/interoperability/cpp/android-build-rust.md:10
+#: src/android/interoperability/cpp/android-build-cpp.md
+#: src/android/interoperability/cpp/android-build-rust.md
 msgid "\"libcxx_test_cpp\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:9
+#: src/android/interoperability/cpp/android-build-cpp.md
 msgid "\"cxx_test.cpp\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:11
+#: src/android/interoperability/cpp/android-build-cpp.md
 msgid "\"cxx-bridge-header\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:12
-#: src/android/interoperability/cpp/android-cpp-genrules.md:10
+#: src/android/interoperability/cpp/android-build-cpp.md
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"libcxx_test_bridge_header\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:14
-#: src/android/interoperability/cpp/android-cpp-genrules.md:19
+#: src/android/interoperability/cpp/android-build-cpp.md
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"libcxx_test_bridge_code\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:20
+#: src/android/interoperability/cpp/android-build-cpp.md
 msgid ""
 "Point out that `libcxx_test_bridge_header` and `libcxx_test_bridge_code` are "
 "the dependencies for the CXX-generated C++ bindings. We'll show how these "
 "are setup on the next slide."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:23
+#: src/android/interoperability/cpp/android-build-cpp.md
 msgid ""
 "Note that you also need to depend on the `cxx-bridge-header` library in "
 "order to pull in common CXX definitions."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-cpp.md:25
+#: src/android/interoperability/cpp/android-build-cpp.md
 msgid ""
 "Full docs for using CXX in Android can be found in [the Android docs]"
 "(https://source.android.com/docs/setup/build/rust/building-rust-modules/"
@@ -12979,81 +13605,79 @@ msgid ""
 "instructions again in the future."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:3
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid ""
 "Create two genrules: One to generate the CXX header, and one to generate the "
 "CXX source file. These are then used as inputs to the `cc_library_static`."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:7
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid ""
 "// Generate a C++ header containing the C++ bindings\n"
 "// to the Rust exported functions in lib.rs.\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:11
-#: src/android/interoperability/cpp/android-cpp-genrules.md:20
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"cxxbridge\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:12
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"$(location cxxbridge) $(in) --header > $(out)\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:13
-#: src/android/interoperability/cpp/android-cpp-genrules.md:22
-#: src/android/interoperability/cpp/android-build-rust.md:8
+#: src/android/interoperability/cpp/android-cpp-genrules.md
+#: src/android/interoperability/cpp/android-build-rust.md
 msgid "\"lib.rs\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:14
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"lib.rs.h\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:16
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "// Generate the C++ code that Rust calls into.\n"
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:21
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"$(location cxxbridge) $(in) > $(out)\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:23
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid "\"lib.rs.cc\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:29
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid ""
 "The `cxxbridge` tool is a standalone tool that generates the C++ side of the "
 "bridge module. It is included in Android and available as a Soong tool."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-cpp-genrules.md:31
+#: src/android/interoperability/cpp/android-cpp-genrules.md
 msgid ""
 "By convention, if your Rust source file is `lib.rs` your header file will be "
 "named `lib.rs.h` and your source file will be named `lib.rs.cc`. This naming "
 "convention isn't enforced, though."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-rust.md:3
+#: src/android/interoperability/cpp/android-build-rust.md
 msgid ""
 "Create a `rust_binary` that depends on `libcxx` and your `cc_library_static`."
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-rust.md:7
+#: src/android/interoperability/cpp/android-build-rust.md
 msgid "\"cxx_test\""
 msgstr ""
 
-#: src/android/interoperability/cpp/android-build-rust.md:9
+#: src/android/interoperability/cpp/android-build-rust.md
 msgid "\"libcxx\""
 msgstr ""
 
-#: src/android/interoperability/java.md:1
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "Interoperability with Java"
 msgstr "Interopérabilité avec Java"
 
-#: src/android/interoperability/java.md:3
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid ""
 "Java can load shared objects via [Java Native Interface (JNI)](https://en."
@@ -13064,82 +13688,79 @@ msgstr ""
 "(https://en.wikipedia.org/wiki/Java_Native_Interface). Le [`jni` crate]"
 "(https://docs.rs/jni/) vous permet de créer une bibliothèque compatible."
 
-#: src/android/interoperability/java.md:7
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "First, we create a Rust function to export to Java:"
 msgstr "Tout d'abord, nous créons une fonction Rust à exporter vers Java :"
 
-#: src/android/interoperability/java.md:9
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "_interoperability/java/src/lib.rs_:"
 msgstr "_interopérabilité/java/src/lib.rs_ :"
 
-#: src/android/interoperability/java.md:12
+#: src/android/interoperability/java.md
 msgid "//! Rust <-> Java FFI demo.\n"
 msgstr ""
 
-#: src/android/interoperability/java.md:17
+#: src/android/interoperability/java.md
 msgid "/// HelloWorld::hello method implementation.\n"
 msgstr ""
 
-#: src/android/interoperability/java.md:20
+#: src/android/interoperability/java.md
 msgid "\"system\""
 msgstr ""
 
-#: src/android/interoperability/java.md:26
+#: src/android/interoperability/java.md
 msgid "\"Hello, {input}!\""
 msgstr ""
 
-#: src/android/interoperability/java.md:32
-#: src/android/interoperability/java.md:62
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "_interoperability/java/Android.bp_:"
 msgstr "_interopérabilité/java/Android.bp_ :"
 
-#: src/android/interoperability/java.md:36
-#: src/android/interoperability/java.md:69
+#: src/android/interoperability/java.md
 msgid "\"libhello_jni\""
 msgstr ""
 
-#: src/android/interoperability/java.md:37
-#: src/android/interoperability/java.md:52
+#: src/android/interoperability/java.md
 msgid "\"hello_jni\""
 msgstr ""
 
-#: src/android/interoperability/java.md:39
+#: src/android/interoperability/java.md
 msgid "\"libjni\""
 msgstr ""
 
-#: src/android/interoperability/java.md:43
+#: src/android/interoperability/java.md
 #, fuzzy
-msgid "Finally, we can call this function from Java:"
+msgid "We then call this function from Java:"
 msgstr "Enfin, nous pouvons appeler cette fonction depuis Java :"
 
-#: src/android/interoperability/java.md:45
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "_interoperability/java/HelloWorld.java_:"
 msgstr "_interopérabilité/java/HelloWorld.java_ :"
 
-#: src/android/interoperability/java.md:66
+#: src/android/interoperability/java.md
 msgid "\"helloworld_jni\""
 msgstr ""
 
-#: src/android/interoperability/java.md:67
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "\"HelloWorld.java\""
 msgstr "Bonjour le monde!"
 
-#: src/android/interoperability/java.md:68
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "\"HelloWorld\""
 msgstr "Bonjour le monde!"
 
-#: src/android/interoperability/java.md:73
+#: src/android/interoperability/java.md
 #, fuzzy
 msgid "Finally, you can build, sync, and run the binary:"
 msgstr "Enfin, vous pouvez créer, synchroniser et exécuter le binaire :"
 
-#: src/exercises/android/morning.md:3
+#: src/exercises/android/morning.md
 #, fuzzy
 msgid ""
 "This is a group exercise: We will look at one of the projects you work with "
@@ -13149,17 +13770,17 @@ msgstr ""
 "vous travaillez. Laissez-nous regroupez-vous et faites-le ensemble. Quelques "
 "suggestions:"
 
-#: src/exercises/android/morning.md:6
+#: src/exercises/android/morning.md
 #, fuzzy
 msgid "Call your AIDL service with a client written in Rust."
 msgstr "Appelez votre service AIDL avec un client écrit en Rust."
 
-#: src/exercises/android/morning.md:8
+#: src/exercises/android/morning.md
 #, fuzzy
 msgid "Move a function from your project to Rust and call it."
 msgstr "Déplacez une fonction de votre projet vers Rust et appelez-la."
 
-#: src/exercises/android/morning.md:12
+#: src/exercises/android/morning.md
 #, fuzzy
 msgid ""
 "No solution is provided here since this is open-ended: it relies on someone "
@@ -13169,18 +13790,18 @@ msgstr ""
 "sur quelqu'un en la classe ayant un morceau de code que vous pouvez remettre "
 "à Rust à la volée."
 
-#: src/chromium.md:1
+#: src/chromium.md
 #, fuzzy
 msgid "Welcome to Rust in Chromium"
 msgstr "Bienvenue au jour 1"
 
-#: src/chromium.md:3
+#: src/chromium.md
 msgid ""
 "Rust is supported for third-party libraries in Chromium, with first-party "
 "glue code to connect between Rust and existing Chromium C++ code."
 msgstr ""
 
-#: src/chromium.md:6
+#: src/chromium.md
 msgid ""
 "Today, we'll call into Rust to do something silly with strings. If you've "
 "got a corner of the code where you're displaying a UTF8 string to the user, "
@@ -13188,35 +13809,35 @@ msgid ""
 "exact part we talk about."
 msgstr ""
 
-#: src/chromium/setup.md:3
+#: src/chromium/setup.md
 msgid ""
 "Make sure you can build and run Chromium. Any platform and set of build "
 "flags is OK, so long as your code is relatively recent (commit position "
 "1223636 onwards, corresponding to November 2023):"
 msgstr ""
 
-#: src/chromium/setup.md:13
+#: src/chromium/setup.md
 msgid ""
 "(A component, debug build is recommended for quickest iteration time. This "
 "is the default!)"
 msgstr ""
 
-#: src/chromium/setup.md:16
+#: src/chromium/setup.md
 msgid ""
 "See [How to build Chromium](https://www.chromium.org/developers/how-tos/get-"
 "the-code/) if you aren't already at that point. Be warned: setting up to "
 "build Chromium takes time."
 msgstr ""
 
-#: src/chromium/setup.md:20
+#: src/chromium/setup.md
 msgid "It's also recommended that you have Visual Studio code installed."
 msgstr ""
 
-#: src/chromium/setup.md:22
+#: src/chromium/setup.md
 msgid "About the exercises"
 msgstr ""
 
-#: src/chromium/setup.md:24
+#: src/chromium/setup.md
 msgid ""
 "This part of the course has a series of exercises which build on each other. "
 "We'll be doing them spread throughout the course instead of just at the end. "
@@ -13224,133 +13845,133 @@ msgid ""
 "catch up in the next slot."
 msgstr ""
 
-#: src/chromium/cargo.md:3
+#: src/chromium/cargo.md
 msgid ""
 "Rust community typically uses `cargo` and libraries from [crates.io](https://"
 "crates.io/). Chromium is built using `gn` and `ninja` and a curated set of "
 "dependencies."
 msgstr ""
 
-#: src/chromium/cargo.md:6
+#: src/chromium/cargo.md
 msgid "When writing code in Rust, your choices are:"
 msgstr ""
 
-#: src/chromium/cargo.md:8
+#: src/chromium/cargo.md
 msgid ""
 "Use `gn` and `ninja` with the help of the templates from `//build/rust/*."
 "gni` (e.g. `rust_static_library` that we'll meet later). This uses "
 "Chromium's audited toolchain and crates."
 msgstr ""
 
-#: src/chromium/cargo.md:11
+#: src/chromium/cargo.md
 msgid ""
 "Use `cargo`, but [restrict yourself to Chromium's audited toolchain and "
 "crates](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/"
 "docs/rust.md#Using-cargo)"
 msgstr ""
 
-#: src/chromium/cargo.md:12
+#: src/chromium/cargo.md
 msgid ""
 "Use `cargo`, trusting a [toolchain](https://rustup.rs/) and/or [crates "
 "downloaded from the internet](https://crates.io/)"
 msgstr ""
 
-#: src/chromium/cargo.md:14
+#: src/chromium/cargo.md
 msgid ""
 "From here on we'll be focusing on `gn` and `ninja`, because this is how Rust "
-"code can be built into the Chromium browser.  At the same time, Cargo is an "
+"code can be built into the Chromium browser. At the same time, Cargo is an "
 "important part of the Rust ecosystem and you should keep it in your toolbox."
 msgstr ""
 
-#: src/chromium/cargo.md:18
+#: src/chromium/cargo.md
 #, fuzzy
 msgid "Mini exercise"
 msgstr "Exercices"
 
-#: src/chromium/cargo.md:20
+#: src/chromium/cargo.md
 msgid "Split into small groups and:"
 msgstr ""
 
-#: src/chromium/cargo.md:22
+#: src/chromium/cargo.md
 msgid ""
 "Brainstorm scenarios where `cargo` may offer an advantage and assess the "
 "risk profile of these scenarios."
 msgstr ""
 
-#: src/chromium/cargo.md:24
+#: src/chromium/cargo.md
 msgid ""
 "Discuss which tools, libraries, and groups of people need to be trusted when "
 "using `gn` and `ninja`, offline `cargo`, etc."
 msgstr ""
 
-#: src/chromium/cargo.md:29
+#: src/chromium/cargo.md
 msgid ""
 "Ask students to avoid peeking at the speaker notes before completing the "
-"exercise.  Assuming folks taking the course are physically together, ask "
-"them to discuss in small groups of 3-4 people."
+"exercise. Assuming folks taking the course are physically together, ask them "
+"to discuss in small groups of 3-4 people."
 msgstr ""
 
-#: src/chromium/cargo.md:33
+#: src/chromium/cargo.md
 msgid ""
 "Notes/hints related to the first part of the exercise (\"scenarios where "
 "Cargo may offer an advantage\"):"
 msgstr ""
 
-#: src/chromium/cargo.md:36
+#: src/chromium/cargo.md
 msgid ""
 "It's fantastic that when writing a tool, or prototyping a part of Chromium, "
-"one has access to the rich ecosystem of crates.io libraries.  There is a "
+"one has access to the rich ecosystem of crates.io libraries. There is a "
 "crate for almost anything and they are usually quite pleasant to use. "
 "(`clap` for command-line parsing, `serde` for serializing/deserializing to/"
 "from various formats, `itertools` for working with iterators, etc.)."
 msgstr ""
 
-#: src/chromium/cargo.md:42
+#: src/chromium/cargo.md
 msgid ""
 "`cargo` makes it easy to try a library (just add a single line to `Cargo."
 "toml` and start writing code)"
 msgstr ""
 
-#: src/chromium/cargo.md:44
+#: src/chromium/cargo.md
 msgid ""
 "It may be worth comparing how CPAN helped make `perl` a popular choice. Or "
 "comparing with `python` + `pip`."
 msgstr ""
 
-#: src/chromium/cargo.md:47
+#: src/chromium/cargo.md
 msgid ""
 "Development experience is made really nice not only by core Rust tools (e.g. "
 "using `rustup` to switch to a different `rustc` version when testing a crate "
 "that needs to work on nightly, current stable, and older stable) but also by "
 "an ecosystem of third-party tools (e.g. Mozilla provides `cargo vet` for "
-"streamlining and sharing security audits;  `criterion` crate gives a "
+"streamlining and sharing security audits; `criterion` crate gives a "
 "streamlined way to run benchmarks)."
 msgstr ""
 
-#: src/chromium/cargo.md:54
+#: src/chromium/cargo.md
 msgid ""
 "`cargo` makes it easy to add a tool via `cargo install --locked cargo-vet`."
 msgstr ""
 
-#: src/chromium/cargo.md:55
+#: src/chromium/cargo.md
 msgid "It may be worth comparing with Chrome Extensions or VScode extensions."
 msgstr ""
 
-#: src/chromium/cargo.md:57
+#: src/chromium/cargo.md
 msgid ""
 "Broad, generic examples of projects where `cargo` may be the right choice:"
 msgstr ""
 
-#: src/chromium/cargo.md:59
+#: src/chromium/cargo.md
 msgid ""
 "Perhaps surprisingly, Rust is becoming increasingly popular in the industry "
-"for writing command line tools.  The breadth and ergonomics of libraries is "
+"for writing command line tools. The breadth and ergonomics of libraries is "
 "comparable to Python, while being more robust (thanks to the rich "
 "typesystem) and running faster (as a compiled, rather than interpreted "
 "language)."
 msgstr ""
 
-#: src/chromium/cargo.md:64
+#: src/chromium/cargo.md
 msgid ""
 "Participating in the Rust ecosystem requires using standard Rust tools like "
 "Cargo. Libraries that want to get external contributions, and want to be "
@@ -13358,95 +13979,95 @@ msgid ""
 "should probably use Cargo."
 msgstr ""
 
-#: src/chromium/cargo.md:69
+#: src/chromium/cargo.md
 msgid "Examples of Chromium-related projects that are `cargo`\\-based:"
 msgstr ""
 
-#: src/chromium/cargo.md:70
+#: src/chromium/cargo.md
 msgid ""
 "`serde_json_lenient` (experimented with in other parts of Google which "
 "resulted in PRs with performance improvements)"
 msgstr ""
 
-#: src/chromium/cargo.md:72
+#: src/chromium/cargo.md
 msgid "Fontations libraries like `font-types`"
 msgstr ""
 
-#: src/chromium/cargo.md:73
+#: src/chromium/cargo.md
 msgid ""
 "`gnrt` tool (we will meet it later in the course) which depends on `clap` "
 "for command-line parsing and on `toml` for configuration files."
 msgstr ""
 
-#: src/chromium/cargo.md:75
+#: src/chromium/cargo.md
 msgid ""
 "Disclaimer: a unique reason for using `cargo` was unavailability of `gn` "
 "when building and bootstrapping Rust standard library when building Rust "
 "toolchain.)"
 msgstr ""
 
-#: src/chromium/cargo.md:78
+#: src/chromium/cargo.md
 msgid ""
 "`run_gnrt.py` uses Chromium's copy of `cargo` and `rustc`. `gnrt` depends on "
 "third-party libraries downloaded from the internet, by `run_gnrt.py` asks "
 "`cargo` that only `--locked` content is allowed via `Cargo.lock`.)"
 msgstr ""
 
-#: src/chromium/cargo.md:82
+#: src/chromium/cargo.md
 msgid ""
 "Students may identify the following items as being implicitly or explicitly "
 "trusted:"
 msgstr ""
 
-#: src/chromium/cargo.md:85
+#: src/chromium/cargo.md
 msgid ""
 "`rustc` (the Rust compiler) which in turn depends on the LLVM libraries, the "
 "Clang compiler, the `rustc` sources (fetched from GitHub, reviewed by Rust "
 "compiler team), binary Rust compiler downloaded for bootstrapping"
 msgstr ""
 
-#: src/chromium/cargo.md:88
+#: src/chromium/cargo.md
 msgid ""
 "`rustup` (it may be worth pointing out that `rustup` is developed under the "
 "umbrella of the https://github.com/rust-lang/ organization - same as `rustc`)"
 msgstr ""
 
-#: src/chromium/cargo.md:90
+#: src/chromium/cargo.md
 msgid "`cargo`, `rustfmt`, etc."
 msgstr ""
 
-#: src/chromium/cargo.md:91
+#: src/chromium/cargo.md
 msgid ""
 "Various internal infrastructure (bots that build `rustc`, system for "
 "distributing the prebuilt toolchain to Chromium engineers, etc.)"
 msgstr ""
 
-#: src/chromium/cargo.md:93
+#: src/chromium/cargo.md
 msgid "Cargo tools like `cargo audit`, `cargo vet`, etc."
 msgstr ""
 
-#: src/chromium/cargo.md:94
+#: src/chromium/cargo.md
 msgid ""
 "Rust libraries vendored into `//third_party/rust` (audited by "
 "security@chromium.org)"
 msgstr ""
 
-#: src/chromium/cargo.md:96
+#: src/chromium/cargo.md
 msgid "Other Rust libraries (some niche, some quite popular and commonly used)"
 msgstr ""
 
-#: src/chromium/policy.md:1
+#: src/chromium/policy.md
 msgid "Chromium Rust policy"
 msgstr ""
 
-#: src/chromium/policy.md:3
+#: src/chromium/policy.md
 msgid ""
 "Chromium does not yet allow first-party Rust except in rare cases as "
 "approved by Chromium's [Area Tech Leads](https://source.chromium.org/"
 "chromium/chromium/src/+/main:ATL_OWNERS)."
 msgstr ""
 
-#: src/chromium/policy.md:6
+#: src/chromium/policy.md
 msgid ""
 "Chromium's policy on third party libraries is outlined [here](https://"
 "chromium.googlesource.com/chromium/src/+/main/docs/adding_to_third_party."
@@ -13455,14 +14076,14 @@ msgid ""
 "security."
 msgstr ""
 
-#: src/chromium/policy.md:10
+#: src/chromium/policy.md
 msgid ""
 "Very few Rust libraries directly expose a C/C++ API, so that means that "
 "nearly all such libraries will require a small amount of first-party glue "
 "code."
 msgstr ""
 
-#: src/chromium/policy.md:13
+#: src/chromium/policy.md
 msgid ""
 "```bob\n"
 "\"C++\"                           Rust\n"
@@ -13489,50 +14110,50 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/policy.md:28
+#: src/chromium/policy.md
 msgid ""
 "First-party Rust glue code for a particular third-party crate should "
 "normally be kept in `third_party/rust/<crate>/<version>/wrapper`."
 msgstr ""
 
-#: src/chromium/policy.md:31
+#: src/chromium/policy.md
 msgid "Because of this, today's course will be heavily focused on:"
 msgstr ""
 
-#: src/chromium/policy.md:33
+#: src/chromium/policy.md
 msgid "Bringing in third-party Rust libraries (\"crates\")"
 msgstr ""
 
-#: src/chromium/policy.md:34
+#: src/chromium/policy.md
 msgid "Writing glue code to be able to use those crates from Chromium C++."
 msgstr ""
 
-#: src/chromium/policy.md:36
+#: src/chromium/policy.md
 msgid "If this policy changes over time, the course will evolve to keep up."
 msgstr ""
 
-#: src/chromium/build-rules.md:1
+#: src/chromium/build-rules.md
 #, fuzzy
 msgid "Build rules"
 msgstr "Règles de compilation"
 
-#: src/chromium/build-rules.md:3
+#: src/chromium/build-rules.md
 msgid ""
 "Rust code is usually built using `cargo`. Chromium builds with `gn` and "
 "`ninja` for efficiency --- its static rules allow maximum parallelism. Rust "
 "is no exception."
 msgstr ""
 
-#: src/chromium/build-rules.md:6
+#: src/chromium/build-rules.md
 msgid "Adding Rust code to Chromium"
 msgstr ""
 
-#: src/chromium/build-rules.md:8
+#: src/chromium/build-rules.md
 msgid ""
 "In some existing Chromium `BUILD.gn` file, declare a `rust_static_library`:"
 msgstr ""
 
-#: src/chromium/build-rules.md:10
+#: src/chromium/build-rules.md
 msgid ""
 "```gn\n"
 "import(\"//build/rust/rust_static_library.gni\")\n"
@@ -13544,13 +14165,13 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/build-rules.md:19
+#: src/chromium/build-rules.md
 msgid ""
 "You can also add `deps` on other Rust targets. Later we'll use this to "
 "depend upon third party code."
 msgstr ""
 
-#: src/chromium/build-rules.md:24
+#: src/chromium/build-rules.md
 msgid ""
 "You must specify _both_ the crate root, _and_ a full list of sources. The "
 "`crate_root` is the file given to the Rust compiler representing the root "
@@ -13559,13 +14180,13 @@ msgid ""
 "rebuilds are necessary."
 msgstr ""
 
-#: src/chromium/build-rules.md:30
+#: src/chromium/build-rules.md
 msgid ""
 "(There's no such thing as a Rust `source_set`, because in Rust, an entire "
 "crate is a compilation unit. A `static_library` is the smallest unit.)"
 msgstr ""
 
-#: src/chromium/build-rules.md:33
+#: src/chromium/build-rules.md
 msgid ""
 "Students might be wondering why we need a gn template, rather than using "
 "[gn's built-in support for Rust static libraries](https://gn.googlesource."
@@ -13574,11 +14195,11 @@ msgid ""
 "tests, some of which we'll use later."
 msgstr ""
 
-#: src/chromium/build-rules/unsafe.md:1
+#: src/chromium/build-rules/unsafe.md
 msgid "Including `unsafe` Rust Code"
 msgstr ""
 
-#: src/chromium/build-rules/unsafe.md:3
+#: src/chromium/build-rules/unsafe.md
 msgid ""
 "Unsafe Rust code is forbidden in `rust_static_library` by default --- it "
 "won't compile. If you need unsafe Rust code, add `allow_unsafe = true` to "
@@ -13586,7 +14207,7 @@ msgid ""
 "necessary.)"
 msgstr ""
 
-#: src/chromium/build-rules/unsafe.md:7
+#: src/chromium/build-rules/unsafe.md
 msgid ""
 "```gn\n"
 "import(\"//build/rust/rust_static_library.gni\")\n"
@@ -13602,11 +14223,11 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/build-rules/depending.md:3
+#: src/chromium/build-rules/depending.md
 msgid "Simply add the above target to the `deps` of some Chromium C++ target."
 msgstr ""
 
-#: src/chromium/build-rules/depending.md:5
+#: src/chromium/build-rules/depending.md
 msgid ""
 "```gn\n"
 "import(\"//build/rust/rust_static_library.gni\")\n"
@@ -13623,108 +14244,108 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:3
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "Types are elided in Rust code, which makes a good IDE even more useful than "
 "for C++. Visual Studio code works well for Rust in Chromium. To use it,"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:6
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "Ensure your VSCode has the `rust-analyzer` extension, not earlier forms of "
 "Rust support"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:8
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "`gn gen out/Debug --export-rust-project` (or equivalent for your output "
 "directory)"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:10
+#: src/chromium/build-rules/vscode.md
 msgid "`ln -s out/Debug/rust-project.json rust-project.json`"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:16
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "A demo of some of the code annotation and exploration features of rust-"
 "analyzer might be beneficial if the audience are naturally skeptical of IDEs."
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:19
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "The following steps may help with the demo (but feel free to instead use a "
 "piece of Chromium-related Rust that you are most familiar with):"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:22
+#: src/chromium/build-rules/vscode.md
 msgid "Open `components/qr_code_generator/qr_code_generator_ffi_glue.rs`"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:23
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "Place the cursor over the `QrCode::new` call (around line 26) in "
 "\\`qr_code_generator_ffi_glue.rs"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:25
+#: src/chromium/build-rules/vscode.md
 msgid ""
-"Demo **show documentation** (typical bindings: vscode = ctrl k i;  vim/CoC = "
+"Demo **show documentation** (typical bindings: vscode = ctrl k i; vim/CoC = "
 "K)."
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:26
+#: src/chromium/build-rules/vscode.md
 msgid ""
-"Demo **go to definition** (typical bindings: vscode = F12;  vim/CoC = g d). "
+"Demo **go to definition** (typical bindings: vscode = F12; vim/CoC = g d). "
 "(This will take you to `//third_party/rust/.../qr_code-.../src/lib.rs`.)"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:28
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "Demo **outline** and navigate to the `QrCode::with_bits` method (around line "
 "164; the outline is in the file explorer pane in vscode; typical vim/CoC "
 "bindings = space o)"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:31
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "Demo **type annotations** (there are quote a few nice examples in the "
 "`QrCode::with_bits` method)"
 msgstr ""
 
-#: src/chromium/build-rules/vscode.md:34
+#: src/chromium/build-rules/vscode.md
 msgid ""
 "It may be worth pointing out that `gn gen ... --export-rust-project` will "
 "need to be rerun after editing `BUILD.gn` files (which we will do a few "
 "times throughout the exercises in this session)."
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:1
+#: src/exercises/chromium/build-rules.md
 #, fuzzy
 msgid "Build rules exercise"
 msgstr "Règles de compilation"
 
-#: src/exercises/chromium/build-rules.md:3
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "In your Chromium build, add a new Rust target to `//ui/base/BUILD.gn` "
 "containing:"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:11
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "**Important**: note that `no_mangle` here is considered a type of unsafety "
 "by the Rust compiler, so you'll need to to allow unsafe code in your `gn` "
 "target."
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:15
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "Add this new Rust target as a dependency of `//ui/base:base`. Declare this "
 "function at the top of `ui/base/resource/resource_bundle.cc` (later, we'll "
 "see how this can be automated by bindings generation tools):"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:22
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "Call this function from somewhere in `ui/base/resource/resource_bundle.cc` - "
 "we suggest the top of `ResourceBundle::MaybeMangleLocalizedString`. Build "
@@ -13732,50 +14353,50 @@ msgid ""
 "times."
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:26
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "If you use VSCode, now set up Rust to work well in VSCode. It will be useful "
 "in subsequent exercises. If you've succeeded, you will be able to use right-"
 "click \"Go to definition\" on `println!`."
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:30
-#: src/exercises/chromium/interoperability-with-cpp.md:47
+#: src/exercises/chromium/build-rules.md
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Where to find help"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:32
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "The options available to the [`rust_static_library` gn template](https://"
 "source.chromium.org/chromium/chromium/src/+/main:build/rust/"
 "rust_static_library.gni;l=16)"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:33
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "Information about [`#[no_mangle]`](https://doc.rust-lang.org/beta/reference/"
 "abi.html#the-no_mangle-attribute)"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:34
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "Information about [`extern \"C\"`](https://doc.rust-lang.org/std/keyword."
 "extern.html)"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:35
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "Information about gn's [`--export-rust-project`](https://gn.googlesource.com/"
 "gn/+/main/docs/reference.md#compilation-database) switch"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:36
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "[How to install rust-analyzer in VSCode](https://code.visualstudio.com/docs/"
 "languages/rust)"
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:42
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "This example is unusual because it boils down to the lowest-common-"
 "denominator interop language, C. Both C++ and Rust can natively declare and "
@@ -13783,27 +14404,27 @@ msgid ""
 "Rust."
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:46
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "`allow_unsafe = true` is required here because `#[no_mangle]` might allow "
 "Rust to generate two functions with the same name, and Rust can no longer "
 "guarantee that the right one is called."
 msgstr ""
 
-#: src/exercises/chromium/build-rules.md:50
+#: src/exercises/chromium/build-rules.md
 msgid ""
 "If you need a pure Rust executable, you can also do that using the "
 "`rust_executable` gn template."
 msgstr ""
 
-#: src/chromium/testing.md:3
+#: src/chromium/testing.md
 msgid ""
 "Rust community typically authors unit tests in a module placed in the same "
 "source file as the code being tested. This was covered [earlier](../testing."
 "md) in the course and looks like this:"
 msgstr ""
 
-#: src/chromium/testing.md:15
+#: src/chromium/testing.md
 msgid ""
 "In Chromium we place unit tests in a separate source file and we continue to "
 "follow this practice for Rust --- this makes tests consistently discoverable "
@@ -13811,53 +14432,53 @@ msgid ""
 "configuration)."
 msgstr ""
 
-#: src/chromium/testing.md:20
+#: src/chromium/testing.md
 msgid ""
 "This results in the following options for testing Rust code in Chromium:"
 msgstr ""
 
-#: src/chromium/testing.md:22
+#: src/chromium/testing.md
 msgid ""
 "Native Rust tests (i.e. `#[test]`). Discouraged outside of `//third_party/"
 "rust`."
 msgstr ""
 
-#: src/chromium/testing.md:24
+#: src/chromium/testing.md
 msgid ""
-"`gtest` tests authored in C++ and exercising Rust via FFI calls.  Sufficient "
+"`gtest` tests authored in C++ and exercising Rust via FFI calls. Sufficient "
 "when Rust code is just a thin FFI layer and the existing unit tests provide "
 "sufficient coverage for the feature."
 msgstr ""
 
-#: src/chromium/testing.md:27
+#: src/chromium/testing.md
 msgid ""
 "`gtest` tests authored in Rust and using the crate under test through its "
-"public API (using `pub mod for_testing { ... }` if needed).  This is the "
+"public API (using `pub mod for_testing { ... }` if needed). This is the "
 "subject of the next few slides."
 msgstr ""
 
-#: src/chromium/testing.md:33
+#: src/chromium/testing.md
 msgid ""
 "Mention that native Rust tests of third-party crates should eventually be "
-"exercised by Chromium bots.  (Such testing is needed rarely --- only after "
+"exercised by Chromium bots. (Such testing is needed rarely --- only after "
 "adding or updating third-party crates.)"
 msgstr ""
 
-#: src/chromium/testing.md:37
+#: src/chromium/testing.md
 msgid ""
 "Some examples may help illustrate when C++ `gtest` vs Rust `gtest` should be "
 "used:"
 msgstr ""
 
-#: src/chromium/testing.md:40
+#: src/chromium/testing.md
 msgid ""
 "QR has very little functionality in the first-party Rust layer (it's just a "
 "thin FFI glue) and therefore uses the existing C++ unit tests for testing "
-"both the C++ and the Rust implementation (parametrizing the tests so they "
+"both the C++ and the Rust implementation (parameterizing the tests so they "
 "enable or disable Rust using a `ScopedFeatureList`)."
 msgstr ""
 
-#: src/chromium/testing.md:45
+#: src/chromium/testing.md
 msgid ""
 "Hypothetical/WIP PNG integration may need to implement memory-safe "
 "implementation of pixel transformations that are provided by `libpng` but "
@@ -13865,36 +14486,36 @@ msgid ""
 "functionality may benefit from separate tests authored in Rust."
 msgstr ""
 
-#: src/chromium/testing/rust-gtest-interop.md:3
+#: src/chromium/testing/rust-gtest-interop.md
 msgid ""
 "The [`rust_gtest_interop`](https://chromium.googlesource.com/chromium/src/+/"
 "main/testing/rust_gtest_interop/README.md) library provides a way to:"
 msgstr ""
 
-#: src/chromium/testing/rust-gtest-interop.md:5
+#: src/chromium/testing/rust-gtest-interop.md
 msgid ""
 "Use a Rust function as a `gtest` testcase (using the `#[gtest(...)]` "
 "attribute)"
 msgstr ""
 
-#: src/chromium/testing/rust-gtest-interop.md:7
+#: src/chromium/testing/rust-gtest-interop.md
 msgid ""
 "Use `expect_eq!` and similar macros (similar to `assert_eq!` but not "
 "panicking and not terminating the test when the assertion fails)."
 msgstr ""
 
-#: src/chromium/testing/rust-gtest-interop.md:10
+#: src/chromium/testing/rust-gtest-interop.md
 #, fuzzy
 msgid "Example:"
 msgstr "Exemple"
 
-#: src/chromium/testing/build-gn.md:3
+#: src/chromium/testing/build-gn.md
 msgid ""
 "The simplest way to build Rust `gtest` tests is to add them to an existing "
 "test binary that already contains tests authored in C++. For example:"
 msgstr ""
 
-#: src/chromium/testing/build-gn.md:6
+#: src/chromium/testing/build-gn.md
 msgid ""
 "```gn\n"
 "test(\"ui_base_unittests\") {\n"
@@ -13905,13 +14526,13 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/testing/build-gn.md:14
+#: src/chromium/testing/build-gn.md
 msgid ""
 "Authoring Rust tests in a separate `static_library` also works, but requires "
 "manually declaring the dependency on the support libraries:"
 msgstr ""
 
-#: src/chromium/testing/build-gn.md:17
+#: src/chromium/testing/build-gn.md
 msgid ""
 "```gn\n"
 "rust_static_library(\"my_rust_lib_unittests\") {\n"
@@ -13932,53 +14553,88 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/chromium/testing.md:1
+#: src/chromium/testing/chromium-import-macro.md
+msgid ""
+"After adding `:my_rust_lib` to GN `deps`, we still need to learn how to "
+"import and use `my_rust_lib` from `my_rust_lib_unittest.rs`. We haven't "
+"provided an explicit `crate_name` for `my_rust_lib` so its crate name is "
+"computed based on the full target path and name. Fortunately we can avoid "
+"working with such an unwieldy name by using the `chromium::import!` macro "
+"from the automatically-imported `chromium` crate:"
+msgstr ""
+
+#: src/chromium/testing/chromium-import-macro.md
+msgid "\"//ui/base:my_rust_lib\""
+msgstr ""
+
+#: src/chromium/testing/chromium-import-macro.md
+msgid "Under the covers the macro expands to something similar to:"
+msgstr ""
+
+#: src/chromium/testing/chromium-import-macro.md
+msgid ""
+"More information can be found in [the doc comment](https://source.chromium."
+"org/chromium/chromium/src/+/main:build/rust/chromium_prelude/"
+"chromium_prelude.rs?q=f:chromium_prelude.rs%20pub.use.*%5Cbimport%5Cb;%20-f:"
+"third_party&ss=chromium%2Fchromium%2Fsrc) of the `chromium::import` macro."
+msgstr ""
+
+#: src/chromium/testing/chromium-import-macro.md
+msgid ""
+"`rust_static_library` supports specifying an explicit name via `crate_name` "
+"property, but doing this is discouraged. And it is discouraged because the "
+"crate name has to be globally unique. crates.io guarantees uniqueness of its "
+"crate names so `cargo_crate` GN targets (generated by the `gnrt` tool "
+"covered in a later section) use short crate names."
+msgstr ""
+
+#: src/exercises/chromium/testing.md
 #, fuzzy
 msgid "Testing exercise"
 msgstr "Exercices"
 
-#: src/exercises/chromium/testing.md:3
+#: src/exercises/chromium/testing.md
 msgid "Time for another exercise!"
 msgstr ""
 
-#: src/exercises/chromium/testing.md:5
+#: src/exercises/chromium/testing.md
 msgid "In your Chromium build:"
 msgstr ""
 
-#: src/exercises/chromium/testing.md:7
+#: src/exercises/chromium/testing.md
 msgid ""
 "Add a testable function next to `hello_from_rust`. Some suggestions: adding "
 "two integers received as arguments, computing the nth Fibonacci number, "
 "summing integers in a slice, etc."
 msgstr ""
 
-#: src/exercises/chromium/testing.md:12
+#: src/exercises/chromium/testing.md
 msgid "Add a separate `..._unittest.rs` file with a test for the new function."
 msgstr ""
 
-#: src/exercises/chromium/testing.md:13
+#: src/exercises/chromium/testing.md
 msgid "Add the new tests to `BUILD.gn`."
 msgstr ""
 
-#: src/exercises/chromium/testing.md:14
+#: src/exercises/chromium/testing.md
 msgid "Build the tests, run them, and verify that the new test works."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:3
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "The Rust community offers multiple options for C++/Rust interop, with new "
 "tools being developed all the time. At the moment, Chromium uses a tool "
 "called CXX."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:6
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "You describe your whole language boundary in an interface definition "
 "language (which looks a lot like Rust) and then CXX tools generate "
 "declarations for functions and types in both Rust and C++."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:12
+#: src/chromium/interoperability-with-cpp.md
 #, fuzzy
 msgid ""
 "See the [CXX tutorial](https://cxx.rs/tutorial.html) for a full example of "
@@ -13987,14 +14643,14 @@ msgstr ""
 "Voir le \\[tutoriel CXX\\] [2](https://cxx.rs/tutorial.html) pour un exemple "
 "complet d'utilisation."
 
-#: src/chromium/interoperability-with-cpp.md:21
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "Talk through the diagram. Explain that behind the scenes, this is doing just "
 "the same as you previously did. Point out that automating the process has "
 "the following benefits:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:25
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "The tool guarantees that the C++ and Rust sides match (e.g. you get compile "
 "errors if the `#[cxx::bridge]` doesn't match the actual C++ or Rust "
@@ -14002,7 +14658,7 @@ msgid ""
 "Behavior)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:29
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "The tool automates generation of FFI thunks (small, C-ABI-compatible, free "
 "functions) for non-C features (e.g. enabling FFI calls into Rust or C++ "
@@ -14010,11 +14666,11 @@ msgid ""
 "functions manually)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:34
+#: src/chromium/interoperability-with-cpp.md
 msgid "The tool and the library can handle a set of core types - for example:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:35
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "`&[T]` can be passed across the FFI boundary, even though it doesn't "
 "guarantee any particular ABI or memory layout. With manual bindings `std::"
@@ -14023,7 +14679,7 @@ msgid ""
 "empty slices slightly differently)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:40
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "Smart pointers like `std::unique_ptr<T>`, `std::shared_ptr<T>`, and/or `Box` "
 "are natively supported. With manual bindings, one would have to pass C-ABI-"
@@ -14031,7 +14687,7 @@ msgid ""
 "risks."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp.md:44
+#: src/chromium/interoperability-with-cpp.md
 msgid ""
 "`rust::String` and `CxxString` types understand and maintain differences in "
 "string representation across the languages (e.g. `rust::String::lossy` can "
@@ -14039,25 +14695,25 @@ msgid ""
 "terminate a string)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:3
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid ""
 "CXX requires that the whole C++/Rust boundary is declared in `cxx::bridge` "
 "modules inside `.rs` source code."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:16
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "\"example/include/blobstore.h\""
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:24
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "// Definitions of Rust types and functions go here\n"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:30
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "Point out:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:32
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid ""
 "Although this looks like a regular Rust `mod`, the `#[cxx::bridge]` "
 "procedural macro does complex things to it. The generated code is quite a "
@@ -14065,24 +14721,24 @@ msgid ""
 "`ffi` in your code."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:36
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "Native support for C++'s `std::unique_ptr` in Rust"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:37
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 #, fuzzy
 msgid "Native support for Rust slices in C++"
 msgstr "Support intégré pour les tests."
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:38
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "Calls from C++ to Rust, and Rust types (in the top part)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:39
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid "Calls from Rust to C++, and C++ types (in the bottom part)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/example-bindings.md:41
+#: src/chromium/interoperability-with-cpp/example-bindings.md
 msgid ""
 "**Common misconception**: It _looks_ like a C++ header is being parsed by "
 "Rust, but this is misleading. This header is never interpreted by Rust, but "
@@ -14090,35 +14746,35 @@ msgid ""
 "compilers."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:3
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "By far the most useful page when using CXX is the [type reference](https://"
 "cxx.rs/bindings.html)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:5
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid "CXX fundamentally suits cases where:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:7
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "Your Rust-C++ interface is sufficiently simple that you can declare all of "
 "it."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:8
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "You're using only the types natively supported by CXX already, for example "
 "`std::unique_ptr`, `std::string`, `&[u8]` etc."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:11
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "It has many limitations --- for example lack of support for Rust's `Option` "
 "type."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:13
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "These limitations constrain us to using Rust in Chromium only for well "
 "isolated \"leaf nodes\" rather than for arbitrary Rust-C++ interop. When "
@@ -14127,76 +14783,76 @@ msgid ""
 "enough."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:26
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "You should also discuss some of the other sticky points with CXX, for "
 "example:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:28
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid ""
 "Its error handling is based around C++ exceptions (given on the next slide)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md:29
+#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md
 msgid "Function pointers are awkward to use."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:3
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid ""
 "CXX's [support for `Result<T,E>`](https://cxx.rs/binding/result.html) relies "
 "on C++ exceptions, so we can't use that in Chromium. Alternatives:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:6
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid "The `T` part of `Result<T, E>` can be:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:7
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid ""
-"Returned via out parameters (e.g. via `&mut T`).  This requires that `T` can "
+"Returned via out parameters (e.g. via `&mut T`). This requires that `T` can "
 "be passed across the FFI boundary - for example `T` has to be:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:9
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid "A primitive type (like `u32` or `usize`)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:10
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid ""
 "A type natively supported by `cxx` (like `UniquePtr<T>`) that has a suitable "
 "default value to use in a failure case (_unlike_ `Box<T>`)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:12
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid ""
-"Retained on the Rust side, and exposed via reference.  This may be needed "
+"Retained on the Rust side, and exposed via reference. This may be needed "
 "when `T` is a Rust type, which cannot be passed across the FFI boundary, and "
 "cannot be stored in `UniquePtr<T>`."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:16
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid "The `E` part of `Result<T, E>` can be:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:17
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid ""
 "Returned as a boolean (e.g. `true` representing success, and `false` "
 "representing failure)"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling.md:19
+#: src/chromium/interoperability-with-cpp/error-handling.md
 msgid ""
 "Preserving error details is in theory possible, but so far hasn't been "
 "needed in practice."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:1
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
 #, fuzzy
 msgid "CXX Error Handling: QR Example"
 msgstr "Gestion des erreurs"
 
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:3
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
 msgid ""
 "The QR code generator is [an example](https://source.chromium.org/chromium/"
 "chromium/src/+/main:components/qr_code_generator/qr_code_generator_ffi_glue."
@@ -14205,91 +14861,92 @@ msgid ""
 "be passed across the FFI boundary:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:8
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
 msgid "\"qr_code_generator\""
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:23
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
 msgid ""
-"Students may be curious about the semantics of the `out_qr_size` output.  "
+"Students may be curious about the semantics of the `out_qr_size` output. "
 "This is not the size of the vector, but the size of the QR code (and "
 "admittedly it is a bit redundant - this is the square root of the size of "
 "the vector)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:27
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
 msgid ""
 "It may be worth pointing out the importance of initializing `out_qr_size` "
-"before calling into the Rust function.  Creation of a Rust reference that "
+"before calling into the Rust function. Creation of a Rust reference that "
 "points to uninitialized memory results in Undefined Behavior (unlike in C++, "
 "when only the act of dereferencing such memory results in UB)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-qr.md:32
+#: src/chromium/interoperability-with-cpp/error-handling-qr.md
 msgid ""
 "If students ask about `Pin`, then explain why CXX needs it for mutable "
 "references to C++ data: the answer is that C++ data can’t be moved around "
 "like Rust data, because it may contain self-referential pointers."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:1
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 #, fuzzy
 msgid "CXX Error Handling: PNG Example"
 msgstr "Gestion des erreurs"
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:3
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid ""
 "A prototype of a PNG decoder illustrates what can be done when the "
 "successful result cannot be passed across the FFI boundary:"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:7
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid "\"gfx::rust_bindings\""
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:10
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid ""
-"/// This returns an FFI-friendly equivalent of `Result<PngReader<'a>, ()>`.\n"
+"/// This returns an FFI-friendly equivalent of `Result<PngReader<'a>,\n"
+"        /// ()>`.\n"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:13
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid "/// C++ bindings for the `crate::png::ResultOfPngReader` type.\n"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:20
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid "/// C++ bindings for the `crate::png::PngReader` type.\n"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:31
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid ""
 "`PngReader` and `ResultOfPngReader` are Rust types --- objects of these "
-"types cannot cross the FFI boundary without indirection of a `Box<T>`.  We "
+"types cannot cross the FFI boundary without indirection of a `Box<T>`. We "
 "can't have an `out_parameter: &mut PngReader`, because CXX doesn't allow C++ "
 "to store Rust objects by value."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/error-handling-png.md:36
+#: src/chromium/interoperability-with-cpp/error-handling-png.md
 msgid ""
 "This example illustrates that even though CXX doesn't support arbitrary "
 "generics nor templates, we can still pass them across the FFI boundary by "
-"manually specializing / monomorphizing them into a non-generic type.  In the "
+"manually specializing / monomorphizing them into a non-generic type. In the "
 "example `ResultOfPngReader` is a non-generic type that forwards into "
 "appropriate methods of `Result<T, E>` (e.g. into `is_err`, `unwrap`, and/or "
 "`as_mut`)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:1
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid "Using cxx in Chromium"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:3
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid ""
 "In Chromium, we define an independent `#[cxx::bridge] mod` for each leaf-"
 "node where we want to use Rust. You'd typically have one for each "
 "`rust_static_library`. Just add"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:7
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid ""
 "```gn\n"
 "cxx_bindings = [ \"my_rust_file.rs\" ]\n"
@@ -14298,21 +14955,21 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:13
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid ""
 "to your existing `rust_static_library` target alongside `crate_root` and "
 "`sources`."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:16
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid "C++ headers will be generated at a sensible location, so you can just"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:19
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid "\"ui/base/my_rust_file.rs.h\""
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:22
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid ""
 "You will find some utility functions in `//base` to convert to/from Chromium "
 "C++ types to CXX Rust types --- for example [`SpanToRustSlice`](https://"
@@ -14320,11 +14977,11 @@ msgid ""
 "l=21)."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:27
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid "Students may ask --- why do we still need `allow_unsafe = true`?"
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:29
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid ""
 "The broad answer is that no C/C++ code is \"safe\" by the normal Rust "
 "standards. Calling back and forth to C/C++ from Rust may do arbitrary things "
@@ -14335,7 +14992,7 @@ msgid ""
 "binary can cause unexpected behavior from Rust's perspective."
 msgstr ""
 
-#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md:36
+#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md
 msgid ""
 "The narrow answer lies in the diagram at the top of [this page](../"
 "interoperability-with-cpp.md) --- behind the scenes, CXX generates Rust "
@@ -14343,153 +15000,153 @@ msgid ""
 "previous section."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:1
+#: src/exercises/chromium/interoperability-with-cpp.md
 #, fuzzy
 msgid "Exercise: Interoperability with C++"
 msgstr "Interopérabilité avec C"
 
-#: src/exercises/chromium/interoperability-with-cpp.md:3
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Part one"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:5
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "In the Rust file you previously created, add a `#[cxx::bridge]` which "
 "specifies a single function, to be called from C++, called "
 "`hello_from_rust`, taking no parameters and returning no value."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:8
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "Modify your previous `hello_from_rust` function to remove `extern \"C\"` and "
 "`#[no_mangle]`. This is now just a standard Rust function."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:10
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Modify your `gn` target to build these bindings."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:11
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "In your C++ code, remove the forward-declaration of `hello_from_rust`. "
 "Instead, include the generated header file."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:13
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Build and run!"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:15
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Part two"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:17
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "It's a good idea to play with CXX a little. It helps you think about how "
 "flexible Rust in Chromium actually is."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:20
+#: src/exercises/chromium/interoperability-with-cpp.md
 #, fuzzy
 msgid "Some things to try:"
 msgstr "Quelques notes:"
 
-#: src/exercises/chromium/interoperability-with-cpp.md:22
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Call back into C++ from Rust. You will need:"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:23
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "An additional header file which you can `include!` from your `cxx::bridge`. "
 "You'll need to declare your C++ function in that new header file."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:25
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "An `unsafe` block to call such a function, or alternatively specify the "
 "`unsafe` keyword in your `#[cxx::bridge]` [as described here](https://cxx.rs/"
 "extern-c++.html#functions-and-member-functions)."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:27
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "You may also need to `#include \"third_party/rust/cxx/v1/crate/include/cxx."
 "h\"`"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:28
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Pass a C++ string from C++ into Rust."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:29
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Pass a reference to a C++ object into Rust."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:30
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "Intentionally get the Rust function signatures mismatched from the `#[cxx::"
 "bridge]`, and get used to the errors you see."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:32
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "Intentionally get the C++ function signatures mismatched from the `#[cxx::"
 "bridge]`, and get used to the errors you see."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:34
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "Pass a `std::unique_ptr` of some type from C++ into Rust, so that Rust can "
 "own some C++ object."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:36
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "Create a Rust object and pass it into C++, so that C++ owns it. (Hint: you "
 "need a `Box`)."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:38
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Declare some methods on a C++ type. Call them from Rust."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:39
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Declare some methods on a Rust type. Call them from C++."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:41
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Part three"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:43
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "Now you understand the strengths and limitations of CXX interop, think of a "
 "couple of use-cases for Rust in Chromium where the interface would be "
 "sufficiently simple. Sketch how you might define that interface."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:49
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "The [`cxx` binding reference](https://cxx.rs/bindings.html)"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:50
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "The [`rust_static_library` gn template](https://source.chromium.org/chromium/"
 "chromium/src/+/main:build/rust/rust_static_library.gni;l=16)"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:56
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid "Some of the questions you may encounter:"
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:57
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "I'm seeing a problem initializing a variable of type X with type Y, where X "
 "and Y are both function types. This is because your C++ function doesn't "
 "quite match the declaration in your `cxx::bridge`."
 msgstr ""
 
-#: src/exercises/chromium/interoperability-with-cpp.md:61
+#: src/exercises/chromium/interoperability-with-cpp.md
 msgid ""
 "I seem to be able to freely convert C++ references into Rust references. "
 "Doesn't that risk UB? For CXX's _opaque_ types, no, because they are zero-"
@@ -14497,95 +15154,94 @@ msgid ""
 "CXX's design makes it quite difficult to craft such an example."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:3
+#: src/chromium/adding-third-party-crates.md
 msgid ""
 "Rust libraries are called \"crates\" and are found at [crates.io](https://"
 "crates.io). It's _very easy_ for Rust crates to depend upon one another. So "
 "they do!"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:6
+#: src/chromium/adding-third-party-crates.md
 #, fuzzy
 msgid "C++ library"
 msgstr "Bibliothèque"
 
-#: src/chromium/adding-third-party-crates.md:6
+#: src/chromium/adding-third-party-crates.md
 #, fuzzy
 msgid "Rust crate"
 msgstr "Écosystème de Rust"
 
-#: src/chromium/adding-third-party-crates.md:8
+#: src/chromium/adding-third-party-crates.md
 #, fuzzy
 msgid "Build system"
 msgstr "Écosystème de Rust"
 
-#: src/chromium/adding-third-party-crates.md:8
-#: src/chromium/adding-third-party-crates.md:10
+#: src/chromium/adding-third-party-crates.md
 msgid "Lots"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:8
+#: src/chromium/adding-third-party-crates.md
 #, fuzzy
 msgid "Consistent: `Cargo.toml`"
 msgstr "Vous pouvez utiliser le fichier `Cargo.toml` suivant :"
 
-#: src/chromium/adding-third-party-crates.md:9
+#: src/chromium/adding-third-party-crates.md
 msgid "Typical library size"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:9
+#: src/chromium/adding-third-party-crates.md
 msgid "Large-ish"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:9
+#: src/chromium/adding-third-party-crates.md
 msgid "Small"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:10
+#: src/chromium/adding-third-party-crates.md
 msgid "Transitive dependencies"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:10
+#: src/chromium/adding-third-party-crates.md
 msgid "Few"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:12
+#: src/chromium/adding-third-party-crates.md
 msgid "For a Chromium engineer, this has pros and cons:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:14
+#: src/chromium/adding-third-party-crates.md
 msgid ""
 "All crates use a common build system so we can automate their inclusion into "
 "Chromium..."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:16
+#: src/chromium/adding-third-party-crates.md
 msgid ""
 "... but, crates typically have transitive dependencies, so you will likely "
 "have to bring in multiple libraries."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:19
+#: src/chromium/adding-third-party-crates.md
 msgid "We'll discuss:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:21
+#: src/chromium/adding-third-party-crates.md
 msgid "How to put a crate in the Chromium source code tree"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:22
+#: src/chromium/adding-third-party-crates.md
 msgid "How to make `gn` build rules for it"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates.md:23
+#: src/chromium/adding-third-party-crates.md
 msgid "How to audit its source code for sufficient safety."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md:1
+#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md
 msgid "Configuring the `Cargo.toml` file to add crates"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md:3
+#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md
 msgid ""
 "Chromium has a single set of centrally-managed direct crate dependencies. "
 "These are managed through a single [`Cargo.toml`](https://source.chromium."
@@ -14593,7 +15249,7 @@ msgid ""
 "toml):"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md:6
+#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md
 msgid ""
 "```toml\n"
 "[dependencies]\n"
@@ -14604,7 +15260,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md:14
+#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md
 msgid ""
 "As with any other `Cargo.toml`, you can specify [more details about the "
 "dependencies](https://doc.rust-lang.org/cargo/reference/specifying-"
@@ -14612,53 +15268,53 @@ msgid ""
 "that you wish to enable in the crate."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md:18
+#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md
 msgid ""
 "When adding a crate to Chromium, you'll often need to provide some extra "
 "information in an additional file, `gnrt_config.toml`, which we'll meet next."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md:3
+#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md
 msgid ""
 "Alongside `Cargo.toml` is [`gnrt_config.toml`](https://source.chromium.org/"
 "chromium/chromium/src/+/main:third_party/rust/chromium_crates_io/gnrt_config."
 "toml). This contains Chromium-specific extensions to crate handling."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md:6
+#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md
 msgid ""
 "If you add a new crate, you should specify at least the `group`. This is one "
 "of:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md:16
-#: src/chromium/adding-third-party-crates/depending-on-a-crate.md:15
+#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md
+#: src/chromium/adding-third-party-crates/depending-on-a-crate.md
 msgid "For instance,"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md:23
+#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md
 msgid ""
 "Depending on the crate source code layout, you may also need to use this "
 "file to specify where its `LICENSE` file(s) can be found."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md:26
+#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md
 msgid ""
 "Later, we'll see some other things you will need to configure in this file "
 "to resolve problems."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:3
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid ""
 "A tool called `gnrt` knows how to download crates and how to generate `BUILD."
 "gn` rules."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:6
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid "To start, download the crate you want like this:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:13
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid ""
 "Although the `gnrt` tool is part of the Chromium source code, by running "
 "this command you will be downloading and running its dependencies from "
@@ -14666,58 +15322,58 @@ msgid ""
 "decision."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:18
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid "This `vendor` command may download:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:19
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 #, fuzzy
 msgid "Your crate"
 msgstr "Crates utiles"
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:20
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid "Direct and transitive dependencies"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:21
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid ""
 "New versions of other crates, as required by `cargo` to resolve the complete "
 "set of crates required by Chromium."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/downloading-crates.md:24
+#: src/chromium/adding-third-party-crates/downloading-crates.md
 msgid ""
 "Chromium maintains patches for some crates, kept in `//third_party/rust/"
 "chromium_crates_io/patches`. These will be reapplied automatically, but if "
 "patching fails you may need to take manual action."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:3
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid ""
 "Once you've downloaded the crate, generate the `BUILD.gn` files like this:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:9
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid "Now run `git status`. You should find:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:11
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid ""
 "At least one new crate source code in `third_party/rust/chromium_crates_io/"
 "vendor`"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:12
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid ""
 "At least one new `BUILD.gn` in `third_party/rust/<crate name>/v<major semver "
 "version>`"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:13
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid "An appropriate `README.chromium`"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:15
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 #, fuzzy
 msgid ""
 "The \"major semver version\" is a [Rust \"semver\" version number](https://"
@@ -14726,19 +15382,19 @@ msgstr ""
 "Voir la [Rust Reference](https://doc.rust-lang.org/reference/type-layout."
 "html)."
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:17
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid ""
 "Take a close look, especially at the things generated in `third_party/rust`."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md:21
+#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md
 msgid ""
 "Talk a little about semver --- and specifically the way that in Chromium "
 "it's to allow multiple incompatible versions of a crate, which is "
 "discouraged but sometimes necessary in the Cargo ecosystem."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:3
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid ""
 "If your build fails, it may be because of a `build.rs`: programs which do "
 "arbitrary things at build time. This is fundamentally at odds with the "
@@ -14746,71 +15402,69 @@ msgid ""
 "to maximize parallelism and repeatability of builds."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:8
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid ""
 "Some `build.rs` actions are automatically supported; others require action:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:10
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "build script effect"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:10
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Supported by our gn templates"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:10
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Work required by you"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:12
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Checking rustc version to configure features on and off"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:12
-#: src/chromium/adding-third-party-crates/resolving-problems.md:13
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "None"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:13
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Checking platform or CPU to configure features on and off"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:14
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 #, fuzzy
 msgid "Generating code"
 msgstr "Génériques"
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:14
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Yes - specify in `gnrt_config.toml`"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:15
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Building C/C++"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:15
-#: src/chromium/adding-third-party-crates/resolving-problems.md:16
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Patch around it"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:16
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid "Arbitrary other actions"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems.md:18
+#: src/chromium/adding-third-party-crates/resolving-problems.md
 msgid ""
 "Fortunately, most crates don't contain a build script, and fortunately, most "
 "build scripts only do the top two actions."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md:3
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md
 msgid ""
 "If `ninja` complains about missing files, check the `build.rs` to see if it "
 "writes source code files."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md:6
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md
 msgid ""
 "If so, modify [`gnrt_config.toml`](../configuring-gnrt-config-toml.md) to "
 "add `build-script-outputs` to the crate. If this is a transitive dependency, "
@@ -14819,23 +15473,23 @@ msgid ""
 "file:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md:11
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md
 msgid ""
 "```toml\n"
 "[crate.unicode-linebreak]\n"
 "allow-first-party-usage = false\n"
-"build-script-outputs = [ \"tables.rs\" ]\n"
+"build-script-outputs = [\"tables.rs\"]\n"
 "```"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md:17
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md
 msgid ""
 "Now rerun [`gnrt.py -- gen`](../generating-gn-build-rules.md) to regenerate "
 "`BUILD.gn` files to inform ninja that this particular output file is input "
 "to subsequent build steps."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md:3
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
 msgid ""
 "Some crates use the [`cc`](https://crates.io/crates/cc) crate to build and "
 "link C/C++ libraries. Other crates parse C/C++ using [`bindgen`](https://"
@@ -14844,19 +15498,19 @@ msgid ""
 "very specific in expressing relationships between build actions."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md:9
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
 msgid "So, your options are:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md:11
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
 msgid "Avoid these crates"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md:12
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
 msgid "Apply a patch to the crate."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md:14
+#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md
 msgid ""
 "Patches should be kept in `third_party/rust/chromium_crates_io/patches/"
 "<crate>` - see for example the [patches against the `cxx` crate](https://"
@@ -14865,18 +15519,18 @@ msgid ""
 "`gnrt` each time it upgrades the crate."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/depending-on-a-crate.md:3
+#: src/chromium/adding-third-party-crates/depending-on-a-crate.md
 msgid ""
 "Once you've added a third-party crate and generated build rules, depending "
 "on a crate is simple. Find your `rust_static_library` target, and add a "
 "`dep` on the `:lib` target within your crate."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/depending-on-a-crate.md:7
+#: src/chromium/adding-third-party-crates/depending-on-a-crate.md
 msgid "Specifically,"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/depending-on-a-crate.md:9
+#: src/chromium/adding-third-party-crates/depending-on-a-crate.md
 msgid ""
 "```bob\n"
 "                     +------------+      +----------------------+\n"
@@ -14886,7 +15540,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/depending-on-a-crate.md:17
+#: src/chromium/adding-third-party-crates/depending-on-a-crate.md
 msgid ""
 "```gn\n"
 "rust_static_library(\"my_rust_lib\") {\n"
@@ -14897,11 +15551,11 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:1
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid "Auditing Third Party Crates"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:3
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Adding new libraries is subject to Chromium's standard [policies](https://"
 "chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/rust."
@@ -14911,18 +15565,18 @@ msgid ""
 "Rust code can have limited negative side effects. How should you review it?"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:9
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Over time Chromium aims to move to a process based around [cargo vet]"
 "(https://mozilla.github.io/cargo-vet/)."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:11
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Meanwhile, for each new crate addition, we are checking for the following:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:13
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Understand why each crate is used. What's the relationship between crates? "
 "If the build system for each crate contains a `build.rs` or procedural "
@@ -14930,11 +15584,11 @@ msgid ""
 "is normally built?"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:17
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid "Check each crate seems to be reasonably well maintained"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:18
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Use `cd third-party/rust/chromium_crates_io; cargo audit` to check for known "
 "vulnerabilities (first you'll need to `cargo install cargo-audit`, which "
@@ -14942,65 +15596,65 @@ msgid ""
 "cargo.md))"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:21
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Ensure any `unsafe` code is good enough for the [Rule of Two](https://"
 "chromium.googlesource.com/chromium/src/+/main/docs/security/rule-of-2."
 "md#unsafe-code-in-safe-languages)"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:22
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid "Check for any use of `fs` or `net` APIs"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:23
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "Read all the code at a sufficient level to look for anything out of place "
 "that might have been maliciously inserted. (You can't realistically aim for "
 "100% perfection here: there's often just too much code.)"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/reviews-and-audits.md:27
+#: src/chromium/adding-third-party-crates/reviews-and-audits.md
 msgid ""
 "These are just guidelines --- work with reviewers from `security@chromium."
 "org` to work out the right way to become confident of the crate."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:1
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid "Checking Crates into Chromium Source Code"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:3
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid "`git status` should reveal:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:4
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid "Crate code in `//third_party/rust/chromium_crates_io`"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:5
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid ""
 "Metadata (`BUILD.gn` and `README.chromium`) in `//third_party/rust/<crate>/"
 "<version>`"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:7
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid "Please also add an `OWNERS` file in the latter location."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:9
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid ""
 "You should land all this, along with your `Cargo.toml` and `gnrt_config."
 "toml` changes, into the Chromium repo."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:12
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid ""
 "**Important**: you need to use `git add -f` because otherwise `.gitignore` "
 "files may result in some files being skipped."
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/checking-in.md:15
+#: src/chromium/adding-third-party-crates/checking-in.md
 msgid ""
 "As you do so, you might find presubmit checks fail because of non-inclusive "
 "language. This is because Rust crate data tends to include names of git "
@@ -15008,7 +15662,7 @@ msgid ""
 "you may need to run:"
 msgstr ""
 
-#: src/chromium/adding-third-party-crates/keeping-up-to-date.md:3
+#: src/chromium/adding-third-party-crates/keeping-up-to-date.md
 msgid ""
 "As the OWNER of any third party Chromium dependency, you are [expected to "
 "keep it up to date with any security fixes](https://chromium.googlesource."
@@ -15017,7 +15671,7 @@ msgid ""
 "still your responsibility just as it is for any other third party dependency."
 msgstr ""
 
-#: src/exercises/chromium/third-party.md:3
+#: src/exercises/chromium/third-party.md
 msgid ""
 "Add [uwuify](https://crates.io/crates/uwuify) to Chromium, turning off the "
 "crate's [default features](https://doc.rust-lang.org/cargo/reference/"
@@ -15025,7 +15679,7 @@ msgid ""
 "shipping Chromium, but won't be used to handle untrustworthy input."
 msgstr ""
 
-#: src/exercises/chromium/third-party.md:7
+#: src/exercises/chromium/third-party.md
 msgid ""
 "(In the next exercise we'll use uwuify from Chromium, but feel free to skip "
 "ahead and do that now if you like. Or, you could create a new "
@@ -15033,90 +15687,129 @@ msgid ""
 "+/main:build/rust/rust_executable.gni) which uses `uwuify`)."
 msgstr ""
 
-#: src/exercises/chromium/third-party.md:14
-msgid ""
-"The total crates needed are: uwuify, smallvec, scopeguard, parking_lot, "
-"parking_lot_core, lock_api and instant. If students are downloading even "
-"more than that, they probably forgot to turn off the default features."
+#: src/exercises/chromium/third-party.md
+msgid "Students will need to download lots of transitive dependencies."
 msgstr ""
 
-#: src/exercises/chromium/third-party.md:18
-msgid ""
-"Thanks to [Daniel Liu](https://github.com/Daniel-Liu-c0deb0t) for this "
-"crate! "
+#: src/exercises/chromium/third-party.md
+msgid "The total crates needed are:"
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:1
+#: src/exercises/chromium/third-party.md
+#, fuzzy
+msgid "`instant`,"
+msgstr "`const`"
+
+#: src/exercises/chromium/third-party.md
+msgid "`lock_api`,"
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid "`parking_lot`,"
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid "`parking_lot_core`,"
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid "`redox_syscall`,"
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid "`scopeguard`,"
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid "`smallvec`, and"
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid "`uwuify`."
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid ""
+"If students are downloading even more than that, they probably forgot to "
+"turn off the default features."
+msgstr ""
+
+#: src/exercises/chromium/third-party.md
+msgid ""
+"Thanks to [Daniel Liu](https://github.com/Daniel-Liu-c0deb0t) for this crate!"
+msgstr ""
+
+#: src/exercises/chromium/bringing-it-together.md
 msgid "Bringing It Together --- Exercise"
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:3
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "In this exercise, you're going to add a whole new Chromium feature, bringing "
 "together everything you already learned."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:6
+#: src/exercises/chromium/bringing-it-together.md
 msgid "The Brief from Product Management"
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:8
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "A community of pixies has been discovered living in a remote rainforest. "
 "It's important that we get Chromium for Pixies delivered to them as soon as "
 "possible."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:12
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "The requirement is to translate all Chromium's UI strings into Pixie "
 "language."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:14
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "There's not time to wait for proper translations, but fortunately pixie "
 "language is very close to English, and it turns out there's a Rust crate "
 "which does the translation."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:18
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "In fact, you already [imported that crate in the previous exercise](https://"
 "crates.io/crates/uwuify)."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:20
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "(Obviously, real translations of Chrome require incredible care and "
 "diligence. Don't ship this!)"
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:23
+#: src/exercises/chromium/bringing-it-together.md
 msgid "Steps"
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:25
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "Modify `ResourceBundle::MaybeMangleLocalizedString` so that it uwuifies all "
 "strings before display. In this special build of Chromium, it should always "
 "do this irrespective of the setting of `mangle_localized_strings_`."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:29
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "If you've done everything right across all these exercises, congratulations, "
 "you should have created Chrome for pixies!"
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:37
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "UTF16 vs UTF8. Students should be aware that Rust strings are always UTF8, "
 "and will probably decide that it's better to do the conversion on the C++ "
 "side using `base::UTF16ToUTF8` and back again."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:40
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "If students decide to do the conversion on the Rust side, they'll need to "
 "consider [`String::from_utf16`](https://doc.rust-lang.org/std/string/struct."
@@ -15125,7 +15818,7 @@ msgid ""
 "slice.html)."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:43
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "Students may design the C++/Rust boundary in several different ways, e.g. "
 "taking and returning strings by value, or taking a mutable reference to a "
@@ -15136,31 +15829,31 @@ msgid ""
 "around like Rust data, because it may contain self-referential pointers."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:50
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "The C++ target containing `ResourceBundle::MaybeMangleLocalizedString` will "
 "need to depend on a `rust_static_library` target. The student probably "
 "already did this."
 msgstr ""
 
-#: src/exercises/chromium/bringing-it-together.md:53
+#: src/exercises/chromium/bringing-it-together.md
 msgid ""
 "The `rust_static_library` target will need to depend on `//third_party/rust/"
 "uwuify/v0_2:lib`."
 msgstr ""
 
-#: src/exercises/chromium/solutions.md:3
+#: src/exercises/chromium/solutions.md
 msgid ""
 "Solutions to the Chromium exercises can be found in [this series of CLs]"
 "(https://chromium-review.googlesource.com/c/chromium/src/+/5096560)."
 msgstr ""
 
-#: src/bare-metal.md:1
+#: src/bare-metal.md
 #, fuzzy
 msgid "Welcome to Bare Metal Rust"
 msgstr "Bienvenue dans Bare Metal Rust"
 
-#: src/bare-metal.md:3
+#: src/bare-metal.md
 msgid ""
 "This is a standalone one-day course about bare-metal Rust, aimed at people "
 "who are familiar with the basics of Rust (perhaps from completing the "
@@ -15173,7 +15866,7 @@ msgstr ""
 "idéalement aussi avoir quelques expérience de la programmation bare-metal "
 "dans un autre langage tel que C."
 
-#: src/bare-metal.md:7
+#: src/bare-metal.md
 #, fuzzy
 msgid ""
 "Today we will talk about 'bare-metal' Rust: running Rust code without an OS "
@@ -15183,28 +15876,28 @@ msgstr ""
 "Rust sans système d'exploitation sous nous. Cette volonté être divisé en "
 "plusieurs parties :"
 
-#: src/bare-metal.md:10
+#: src/bare-metal.md
 #, fuzzy
 msgid "What is `no_std` Rust?"
 msgstr "Qu'est-ce que `no_std` Rust ?"
 
-#: src/bare-metal.md:11
+#: src/bare-metal.md
 #, fuzzy
 msgid "Writing firmware for microcontrollers."
 msgstr "Ecriture de firmware pour microcontrôleurs."
 
-#: src/bare-metal.md:12
+#: src/bare-metal.md
 #, fuzzy
 msgid "Writing bootloader / kernel code for application processors."
 msgstr ""
 "Ecriture du bootloader / code noyau pour les processeurs d'application."
 
-#: src/bare-metal.md:13
+#: src/bare-metal.md
 #, fuzzy
 msgid "Some useful crates for bare-metal Rust development."
 msgstr "Quelques caisses utiles pour le développement de Rust en métal nu."
 
-#: src/bare-metal.md:15
+#: src/bare-metal.md
 #, fuzzy
 msgid ""
 "For the microcontroller part of the course we will use the [BBC micro:bit]"
@@ -15219,7 +15912,7 @@ msgstr ""
 "nRF51822 avec quelques LED et boutons, un accéléromètre et une boussole "
 "connectés I2C, et un débogueur SWD intégré."
 
-#: src/bare-metal.md:20
+#: src/bare-metal.md
 #, fuzzy
 msgid ""
 "To get started, install some tools we'll need later. On gLinux or Debian:"
@@ -15227,7 +15920,7 @@ msgstr ""
 "Pour commencer, installez quelques outils dont nous aurons besoin plus tard. "
 "Sous gLinux ou Debian :"
 
-#: src/bare-metal.md:30
+#: src/bare-metal.md
 #, fuzzy
 msgid ""
 "And give users in the `plugdev` group access to the micro:bit programmer:"
@@ -15235,167 +15928,167 @@ msgstr ""
 "Et donnez aux utilisateurs du groupe `plugdev` l'accès au programmeur micro:"
 "bit :"
 
-#: src/bare-metal.md:38 src/bare-metal/microcontrollers/debugging.md:27
+#: src/bare-metal.md src/bare-metal/microcontrollers/debugging.md
 #, fuzzy
 msgid "On MacOS:"
 msgstr "Sur MacOS :"
 
-#: src/bare-metal/no_std.md:7
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`core`"
 msgstr "`noyau`"
 
-#: src/bare-metal/no_std.md:17
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`std`"
 msgstr "`std`"
 
-#: src/bare-metal/no_std.md:24
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "Slices, `&str`, `CStr`"
 msgstr "Tranches, `&str`, `CStr`"
 
-#: src/bare-metal/no_std.md:25
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`NonZeroU8`..."
 msgstr "`NonZeroU8`..."
 
-#: src/bare-metal/no_std.md:26
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Option`, `Result`"
 msgstr "`Option`, `Résultat`"
 
-#: src/bare-metal/no_std.md:27
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Display`, `Debug`, `write!`..."
 msgstr "`Afficher`, `Déboguer`, `écrire !`..."
 
-#: src/bare-metal/no_std.md:29
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`panic!`, `assert_eq!`..."
 msgstr "`panique !`, `assert_eq !`..."
 
-#: src/bare-metal/no_std.md:30
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`NonNull` and all the usual pointer-related functions"
 msgstr "`NonNull` et toutes les fonctions habituelles liées au pointeur"
 
-#: src/bare-metal/no_std.md:31
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Future` and `async`/`await`"
 msgstr "`Future` et `async`/`wait`"
 
-#: src/bare-metal/no_std.md:32
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..."
 msgstr "`clôture`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..."
 
-#: src/bare-metal/no_std.md:33
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Duration`"
 msgstr "`Durée`"
 
-#: src/bare-metal/no_std.md:38
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Box`, `Cow`, `Arc`, `Rc`"
 msgstr "`Boîte`, `Vache`, `Arc`, `Rc`"
 
-#: src/bare-metal/no_std.md:39
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`"
 msgstr "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`"
 
-#: src/bare-metal/no_std.md:40
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`String`, `CString`, `format!`"
 msgstr "`Chaîne`, `CString`, `format !`"
 
-#: src/bare-metal/no_std.md:45
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Error`"
 msgstr "\"Erreur\""
 
-#: src/bare-metal/no_std.md:47
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`"
 msgstr "`Mutex`, `Condvar`, `Barrière`, `Une fois`, `RwLock`, `mpsc`"
 
-#: src/bare-metal/no_std.md:48
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`File` and the rest of `fs`"
 msgstr "`File` et le reste de `fs`"
 
-#: src/bare-metal/no_std.md:49
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`println!`, `Read`, `Write`, `Stdin`, `Stdout` and the rest of `io`"
 msgstr "`println!`, `Read`, `Write`, `Stdin`, `Stdout` et le reste de `io`"
 
-#: src/bare-metal/no_std.md:50
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Path`, `OsString`"
 msgstr "`Chemin`, `OsString`"
 
-#: src/bare-metal/no_std.md:51
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`net`"
 msgstr "\"net\""
 
-#: src/bare-metal/no_std.md:52
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`Command`, `Child`, `ExitCode`"
 msgstr "`Commande`, `Enfant`, `Code de sortie`"
 
-#: src/bare-metal/no_std.md:53
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`spawn`, `sleep` and the rest of `thread`"
 msgstr "`spawn`, `sleep` et le reste de `thread`"
 
-#: src/bare-metal/no_std.md:54
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`SystemTime`, `Instant`"
 msgstr "`SystemTime`, `Instantané`"
 
-#: src/bare-metal/no_std.md:62
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`HashMap` depends on RNG."
 msgstr "`HashMap` dépend de RNG."
 
-#: src/bare-metal/no_std.md:63
+#: src/bare-metal/no_std.md
 #, fuzzy
 msgid "`std` re-exports the contents of both `core` and `alloc`."
 msgstr "`std` réexporte le contenu de `core` et `alloc`."
 
-#: src/bare-metal/minimal.md:1
+#: src/bare-metal/minimal.md
 #, fuzzy
 msgid "A minimal `no_std` program"
 msgstr "Un programme minimal `no_std`"
 
-#: src/bare-metal/minimal.md:17
+#: src/bare-metal/minimal.md
 msgid "This will compile to an empty binary."
 msgstr ""
 
-#: src/bare-metal/minimal.md:18
+#: src/bare-metal/minimal.md
 msgid "`std` provides a panic handler; without it we must provide our own."
 msgstr ""
 
-#: src/bare-metal/minimal.md:19
+#: src/bare-metal/minimal.md
 msgid "It can also be provided by another crate, such as `panic-halt`."
 msgstr ""
 
-#: src/bare-metal/minimal.md:20
+#: src/bare-metal/minimal.md
 msgid ""
 "Depending on the target, you may need to compile with `panic = \"abort\"` to "
 "avoid an error about `eh_personality`."
 msgstr ""
 
-#: src/bare-metal/minimal.md:22
+#: src/bare-metal/minimal.md
 msgid ""
 "Note that there is no `main` or any other entry point; it's up to you to "
 "define your own entry point. This will typically involve a linker script and "
 "some assembly code to set things up ready for Rust code to run."
 msgstr ""
 
-#: src/bare-metal/alloc.md:3
+#: src/bare-metal/alloc.md
 #, fuzzy
 msgid ""
 "To use `alloc` you must implement a [global (heap) allocator](https://doc."
@@ -15404,55 +16097,55 @@ msgstr ""
 "Pour utiliser `alloc` vous devez implémenter un [allocateur global (de tas)]"
 "(https://doc.rust-lang.org/stable/std/alloc/trait.GlobalAlloc.html)."
 
-#: src/bare-metal/alloc.md:23
+#: src/bare-metal/alloc.md
 msgid ""
 "// Safe because `HEAP` is only used here and `entry` is only called once.\n"
 msgstr ""
 
-#: src/bare-metal/alloc.md:25
+#: src/bare-metal/alloc.md
 msgid "// Give the allocator some memory to allocate.\n"
 msgstr ""
 
-#: src/bare-metal/alloc.md:31
+#: src/bare-metal/alloc.md
 msgid "// Now we can do things that require heap allocation.\n"
 msgstr ""
 
-#: src/bare-metal/alloc.md:33
+#: src/bare-metal/alloc.md
 #, fuzzy
 msgid "\"A string\""
 msgstr "String"
 
-#: src/bare-metal/alloc.md:39
+#: src/bare-metal/alloc.md
 msgid ""
 "`buddy_system_allocator` is a third-party crate implementing a basic buddy "
 "system allocator. Other crates are available, or you can write your own or "
 "hook into your existing allocator."
 msgstr ""
 
-#: src/bare-metal/alloc.md:41
+#: src/bare-metal/alloc.md
 msgid ""
 "The const parameter of `LockedHeap` is the max order of the allocator; i.e. "
 "in this case it can allocate regions of up to 2\\*\\*32 bytes."
 msgstr ""
 
-#: src/bare-metal/alloc.md:43
+#: src/bare-metal/alloc.md
 msgid ""
 "If any crate in your dependency tree depends on `alloc` then you must have "
 "exactly one global allocator defined in your binary. Usually this is done in "
 "the top-level binary crate."
 msgstr ""
 
-#: src/bare-metal/alloc.md:45
+#: src/bare-metal/alloc.md
 msgid ""
 "`extern crate panic_halt as _` is necessary to ensure that the `panic_halt` "
 "crate is linked in so we get its panic handler."
 msgstr ""
 
-#: src/bare-metal/alloc.md:47
+#: src/bare-metal/alloc.md
 msgid "This example will build but not run, as it doesn't have an entry point."
 msgstr ""
 
-#: src/bare-metal/microcontrollers.md:3
+#: src/bare-metal/microcontrollers.md
 #, fuzzy
 msgid ""
 "The `cortex_m_rt` crate provides (among other things) a reset handler for "
@@ -15461,7 +16154,7 @@ msgstr ""
 "La caisse `cortex_m_rt` fournit (entre autres) un gestionnaire de "
 "réinitialisation pour les microcontrôleurs Cortex M."
 
-#: src/bare-metal/microcontrollers.md:21
+#: src/bare-metal/microcontrollers.md
 #, fuzzy
 msgid ""
 "Next we'll look at how to access peripherals, with increasing levels of "
@@ -15470,7 +16163,7 @@ msgstr ""
 "Ensuite, nous verrons comment accéder aux périphériques, avec des niveaux "
 "d'abstraction croissants."
 
-#: src/bare-metal/microcontrollers.md:25
+#: src/bare-metal/microcontrollers.md
 #, fuzzy
 msgid ""
 "The `cortex_m_rt::entry` macro requires that the function have type `fn() -"
@@ -15479,12 +16172,12 @@ msgstr ""
 "La macro `cortex_m_rt::entry` nécessite que la fonction ait le type `fn() -"
 "> !`, car le retour au gestionnaire de réinitialisation n'a pas de sens."
 
-#: src/bare-metal/microcontrollers.md:27
+#: src/bare-metal/microcontrollers.md
 #, fuzzy
 msgid "Run the example with `cargo embed --bin minimal`"
 msgstr "Exécutez l'exemple avec `cargo embed --bin minimal`"
 
-#: src/bare-metal/microcontrollers/mmio.md:3
+#: src/bare-metal/microcontrollers/mmio.md
 #, fuzzy
 msgid ""
 "Most microcontrollers access peripherals via memory-mapped IO. Let's try "
@@ -15493,38 +16186,37 @@ msgstr ""
 "La plupart des microcontrôleurs accèdent aux périphériques via des E/S "
 "mappées en mémoire. Essayons d'allumer une LED sur notre micro:bit:"
 
-#: src/bare-metal/microcontrollers/mmio.md:16
+#: src/bare-metal/microcontrollers/mmio.md
 msgid "/// GPIO port 0 peripheral address\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/mmio.md:19
+#: src/bare-metal/microcontrollers/mmio.md
 msgid "// GPIO peripheral offsets\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/mmio.md:24
+#: src/bare-metal/microcontrollers/mmio.md
 msgid "// PIN_CNF fields\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/mmio.md:34
-#: src/bare-metal/microcontrollers/pacs.md:21
-#: src/bare-metal/microcontrollers/hals.md:25
+#: src/bare-metal/microcontrollers/mmio.md
+#: src/bare-metal/microcontrollers/pacs.md
+#: src/bare-metal/microcontrollers/hals.md
 msgid "// Configure GPIO 0 pins 21 and 28 as push-pull outputs.\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/mmio.md:37
-#: src/bare-metal/microcontrollers/mmio.md:51
+#: src/bare-metal/microcontrollers/mmio.md
 msgid ""
 "// Safe because the pointers are to valid peripheral control registers, and\n"
 "    // no aliases exist.\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/mmio.md:48
-#: src/bare-metal/microcontrollers/pacs.md:39
-#: src/bare-metal/microcontrollers/hals.md:29
+#: src/bare-metal/microcontrollers/mmio.md
+#: src/bare-metal/microcontrollers/pacs.md
+#: src/bare-metal/microcontrollers/hals.md
 msgid "// Set pin 28 low and pin 21 high to turn the LED on.\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/mmio.md:64
+#: src/bare-metal/microcontrollers/mmio.md
 #, fuzzy
 msgid ""
 "GPIO 0 pin 21 is connected to the first column of the LED matrix, and pin 28 "
@@ -15533,20 +16225,20 @@ msgstr ""
 "La broche 21 du GPIO 0 est connectée à la première colonne de la matrice LED "
 "et la broche 28 à la première rangée."
 
-#: src/bare-metal/microcontrollers/mmio.md:66
-#: src/bare-metal/microcontrollers/pacs.md:59
-#: src/bare-metal/microcontrollers/hals.md:43
-#: src/bare-metal/microcontrollers/board-support.md:34
+#: src/bare-metal/microcontrollers/mmio.md
+#: src/bare-metal/microcontrollers/pacs.md
+#: src/bare-metal/microcontrollers/hals.md
+#: src/bare-metal/microcontrollers/board-support.md
 #, fuzzy
 msgid "Run the example with:"
 msgstr "Exécutez l'exemple avec :"
 
-#: src/bare-metal/microcontrollers/pacs.md:1
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid "Peripheral Access Crates"
 msgstr "Caisses d'accès périphérique"
 
-#: src/bare-metal/microcontrollers/pacs.md:3
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid ""
 "[`svd2rust`](https://crates.io/crates/svd2rust) generates mostly-safe Rust "
@@ -15557,7 +16249,7 @@ msgstr ""
 "principalement sûrs pour périphériques mappés en mémoire de [CMSIS-SVD]"
 "(https://www.keil.com/pack/doc/CMSIS/SVD/html/index.html) des dossiers."
 
-#: src/bare-metal/microcontrollers/pacs.md:49
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid ""
 "SVD (System View Description) files are XML files typically provided by "
@@ -15567,7 +16259,7 @@ msgstr ""
 "généralement fournis par les fournisseurs de silicium qui décrire la carte "
 "mémoire de l'appareil."
 
-#: src/bare-metal/microcontrollers/pacs.md:51
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid ""
 "They are organised by peripheral, register, field and value, with names, "
@@ -15576,7 +16268,7 @@ msgstr ""
 "Ils sont organisés par périphérique, registre, champ et valeur, avec noms, "
 "descriptions, adresses et ainsi de suite."
 
-#: src/bare-metal/microcontrollers/pacs.md:53
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid ""
 "SVD files are often buggy and incomplete, so there are various projects "
@@ -15587,12 +16279,12 @@ msgstr ""
 "projets qui corrigent le erreurs, ajoutez les détails manquants et publiez "
 "les caisses générées."
 
-#: src/bare-metal/microcontrollers/pacs.md:55
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid "`cortex-m-rt` provides the vector table, among other things."
 msgstr "`cortex-m-rt` fournit la table des vecteurs, entre autres choses."
 
-#: src/bare-metal/microcontrollers/pacs.md:56
+#: src/bare-metal/microcontrollers/pacs.md
 #, fuzzy
 msgid ""
 "If you `cargo install cargo-binutils` then you can run `cargo objdump --bin "
@@ -15601,12 +16293,12 @@ msgstr ""
 "Si vous \"installez cargo cargo-binutils\", vous pouvez exécuter `cargo "
 "objdump --bin pac -- -d --no-show-raw-insn` pour voir le binaire résultant."
 
-#: src/bare-metal/microcontrollers/hals.md:1
+#: src/bare-metal/microcontrollers/hals.md
 #, fuzzy
 msgid "HAL crates"
 msgstr "caisses HAL"
 
-#: src/bare-metal/microcontrollers/hals.md:3
+#: src/bare-metal/microcontrollers/hals.md
 #, fuzzy
 msgid ""
 "[HAL crates](https://github.com/rust-embedded/awesome-embedded-rust#hal-"
@@ -15619,11 +16311,11 @@ msgstr ""
 "wrappers autour de divers périphériques. Ceux-ci implémentent généralement "
 "des traits de [`embedded-hal`](https://crates.io/crates/embedded-hal)."
 
-#: src/bare-metal/microcontrollers/hals.md:22
+#: src/bare-metal/microcontrollers/hals.md
 msgid "// Create HAL wrapper for GPIO port 0.\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/hals.md:39
+#: src/bare-metal/microcontrollers/hals.md
 #, fuzzy
 msgid ""
 "`set_low` and `set_high` are methods on the `embedded_hal` `OutputPin` trait."
@@ -15631,7 +16323,7 @@ msgstr ""
 "`set_low` et `set_high` sont des méthodes sur le trait `embedded_hal` "
 "`OutputPin`."
 
-#: src/bare-metal/microcontrollers/hals.md:40
+#: src/bare-metal/microcontrollers/hals.md
 #, fuzzy
 msgid ""
 "HAL crates exist for many Cortex-M and RISC-V devices, including various "
@@ -15640,12 +16332,12 @@ msgstr ""
 "Les caisses HAL existent pour de nombreux appareils Cortex-M et RISC-V, y "
 "compris divers STM32, GD32, nRF, NXP, Microcontrôleurs MSP430, AVR et PIC."
 
-#: src/bare-metal/microcontrollers/board-support.md:1
+#: src/bare-metal/microcontrollers/board-support.md
 #, fuzzy
 msgid "Board support crates"
 msgstr "Caisses support planche"
 
-#: src/bare-metal/microcontrollers/board-support.md:3
+#: src/bare-metal/microcontrollers/board-support.md
 #, fuzzy
 msgid ""
 "Board support crates provide a further level of wrapping for a specific "
@@ -15654,7 +16346,7 @@ msgstr ""
 "Les caisses de support de planche offrent un niveau supplémentaire "
 "d'emballage pour une planche spécifique pour plus de commodité."
 
-#: src/bare-metal/microcontrollers/board-support.md:28
+#: src/bare-metal/microcontrollers/board-support.md
 #, fuzzy
 msgid ""
 "In this case the board support crate is just providing more useful names, "
@@ -15663,7 +16355,7 @@ msgstr ""
 "Dans ce cas, la caisse de support de carte fournit simplement des noms plus "
 "utiles, et un peu de initialisation."
 
-#: src/bare-metal/microcontrollers/board-support.md:30
+#: src/bare-metal/microcontrollers/board-support.md
 #, fuzzy
 msgid ""
 "The crate may also include drivers for some on-board devices outside of the "
@@ -15672,25 +16364,25 @@ msgstr ""
 "La caisse peut également inclure des pilotes pour certains périphériques "
 "embarqués en dehors du microcontrôleur lui-même."
 
-#: src/bare-metal/microcontrollers/board-support.md:32
+#: src/bare-metal/microcontrollers/board-support.md
 #, fuzzy
 msgid "`microbit-v2` includes a simple driver for the LED matrix."
 msgstr "`microbit-v2` inclut un pilote simple pour la matrice LED."
 
-#: src/bare-metal/microcontrollers/type-state.md:1
+#: src/bare-metal/microcontrollers/type-state.md
 #, fuzzy
 msgid "The type state pattern"
 msgstr "Le modèle d'état de type"
 
-#: src/bare-metal/microcontrollers/type-state.md:11
+#: src/bare-metal/microcontrollers/type-state.md
 msgid "// let gpio0_01_again = gpio0.p0_01; // Error, moved.\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/type-state.md:19
+#: src/bare-metal/microcontrollers/type-state.md
 msgid "// pin_input.is_high(); // Error, moved.\n"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/type-state.md:32
+#: src/bare-metal/microcontrollers/type-state.md
 #, fuzzy
 msgid ""
 "Pins don't implement `Copy` or `Clone`, so only one instance of each can "
@@ -15700,7 +16392,7 @@ msgstr ""
 "chacun peut exister. Une fois qu'une broche est déplacé hors de la structure "
 "du port, personne d'autre ne peut le prendre."
 
-#: src/bare-metal/microcontrollers/type-state.md:34
+#: src/bare-metal/microcontrollers/type-state.md
 #, fuzzy
 msgid ""
 "Changing the configuration of a pin consumes the old pin instance, so you "
@@ -15710,7 +16402,7 @@ msgstr ""
 "instance de broche, vous ne pouvez donc pas continuer à utiliser l'ancienne "
 "exemple par la suite."
 
-#: src/bare-metal/microcontrollers/type-state.md:36
+#: src/bare-metal/microcontrollers/type-state.md
 #, fuzzy
 msgid ""
 "The type of a value indicates the state that it is in: e.g. in this case, "
@@ -15726,7 +16418,7 @@ msgstr ""
 "au préalable. État illégal les transitions sont interceptées au moment de la "
 "compilation."
 
-#: src/bare-metal/microcontrollers/type-state.md:40
+#: src/bare-metal/microcontrollers/type-state.md
 #, fuzzy
 msgid ""
 "You can call `is_high` on an input pin and `set_high` on an output pin, but "
@@ -15735,12 +16427,12 @@ msgstr ""
 "Vous pouvez appeler `is_high` sur une broche d'entrée et `set_high` sur une "
 "broche de sortie, mais pas l'inverse."
 
-#: src/bare-metal/microcontrollers/type-state.md:41
+#: src/bare-metal/microcontrollers/type-state.md
 #, fuzzy
 msgid "Many HAL crates follow this pattern."
 msgstr "De nombreuses caisses HAL suivent ce modèle."
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:3
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid ""
 "The [`embedded-hal`](https://crates.io/crates/embedded-hal) crate provides a "
@@ -15750,37 +16442,37 @@ msgstr ""
 "certain nombre de caractéristiques couvrant les périphériques de "
 "microcontrôleur courants."
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:6
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "GPIO"
 msgstr "GPIO"
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:7
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "ADC"
 msgstr "ADC"
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:8
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "I2C, SPI, UART, CAN"
 msgstr "I2C, SPI, UART, PEUT"
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:9
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "RNG"
 msgstr "GNA"
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:10
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "Timers"
 msgstr "Minuteries"
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:11
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid "Watchdogs"
 msgstr "Chiens de garde"
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:13
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid ""
 "Other crates then implement [drivers](https://github.com/rust-embedded/"
@@ -15792,7 +16484,7 @@ msgstr ""
 "par ex. un pilote d'accéléromètre peut nécessiter une implémentation de bus "
 "I2C ou SPI."
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:19
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid ""
 "There are implementations for many microcontrollers, as well as other "
@@ -15801,7 +16493,7 @@ msgstr ""
 "Il existe des implémentations pour de nombreux microcontrôleurs, ainsi que "
 "pour d'autres plates-formes telles que Linux sur Tarte aux framboises."
 
-#: src/bare-metal/microcontrollers/embedded-hal.md:21
+#: src/bare-metal/microcontrollers/embedded-hal.md
 #, fuzzy
 msgid ""
 "There is work in progress on an `async` version of `embedded-hal`, but it "
@@ -15810,7 +16502,7 @@ msgstr ""
 "Il y a des travaux en cours sur une version `async` de `embedded-hal`, mais "
 "ce n'est pas encore stable."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:3
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "[probe-rs](https://probe.rs/) is a handy toolset for embedded debugging, "
@@ -15819,21 +16511,21 @@ msgstr ""
 "[probe-rs](https://probe.rs/) est un ensemble d'outils pratique pour le "
 "débogage intégré, comme OpenOCD mais en mieux intégré."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:6
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "SWD (Serial Wire Debug) and JTAG via CMSIS-DAP, ST-Link and J-Link probes"
 msgstr " et JTAG via les sondes CMSIS-DAP, ST-Link et J-Link"
 
-#: src/bare-metal/microcontrollers/probe-rs.md:7
+#: src/bare-metal/microcontrollers/probe-rs.md
 msgid "GDB stub and Microsoft DAP (Debug Adapter Protocol) server"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/probe-rs.md:8
+#: src/bare-metal/microcontrollers/probe-rs.md
 msgid "Cargo integration"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/probe-rs.md:10
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "`cargo-embed` is a cargo subcommand to build and flash binaries, log RTT "
@@ -15843,7 +16535,7 @@ msgstr ""
 " et connectez GDB. Il est configuré par un Fichier `Embed.toml` dans votre "
 "répertoire de projet."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:16
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "[CMSIS-DAP](https://arm-software.github.io/CMSIS_5/DAP/html/index.html) is "
@@ -15856,7 +16548,7 @@ msgstr ""
 "port d'accès de débogage CoreSight de divers Processeurs Arm Cortex. C'est "
 "ce que le débogueur embarqué sur le BBC micro:bit utilise."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:19
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "ST-Link is a range of in-circuit debuggers from ST Microelectronics, J-Link "
@@ -15865,7 +16557,7 @@ msgstr ""
 "ST-Link est une gamme de débogueurs en circuit de ST Microelectronics, J-"
 "Link est une gamme de SEGER."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:21
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "The Debug Access Port is usually either a 5-pin JTAG interface or 2-pin "
@@ -15874,7 +16566,7 @@ msgstr ""
 "Le port d'accès au débogage est généralement une interface JTAG à 5 broches "
 "ou un débogage de fil série à 2 broches."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:22
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "probe-rs is a library which you can integrate into your own tools if you "
@@ -15883,7 +16575,7 @@ msgstr ""
 "probe-rs est une bibliothèque que vous pouvez intégrer dans vos propres "
 "outils si vous le souhaitez."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:23
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "The [Microsoft Debug Adapter Protocol](https://microsoft.github.io/debug-"
@@ -15894,13 +16586,13 @@ msgstr ""
 "github.io/debug-adapter-protocol/) permet VSCode et d'autres IDE déboguent "
 "le code s'exécutant sur n'importe quel microcontrôleur pris en charge."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:25
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid "cargo-embed is a binary built using the probe-rs library."
 msgstr ""
 "cargo-embed est un binaire construit à l'aide de la bibliothèque probe-rs."
 
-#: src/bare-metal/microcontrollers/probe-rs.md:26
+#: src/bare-metal/microcontrollers/probe-rs.md
 #, fuzzy
 msgid ""
 "RTT (Real Time Transfers) is a mechanism to transfer data between the debug "
@@ -15910,47 +16602,47 @@ msgstr ""
 "l'hôte de débogage et la cible à travers un certain nombre de tampons "
 "circulaires."
 
-#: src/bare-metal/microcontrollers/debugging.md:3
+#: src/bare-metal/microcontrollers/debugging.md
 #, fuzzy
 msgid "_Embed.toml_:"
 msgstr "Intégrer.toml :"
 
-#: src/bare-metal/microcontrollers/debugging.md:13
+#: src/bare-metal/microcontrollers/debugging.md
 #, fuzzy
 msgid "In one terminal under `src/bare-metal/microcontrollers/examples/`:"
 msgstr "Dans un terminal sous `src/bare-metal/microcontrollers/examples/` :"
 
-#: src/bare-metal/microcontrollers/debugging.md:19
+#: src/bare-metal/microcontrollers/debugging.md
 #, fuzzy
 msgid "In another terminal in the same directory:"
 msgstr "Dans un autre terminal du même répertoire :"
 
-#: src/bare-metal/microcontrollers/debugging.md:21
+#: src/bare-metal/microcontrollers/debugging.md
 msgid "On gLinux or Debian:"
 msgstr ""
 
-#: src/bare-metal/microcontrollers/debugging.md:34
+#: src/bare-metal/microcontrollers/debugging.md
 #, fuzzy
 msgid "In GDB, try running:"
 msgstr "Dans GDB, essayez d'exécuter :"
 
-#: src/bare-metal/microcontrollers/other-projects.md:1
-#: src/bare-metal/aps/other-projects.md:1
+#: src/bare-metal/microcontrollers/other-projects.md
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "Other projects"
 msgstr "Autres projets"
 
-#: src/bare-metal/microcontrollers/other-projects.md:3
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "[RTIC](https://rtic.rs/)"
 msgstr "\\* [RTIC](https://rtic.rs/)"
 
-#: src/bare-metal/microcontrollers/other-projects.md:4
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "\"Real-Time Interrupt-driven Concurrency\""
 msgstr "\"Concurrence pilotée par interruption en temps réel\""
 
-#: src/bare-metal/microcontrollers/other-projects.md:5
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "Shared resource management, message passing, task scheduling, timer queue"
@@ -15958,23 +16650,23 @@ msgstr ""
 "Gestion des ressources partagées, transmission de messages, planification "
 "des tâches, file d'attente du minuteur"
 
-#: src/bare-metal/microcontrollers/other-projects.md:6
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "[Embassy](https://embassy.dev/)"
 msgstr "[Ambassade](https://embassy.dev/)"
 
-#: src/bare-metal/microcontrollers/other-projects.md:7
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "`async` executors with priorities, timers, networking, USB"
 msgstr ""
 "Exécuteurs \"asynchrones\" avec priorités, minuteries, mise en réseau, USB"
 
-#: src/bare-metal/microcontrollers/other-projects.md:8
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "[TockOS](https://www.tockos.org/documentation/getting-started)"
 msgstr "[TockOS](https://www.tockos.org/documentation/getting-started)"
 
-#: src/bare-metal/microcontrollers/other-projects.md:9
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "Security-focused RTOS with preemptive scheduling and Memory Protection Unit "
@@ -15983,12 +16675,12 @@ msgstr ""
 "RTOS axé sur la sécurité avec planification préemptive et prise en charge de "
 "l'unité de protection de la mémoire"
 
-#: src/bare-metal/microcontrollers/other-projects.md:10
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "[Hubris](https://hubris.oxide.computer/)"
 msgstr "[Hubris](https://hubris.oxide.computer/)"
 
-#: src/bare-metal/microcontrollers/other-projects.md:11
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "Microkernel RTOS from Oxide Computer Company with memory protection, "
@@ -15997,12 +16689,12 @@ msgstr ""
 "Microkernel RTOS d'Oxide Computer Company avec protection de la mémoire, "
 "pilotes non privilégiés, IPC"
 
-#: src/bare-metal/microcontrollers/other-projects.md:12
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "[Bindings for FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)"
 msgstr "[Liaisons pour FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)"
 
-#: src/bare-metal/microcontrollers/other-projects.md:13
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "Some platforms have `std` implementations, e.g. [esp-idf](https://esp-rs."
@@ -16011,17 +16703,17 @@ msgstr ""
 "Certaines plates-formes ont des implémentations \"std\", par ex. [esp-idf]"
 "(https://esp-rs.github.io/book/overview/using-the-standard-library.html)."
 
-#: src/bare-metal/microcontrollers/other-projects.md:18
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "RTIC can be considered either an RTOS or a concurrency framework."
 msgstr "RTIC peut être considéré comme un RTOS ou un cadre de concurrence."
 
-#: src/bare-metal/microcontrollers/other-projects.md:19
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "It doesn't include any HALs."
 msgstr "Il n'inclut aucun HAL."
 
-#: src/bare-metal/microcontrollers/other-projects.md:20
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "It uses the Cortex-M NVIC (Nested Virtual Interrupt Controller) for "
@@ -16030,12 +16722,12 @@ msgstr ""
 "Il utilise le Cortex-M NVIC (Nested Virtual Interrupt Controller) pour la "
 "planification plutôt qu'un noyau approprié."
 
-#: src/bare-metal/microcontrollers/other-projects.md:22
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid "Cortex-M only."
 msgstr "Cortex-M uniquement."
 
-#: src/bare-metal/microcontrollers/other-projects.md:23
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "Google uses TockOS on the Haven microcontroller for Titan security keys."
@@ -16043,7 +16735,7 @@ msgstr ""
 "Google utilise TockOS sur le microcontrôleur Haven pour les clés de sécurité "
 "Titan."
 
-#: src/bare-metal/microcontrollers/other-projects.md:24
+#: src/bare-metal/microcontrollers/other-projects.md
 #, fuzzy
 msgid ""
 "FreeRTOS is mostly written in C, but there are Rust bindings for writing "
@@ -16052,7 +16744,7 @@ msgstr ""
 "FreeRTOS est principalement écrit en C, mais il existe des liaisons Rust "
 "pour écrire des applications."
 
-#: src/exercises/bare-metal/morning.md:3
+#: src/exercises/bare-metal/morning.md
 #, fuzzy
 msgid ""
 "We will read the direction from an I2C compass, and log the readings to a "
@@ -16061,8 +16753,7 @@ msgstr ""
 "Nous lirons la direction à partir d'une boussole I2C et enregistrerons les "
 "lectures sur un port série."
 
-#: src/exercises/bare-metal/morning.md:7
-#: src/exercises/concurrency/morning.md:12
+#: src/exercises/bare-metal/morning.md src/exercises/concurrency/morning.md
 #, fuzzy
 msgid ""
 "After looking at the exercises, you can look at the [solutions](solutions-"
@@ -16071,7 +16762,7 @@ msgstr ""
 "Après avoir regardé l'exercice, vous pouvez regarder la [solution](solutions-"
 "afternoon.md) fournie."
 
-#: src/exercises/bare-metal/compass.md:3
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "We will read the direction from an I2C compass, and log the readings to a "
@@ -16083,12 +16774,12 @@ msgstr ""
 "LED d'une manière ou d'une autre, ou utilisez les boutons d'une manière ou "
 "d'une autre."
 
-#: src/exercises/bare-metal/compass.md:6
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid "Hints:"
 msgstr "Astuces:"
 
-#: src/exercises/bare-metal/compass.md:8
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "Check the documentation for the [`lsm303agr`](https://docs.rs/lsm303agr/"
@@ -16101,14 +16792,14 @@ msgstr ""
 "caisses, ainsi que les [matériel micro:bit](https://tech.microbit.org/"
 "hardware/)."
 
-#: src/exercises/bare-metal/compass.md:11
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "The LSM303AGR Inertial Measurement Unit is connected to the internal I2C bus."
 msgstr ""
 "La centrale de mesure inertielle LSM303AGR est connectée au bus interne I2C."
 
-#: src/exercises/bare-metal/compass.md:12
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "TWI is another name for I2C, so the I2C master peripheral is called TWIM."
@@ -16116,7 +16807,7 @@ msgstr ""
 "TWI est un autre nom pour I2C, donc le périphérique maître I2C s'appelle "
 "TWIM."
 
-#: src/exercises/bare-metal/compass.md:13
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "The LSM303AGR driver needs something implementing the `embedded_hal::"
@@ -16127,7 +16818,7 @@ msgstr ""
 "blocking::i2c::WriteRead` trait. Le [`microbit::hal::Twim`](https://docs.rs/"
 "microbit-v2/latest/microbit/hal/struct.Twim.html) structure implémente cela."
 
-#: src/exercises/bare-metal/compass.md:17
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "You have a [`microbit::Board`](https://docs.rs/microbit-v2/latest/microbit/"
@@ -16137,7 +16828,7 @@ msgstr ""
 "struct.Board.html) structure avec des champs pour les différentes broches et "
 "périphériques."
 
-#: src/exercises/bare-metal/compass.md:19
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "You can also look at the [nRF52833 datasheet](https://infocenter.nordicsemi."
@@ -16148,7 +16839,7 @@ msgstr ""
 "infocenter.nordicsemi.com/pdf/nRF52833_PS_v1.5.pdf) si vous le souhaitez, "
 "mais cela ne devrait pas être nécessaire pour cet exercice."
 
-#: src/exercises/bare-metal/compass.md:23
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "Download the [exercise template](../../comprehensive-rust-exercises.zip) and "
@@ -16157,55 +16848,60 @@ msgstr ""
 "Téléchargez le \\[modèle d'exercice\\] (../../comprehensive-rust-exercises."
 "zip) et regardez dans la `boussole` répertoire pour les fichiers suivants."
 
-#: src/exercises/bare-metal/compass.md:26 src/exercises/bare-metal/rtc.md:19
+#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_src/main.rs_:"
 msgstr "`src/main.rs` :"
 
-#: src/exercises/bare-metal/compass.md:44
-#: src/exercises/bare-metal/solutions-morning.md:32
+#: src/exercises/bare-metal/compass.md
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "// Configure serial port.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/compass.md:52
+#: src/exercises/bare-metal/compass.md
+#: src/exercises/bare-metal/solutions-morning.md
+msgid "// Use the system timer as a delay provider.\n"
+msgstr ""
+
+#: src/exercises/bare-metal/compass.md
 msgid ""
 "// Set up the I2C controller and Inertial Measurement Unit.\n"
 "    // TODO\n"
 msgstr ""
 
-#: src/exercises/bare-metal/compass.md:55
-#: src/exercises/bare-metal/solutions-morning.md:56
+#: src/exercises/bare-metal/compass.md
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "\"Ready.\""
 msgstr ""
 
-#: src/exercises/bare-metal/compass.md:58
+#: src/exercises/bare-metal/compass.md
 msgid ""
 "// Read compass data and log it to the serial port.\n"
 "        // TODO\n"
 msgstr ""
 
-#: src/exercises/bare-metal/compass.md:64 src/exercises/bare-metal/rtc.md:385
+#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_Cargo.toml_ (you shouldn't need to change this):"
 msgstr "`Cargo.toml` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/compass.md:85
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid "_Embed.toml_ (you shouldn't need to change this):"
 msgstr "`Embed.toml` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/compass.md:100 src/exercises/bare-metal/rtc.md:985
+#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_.cargo/config.toml_ (you shouldn't need to change this):"
 msgstr ""
 "`.cargo/config.toml` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/compass.md:112
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid "See the serial output on Linux with:"
 msgstr "Voir la sortie série sur Linux avec :"
 
-#: src/exercises/bare-metal/compass.md:118
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid ""
 "Or on Mac OS something like (the device name may be slightly different):"
@@ -16213,52 +16909,53 @@ msgstr ""
 "Ou sur Mac OS quelque chose comme (le nom de l'appareil peut être légèrement "
 "différent) :"
 
-#: src/exercises/bare-metal/compass.md:124
+#: src/exercises/bare-metal/compass.md
 #, fuzzy
 msgid "Use Ctrl+A Ctrl+Q to quit picocom."
 msgstr "Utilisez Ctrl+A Ctrl+Q pour quitter picocom."
 
-#: src/exercises/bare-metal/solutions-morning.md:1
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "Bare Metal Rust Morning Exercise"
 msgstr "Exercice du matin avec Rust sur bare metal"
 
-#: src/exercises/bare-metal/solutions-morning.md:5
+#: src/exercises/bare-metal/solutions-morning.md
 #, fuzzy
 msgid "([back to exercise](compass.md))"
 msgstr "([retour à l'exercice](compass.md))"
 
-#: src/exercises/bare-metal/solutions-morning.md:40
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "// Set up the I2C controller and Inertial Measurement Unit.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-morning.md:41
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "\"Setting up IMU...\""
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-morning.md:49
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "// Set up display and timer.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-morning.md:59
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "// Read compass data and log it to the serial port.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-morning.md:67
+#: src/exercises/bare-metal/solutions-morning.md
 msgid "\"{},{},{}\\t{},{},{}\""
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-morning.md:103
+#: src/exercises/bare-metal/solutions-morning.md
 msgid ""
 "// If button A is pressed, switch to the next mode and briefly blink all "
-"LEDs on.\n"
+"LEDs\n"
+"        // on.\n"
 msgstr ""
 
-#: src/bare-metal/aps.md:1
+#: src/bare-metal/aps.md
 #, fuzzy
 msgid "Application processors"
 msgstr "Processeurs d'application"
 
-#: src/bare-metal/aps.md:3
+#: src/bare-metal/aps.md
 #, fuzzy
 msgid ""
 "So far we've talked about microcontrollers, such as the Arm Cortex-M series. "
@@ -16271,7 +16968,7 @@ msgstr ""
 "plus de simplicité, nous allons simplement travailler avec aarch64 de QEMU "
 "['virt'](https://qemu-project.gitlab.io/qemu/system/arm/virt.html)."
 
-#: src/bare-metal/aps.md:9
+#: src/bare-metal/aps.md
 #, fuzzy
 msgid ""
 "Broadly speaking, microcontrollers don't have an MMU or multiple levels of "
@@ -16282,7 +16979,7 @@ msgstr ""
 "niveaux de privilège (exception niveaux sur les processeurs Arm, sonne sur "
 "x86), contrairement aux processeurs d'application."
 
-#: src/bare-metal/aps.md:11
+#: src/bare-metal/aps.md
 #, fuzzy
 msgid ""
 "QEMU supports emulating various different machines or board models for each "
@@ -16294,12 +16991,12 @@ msgstr ""
 "matériel réel particulier, mais est conçue uniquement pour machines "
 "virtuelles."
 
-#: src/bare-metal/aps/entry-point.md:3
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "Before we can start running Rust code, we need to do some initialisation."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:5
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "```armasm\n"
 ".section .init.entry, \"ax\"\n"
@@ -16375,13 +17072,13 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:77
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "This is the same as it would be for C: initialising the processor state, "
 "zeroing the BSS, and setting up the stack pointer."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:79
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "The BSS (block starting symbol, for historical reasons) is the part of the "
 "object file which containing statically allocated variables which are "
@@ -16390,19 +17087,19 @@ msgid ""
 "them."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:83
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "The BSS may already be zeroed, depending on how memory is initialised and "
 "the image is loaded, but we zero it to be sure."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:85
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "We need to enable the MMU and cache before reading or writing any memory. If "
 "we don't:"
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:86
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "Unaligned accesses will fault. We build the Rust code for the `aarch64-"
 "unknown-none` target which sets `+strict-align` to prevent the compiler "
@@ -16410,7 +17107,7 @@ msgid ""
 "is not necessarily the case in general."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:89
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "If it were running in a VM, this can lead to cache coherency issues. The "
 "problem is that the VM is accessing memory directly with the cache disabled, "
@@ -16421,7 +17118,7 @@ msgid ""
 "not VA or IPA.)"
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:94
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "For simplicity, we just use a hardcoded pagetable (see `idmap.S`) which "
 "identity maps the first 1 GiB of address space for devices, the next 1 GiB "
@@ -16429,25 +17126,25 @@ msgid ""
 "memory layout that QEMU uses."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:97
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "We also set up the exception vector (`vbar_el1`), which we'll see more about "
 "later."
 msgstr ""
 
-#: src/bare-metal/aps/entry-point.md:98
+#: src/bare-metal/aps/entry-point.md
 msgid ""
 "All examples this afternoon assume we will be running at exception level 1 "
 "(EL1). If you need to run at a different exception level you'll need to "
 "modify `entry.S` accordingly."
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:1
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid "Inline assembly"
 msgstr "Assemblage en ligne"
 
-#: src/bare-metal/aps/inline-assembly.md:3
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "Sometimes we need to use assembly to do things that aren't possible with "
@@ -16457,49 +17154,49 @@ msgstr ""
 "Parfois, nous devons utiliser l'assemblage pour faire des choses qui ne sont "
 "pas possibles avec le code Rust. Par exemple, pour effectuer un "
 
-#: src/bare-metal/aps/inline-assembly.md:19
+#: src/bare-metal/aps/inline-assembly.md
 msgid ""
 "// Safe because this only uses the declared registers and doesn't do\n"
 "    // anything with memory.\n"
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:22
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"hvc #0\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:23
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w0\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:24
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w1\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:25
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w2\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:26
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w3\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:27
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w4\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:28
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w5\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:29
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w6\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:30
+#: src/bare-metal/aps/inline-assembly.md
 msgid "\"w7\""
 msgstr ""
 
-#: src/bare-metal/aps/inline-assembly.md:39
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "(If you actually want to do this, use the [`smccc`](https://crates.io/crates/"
@@ -16508,7 +17205,7 @@ msgstr ""
 "(Si vous voulez vraiment faire cela, utilisez le crate [`psci`](https://"
 "crates.io/crates/smccc) qui contient des wrappers pour toutes ces fonctions.)"
 
-#: src/bare-metal/aps/inline-assembly.md:43
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "PSCI is the Arm Power State Coordination Interface, a standard set of "
@@ -16520,7 +17217,7 @@ msgstr ""
 "d'alimentation du processeur, entre autres. Il est implémenté par le "
 "firmware EL3 et les hyperviseurs sur de nombreux systèmes."
 
-#: src/bare-metal/aps/inline-assembly.md:46
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "The `0 => _` syntax means initialise the register to 0 before running the "
@@ -16533,7 +17230,7 @@ msgstr ""
 "utiliser `inout` plutôt que `in` car l'appel pourrait potentiellement "
 "encombrer le contenu des registres."
 
-#: src/bare-metal/aps/inline-assembly.md:49
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "This `main` function needs to be `#[no_mangle]` and `extern \"C\"` because "
@@ -16542,7 +17239,7 @@ msgstr ""
 "Cette fonction `main` doit être `#[no_mangle]` et `extern \"C\"` car elle "
 "est appelée depuis notre point d'entrée dans `entry.S`."
 
-#: src/bare-metal/aps/inline-assembly.md:51
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "`_x0`–`_x3` are the values of registers `x0`–`x3`, which are conventionally "
@@ -16560,7 +17257,7 @@ msgstr ""
 "`entry.S` n'a rien de spécial à faire sauf assurez-vous qu'il ne modifie pas "
 "ces registres."
 
-#: src/bare-metal/aps/inline-assembly.md:56
+#: src/bare-metal/aps/inline-assembly.md
 #, fuzzy
 msgid ""
 "Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/"
@@ -16569,22 +17266,22 @@ msgstr ""
 "Exécutez l'exemple dans QEMU avec `make qemu_psci` sous `src/bare-metal/aps/"
 "examples`."
 
-#: src/bare-metal/aps/mmio.md:1
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid "Volatile memory access for MMIO"
 msgstr "Accès mémoire volatile pour MMIO"
 
-#: src/bare-metal/aps/mmio.md:3
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid "Use `pointer::read_volatile` and `pointer::write_volatile`."
 msgstr "Utilisez `pointer::read_volatile` et `pointer::write_volatile`."
 
-#: src/bare-metal/aps/mmio.md:4
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid "Never hold a reference."
 msgstr "Ne détenez jamais une référence."
 
-#: src/bare-metal/aps/mmio.md:5
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid ""
 "`addr_of!` lets you get fields of structs without creating an intermediate "
@@ -16593,7 +17290,7 @@ msgstr ""
 "`addr_of!` vous permet d'obtenir des champs de structures sans créer de "
 "référence intermédiaire."
 
-#: src/bare-metal/aps/mmio.md:9
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid ""
 "Volatile access: read or write operations may have side-effects, so prevent "
@@ -16603,7 +17300,7 @@ msgstr ""
 "effets secondaires, évitez donc que le compilateur ou matériel de les "
 "réorganiser, de les dupliquer ou de les supprimer."
 
-#: src/bare-metal/aps/mmio.md:11
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid ""
 "Usually if you write and then read, e.g. via a mutable reference, the "
@@ -16614,7 +17311,7 @@ msgstr ""
 "mutable, le compilateur peut supposer que la valeur lue est la même que la "
 "valeur que vous venez d'écrire et ne vous souciez pas de lire la mémoire."
 
-#: src/bare-metal/aps/mmio.md:13
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid ""
 "Some existing crates for volatile access to hardware do hold references, but "
@@ -16625,7 +17322,7 @@ msgstr ""
 "des références, mais ce n'est pas valable. Chaque fois qu'une référence "
 "existe, le compilateur peut choisir de la déréférencer."
 
-#: src/bare-metal/aps/mmio.md:15
+#: src/bare-metal/aps/mmio.md
 #, fuzzy
 msgid ""
 "Use the `addr_of!` macro to get struct field pointers from a pointer to the "
@@ -16634,12 +17331,12 @@ msgstr ""
 "Utilisez la macro `addr_of!` pour obtenir des pointeurs de champ struct à "
 "partir d'un pointeur vers la struct."
 
-#: src/bare-metal/aps/uart.md:1
+#: src/bare-metal/aps/uart.md
 #, fuzzy
 msgid "Let's write a UART driver"
 msgstr "Écrivons un pilote UART"
 
-#: src/bare-metal/aps/uart.md:3
+#: src/bare-metal/aps/uart.md
 #, fuzzy
 msgid ""
 "The QEMU 'virt' machine has a [PL011](https://developer.arm.com/"
@@ -16648,11 +17345,11 @@ msgstr ""
 "La machine QEMU 'virt' a un [PL011](https://developer.arm.com/documentation/"
 "ddi0183/g) UART, écrivons donc un pilote pour cela."
 
-#: src/bare-metal/aps/uart.md:9
+#: src/bare-metal/aps/uart.md
 msgid "/// Minimal driver for a PL011 UART.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:17 src/bare-metal/aps/better-uart/driver.md:13
+#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md
 msgid ""
 "/// Constructs a new instance of the UART driver for a PL011 device at the\n"
 "    /// given base address.\n"
@@ -16666,33 +17363,33 @@ msgid ""
 "    /// as device memory and not have any other aliases.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:29 src/bare-metal/aps/better-uart/driver.md:27
-#: src/exercises/bare-metal/rtc.md:336
+#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md
+#: src/exercises/bare-metal/rtc.md
 msgid "/// Writes a single byte to the UART.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:31 src/bare-metal/aps/better-uart/driver.md:29
-#: src/exercises/bare-metal/rtc.md:338
+#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md
+#: src/exercises/bare-metal/rtc.md
 msgid "// Wait until there is room in the TX buffer.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:34 src/bare-metal/aps/uart.md:46
+#: src/bare-metal/aps/uart.md
 msgid ""
 "// Safe because we know that the base address points to the control\n"
 "        // registers of a PL011 device which is appropriately mapped.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:37 src/bare-metal/aps/better-uart/driver.md:35
-#: src/exercises/bare-metal/rtc.md:344
+#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md
+#: src/exercises/bare-metal/rtc.md
 msgid "// Write to the TX buffer.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:41 src/bare-metal/aps/better-uart/driver.md:39
-#: src/exercises/bare-metal/rtc.md:348
+#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md
+#: src/exercises/bare-metal/rtc.md
 msgid "// Wait until the UART is no longer busy.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart.md:55
+#: src/bare-metal/aps/uart.md
 #, fuzzy
 msgid ""
 "Note that `Uart::new` is unsafe while the other methods are safe. This is "
@@ -16709,7 +17406,7 @@ msgstr ""
 "espace d'adressage), alors il est toujours sûr d'appeler `write_byte` plus "
 "tard car nous pouvons supposer que le nécessaire conditions préalables."
 
-#: src/bare-metal/aps/uart.md:60
+#: src/bare-metal/aps/uart.md
 #, fuzzy
 msgid ""
 "We could have done it the other way around (making `new` safe but "
@@ -16720,7 +17417,7 @@ msgstr ""
 "sûr), mais cela serait beaucoup moins pratique à utiliser car chaque endroit "
 "qui appelle `write_byte` aurait besoin de raisonner sur la sécurité"
 
-#: src/bare-metal/aps/uart.md:63
+#: src/bare-metal/aps/uart.md
 #, fuzzy
 msgid ""
 "This is a common pattern for writing safe wrappers of unsafe code: moving "
@@ -16731,12 +17428,12 @@ msgstr ""
 "sécurisé : déplacer la charge de la preuve pour solidité d'un grand nombre "
 "d'endroits à un plus petit nombre d'endroits."
 
-#: src/bare-metal/aps/uart/traits.md:1
+#: src/bare-metal/aps/uart/traits.md
 #, fuzzy
 msgid "More traits"
 msgstr "Plus de traits"
 
-#: src/bare-metal/aps/uart/traits.md:3
+#: src/bare-metal/aps/uart/traits.md
 #, fuzzy
 msgid ""
 "We derived the `Debug` trait. It would be useful to implement a few more "
@@ -16745,14 +17442,14 @@ msgstr ""
 "Nous avons dérivé le trait `Debug`. Il serait également utile de mettre en "
 "œuvre quelques traits supplémentaires."
 
-#: src/bare-metal/aps/uart/traits.md:16 src/exercises/bare-metal/rtc.md:379
-#: src/exercises/bare-metal/solutions-afternoon.md:231
+#: src/bare-metal/aps/uart/traits.md src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "// Safe because it just contains a pointer to device memory, which can be\n"
 "// accessed from any context.\n"
 msgstr ""
 
-#: src/bare-metal/aps/uart/traits.md:24
+#: src/bare-metal/aps/uart/traits.md
 #, fuzzy
 msgid ""
 "Implementing `Write` lets us use the `write!` and `writeln!` macros with our "
@@ -16761,7 +17458,7 @@ msgstr ""
 "L'implémentation de `Write` nous permet d'utiliser les macros `write!` et "
 "`writeln!` avec notre type `Uart`."
 
-#: src/bare-metal/aps/uart/traits.md:25
+#: src/bare-metal/aps/uart/traits.md
 #, fuzzy
 msgid ""
 "Run the example in QEMU with `make qemu_minimal` under `src/bare-metal/aps/"
@@ -16770,12 +17467,12 @@ msgstr ""
 "Exécutez l'exemple dans QEMU avec `make qemu_minimal` sous `src/bare-metal/"
 "aps/examples`."
 
-#: src/bare-metal/aps/better-uart.md:1
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "A better UART driver"
 msgstr "Un meilleur pilote UART"
 
-#: src/bare-metal/aps/better-uart.md:3
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid ""
 "The PL011 actually has [a bunch more registers](https://developer.arm.com/"
@@ -16791,190 +17488,189 @@ msgstr ""
 "d'entre eux sont des champs de bits, ce qui serait bien de accéder de "
 "manière structurée."
 
-#: src/bare-metal/aps/better-uart.md:7
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "Offset"
 msgstr "Décalage"
 
-#: src/bare-metal/aps/better-uart.md:7
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "Register name"
 msgstr "Nom du registre"
 
-#: src/bare-metal/aps/better-uart.md:7
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "Width"
 msgstr "Largeur"
 
-#: src/bare-metal/aps/better-uart.md:9
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x00"
 msgstr "0x00"
 
-#: src/bare-metal/aps/better-uart.md:9
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "DR"
 msgstr "DR"
 
-#: src/bare-metal/aps/better-uart.md:9
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "12"
 msgstr "12"
 
-#: src/bare-metal/aps/better-uart.md:10
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x04"
 msgstr "0x04"
 
-#: src/bare-metal/aps/better-uart.md:10
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "RSR"
 msgstr "RSR"
 
-#: src/bare-metal/aps/better-uart.md:11
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x18"
 msgstr "0x18"
 
-#: src/bare-metal/aps/better-uart.md:11
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "FR"
 msgstr "EN"
 
-#: src/bare-metal/aps/better-uart.md:11
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "9"
 msgstr "9"
 
-#: src/bare-metal/aps/better-uart.md:12
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x20"
 msgstr "0x20"
 
-#: src/bare-metal/aps/better-uart.md:12
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "ILPR"
 msgstr "ILPR"
 
-#: src/bare-metal/aps/better-uart.md:13
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x24"
 msgstr "0x24"
 
-#: src/bare-metal/aps/better-uart.md:13
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "IBRD"
 msgstr "BIRD"
 
-#: src/bare-metal/aps/better-uart.md:13 src/bare-metal/aps/better-uart.md:16
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "16"
 msgstr "16"
 
-#: src/bare-metal/aps/better-uart.md:14
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x28"
 msgstr "0x28"
 
-#: src/bare-metal/aps/better-uart.md:14
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "FBRD"
 msgstr "FBRD"
 
-#: src/bare-metal/aps/better-uart.md:15
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x2c"
 msgstr "0x2c"
 
-#: src/bare-metal/aps/better-uart.md:15
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "LCR_H"
 msgstr "LCR_H"
 
-#: src/bare-metal/aps/better-uart.md:16
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x30"
 msgstr "0x30"
 
-#: src/bare-metal/aps/better-uart.md:16
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "CR"
 msgstr "CR"
 
-#: src/bare-metal/aps/better-uart.md:17
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x34"
 msgstr "0x34"
 
-#: src/bare-metal/aps/better-uart.md:17
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "IFLS"
 msgstr "IFLS"
 
-#: src/bare-metal/aps/better-uart.md:18
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x38"
 msgstr "0x38"
 
-#: src/bare-metal/aps/better-uart.md:18
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "IMSC"
 msgstr "IMSC"
 
-#: src/bare-metal/aps/better-uart.md:18 src/bare-metal/aps/better-uart.md:19
-#: src/bare-metal/aps/better-uart.md:20 src/bare-metal/aps/better-uart.md:21
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "11"
 msgstr "11"
 
-#: src/bare-metal/aps/better-uart.md:19
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x3c"
 msgstr "0x3c"
 
-#: src/bare-metal/aps/better-uart.md:19
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "RIS"
 msgstr "SIR"
 
-#: src/bare-metal/aps/better-uart.md:20
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x40"
 msgstr "0x40"
 
-#: src/bare-metal/aps/better-uart.md:20
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "MIS"
 msgstr "SIG"
 
-#: src/bare-metal/aps/better-uart.md:21
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x44"
 msgstr "0x44"
 
-#: src/bare-metal/aps/better-uart.md:21
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "ICR"
 msgstr "RIC"
 
-#: src/bare-metal/aps/better-uart.md:22
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "0x48"
 msgstr "0x48"
 
-#: src/bare-metal/aps/better-uart.md:22
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "DMACR"
 msgstr "DMACR"
 
-#: src/bare-metal/aps/better-uart.md:26
+#: src/bare-metal/aps/better-uart.md
 #, fuzzy
 msgid "There are also some ID registers which have been omitted for brevity."
 msgstr ""
 "Il existe également des registres d'identification qui ont été omis par "
 "souci de brièveté."
 
-#: src/bare-metal/aps/better-uart/bitflags.md:3
+#: src/bare-metal/aps/better-uart/bitflags.md
 #, fuzzy
 msgid ""
 "The [`bitflags`](https://crates.io/crates/bitflags) crate is useful for "
@@ -16983,57 +17679,47 @@ msgstr ""
 "Le crate [`bitflags`](https://crates.io/crates/bitflags) est utile pour "
 "travailler avec les bitflags."
 
-#: src/bare-metal/aps/better-uart/bitflags.md:9
-#: src/exercises/bare-metal/rtc.md:238
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Flags from the UART flag register.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:13
-#: src/exercises/bare-metal/rtc.md:242
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Clear to send.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:15
-#: src/exercises/bare-metal/rtc.md:244
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Data set ready.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:17
-#: src/exercises/bare-metal/rtc.md:246
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Data carrier detect.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:19
-#: src/exercises/bare-metal/rtc.md:248
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// UART busy transmitting data.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:21
-#: src/exercises/bare-metal/rtc.md:250
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Receive FIFO is empty.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:23
-#: src/exercises/bare-metal/rtc.md:252
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Transmit FIFO is full.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:25
-#: src/exercises/bare-metal/rtc.md:254
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Receive FIFO is full.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:27
-#: src/exercises/bare-metal/rtc.md:256
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Transmit FIFO is empty.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:29
-#: src/exercises/bare-metal/rtc.md:258
+#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md
 msgid "/// Ring indicator.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/bitflags.md:37
+#: src/bare-metal/aps/better-uart/bitflags.md
 #, fuzzy
 msgid ""
 "The `bitflags!` macro creates a newtype something like `Flags(u16)`, along "
@@ -17042,12 +17728,12 @@ msgstr ""
 "La macro `bitflags!` crée un nouveau type quelque chose comme `Flags(u16)`, "
 "avec un tas de méthodes implémentations pour obtenir et définir des drapeaux."
 
-#: src/bare-metal/aps/better-uart/registers.md:1
+#: src/bare-metal/aps/better-uart/registers.md
 #, fuzzy
 msgid "Multiple registers"
 msgstr "Plusieurs registres"
 
-#: src/bare-metal/aps/better-uart/registers.md:3
+#: src/bare-metal/aps/better-uart/registers.md
 #, fuzzy
 msgid ""
 "We can use a struct to represent the memory layout of the UART's registers."
@@ -17055,7 +17741,7 @@ msgstr ""
 "Nous pouvons utiliser une structure pour représenter la disposition de la "
 "mémoire des registres de l'UART."
 
-#: src/bare-metal/aps/better-uart/registers.md:41
+#: src/bare-metal/aps/better-uart/registers.md
 #, fuzzy
 msgid ""
 "[`#[repr(C)]`](https://doc.rust-lang.org/reference/type-layout.html#the-c-"
@@ -17071,37 +17757,33 @@ msgstr ""
 "par défaut permet compilateur pour (entre autres) réorganiser les champs "
 "comme bon lui semble."
 
-#: src/bare-metal/aps/better-uart/driver.md:3
+#: src/bare-metal/aps/better-uart/driver.md
 #, fuzzy
 msgid "Now let's use the new `Registers` struct in our driver."
 msgstr ""
 "Utilisons maintenant la nouvelle structure `Registers` dans notre pilote."
 
-#: src/bare-metal/aps/better-uart/driver.md:6
+#: src/bare-metal/aps/better-uart/driver.md
 msgid "/// Driver for a PL011 UART.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/driver.md:32
-#: src/bare-metal/aps/better-uart/driver.md:55
-#: src/exercises/bare-metal/rtc.md:341 src/exercises/bare-metal/rtc.md:364
+#: src/bare-metal/aps/better-uart/driver.md src/exercises/bare-metal/rtc.md
 msgid ""
 "// Safe because we know that self.registers points to the control\n"
 "        // registers of a PL011 device which is appropriately mapped.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/driver.md:43
-#: src/exercises/bare-metal/rtc.md:352
+#: src/bare-metal/aps/better-uart/driver.md src/exercises/bare-metal/rtc.md
 msgid ""
-"/// Reads and returns a pending byte, or `None` if nothing has been "
-"received.\n"
+"/// Reads and returns a pending byte, or `None` if nothing has been\n"
+"    /// received.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/driver.md:49
-#: src/exercises/bare-metal/rtc.md:358
+#: src/bare-metal/aps/better-uart/driver.md src/exercises/bare-metal/rtc.md
 msgid "// TODO: Check for error conditions in bits 8-11.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/driver.md:64
+#: src/bare-metal/aps/better-uart/driver.md
 #, fuzzy
 msgid ""
 "Note the use of `addr_of!` / `addr_of_mut!` to get pointers to individual "
@@ -17111,13 +17793,12 @@ msgstr ""
 "pointeurs vers des champs individuels sans créer une référence "
 "intermédiaire, qui serait malsaine."
 
-#: src/bare-metal/aps/better-uart/using.md:1
-#: src/bare-metal/aps/logging/using.md:1
+#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md
 #, fuzzy
 msgid "Using it"
 msgstr "En l'utilisant"
 
-#: src/bare-metal/aps/better-uart/using.md:3
+#: src/bare-metal/aps/better-uart/using.md
 #, fuzzy
 msgid ""
 "Let's write a small program using our driver to write to the serial console, "
@@ -17126,43 +17807,41 @@ msgstr ""
 "Écrivons un petit programme en utilisant notre pilote pour écrire sur la "
 "console série et écho entrant octets."
 
-#: src/bare-metal/aps/better-uart/using.md:19
-#: src/bare-metal/aps/logging/using.md:18 src/exercises/bare-metal/rtc.md:41
-#: src/exercises/bare-metal/solutions-afternoon.md:33
+#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Base address of the primary PL011 UART.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:25
-#: src/bare-metal/aps/logging/using.md:24 src/exercises/bare-metal/rtc.md:47
-#: src/exercises/bare-metal/solutions-afternoon.md:44
+#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "// Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,\n"
 "    // and nothing else accesses that address range.\n"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:29
-#: src/bare-metal/aps/logging/using.md:29
+#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md
 msgid "\"main({x0:#x}, {x1:#x}, {x2:#x}, {x3:#x})\""
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:35
+#: src/bare-metal/aps/better-uart/using.md
 msgid "b'\\r'"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:36
-#: src/async/pitfalls/cancellation.md:27
+#: src/bare-metal/aps/better-uart/using.md src/async/pitfalls/cancellation.md
 msgid "b'\\n'"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:38
+#: src/bare-metal/aps/better-uart/using.md
 msgid "b'q'"
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:44
+#: src/bare-metal/aps/better-uart/using.md
 msgid "\"Bye!\""
 msgstr ""
 
-#: src/bare-metal/aps/better-uart/using.md:51
+#: src/bare-metal/aps/better-uart/using.md
 #, fuzzy
 msgid ""
 "As in the [inline assembly](../inline-assembly.md) example, this `main` "
@@ -17173,7 +17852,7 @@ msgstr ""
 "fonction `main` est appelée depuis notre code du point d'entrée dans `entry."
 "S`. Voir les notes du formateur pour plus de détails."
 
-#: src/bare-metal/aps/better-uart/using.md:53
+#: src/bare-metal/aps/better-uart/using.md
 #, fuzzy
 msgid ""
 "Run the example in QEMU with `make qemu` under `src/bare-metal/aps/examples`."
@@ -17181,7 +17860,7 @@ msgstr ""
 "Exécutez l'exemple dans QEMU avec `make qemu` sous `src/bare-metal/aps/"
 "examples`."
 
-#: src/bare-metal/aps/logging.md:3
+#: src/bare-metal/aps/logging.md
 #, fuzzy
 msgid ""
 "It would be nice to be able to use the logging macros from the [`log`]"
@@ -17192,15 +17871,15 @@ msgstr ""
 "[`log`](https://crates.io/crates/log). Nous pouvons le faire en implémentant "
 "le trait `Log`."
 
-#: src/bare-metal/aps/logging.md:28 src/exercises/bare-metal/rtc.md:190
+#: src/bare-metal/aps/logging.md src/exercises/bare-metal/rtc.md
 msgid "\"[{}] {}\""
 msgstr ""
 
-#: src/bare-metal/aps/logging.md:37 src/exercises/bare-metal/rtc.md:199
+#: src/bare-metal/aps/logging.md src/exercises/bare-metal/rtc.md
 msgid "/// Initialises UART logger.\n"
 msgstr ""
 
-#: src/bare-metal/aps/logging.md:50
+#: src/bare-metal/aps/logging.md
 #, fuzzy
 msgid ""
 "The unwrap in `log` is safe because we initialise `LOGGER` before calling "
@@ -17209,24 +17888,24 @@ msgstr ""
 "Le déballage dans `log` est sûr car nous initialisons `LOGGER` avant "
 "d'appeler `set_logger`."
 
-#: src/bare-metal/aps/logging/using.md:3
+#: src/bare-metal/aps/logging/using.md
 #, fuzzy
 msgid "We need to initialise the logger before we use it."
 msgstr "Nous devons initialiser l'enregistreur avant de l'utiliser."
 
-#: src/bare-metal/aps/logging/using.md:38 src/exercises/bare-metal/rtc.md:69
-#: src/exercises/bare-metal/solutions-afternoon.md:121
+#: src/bare-metal/aps/logging/using.md src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"{info}\""
 msgstr ""
 
-#: src/bare-metal/aps/logging/using.md:46
+#: src/bare-metal/aps/logging/using.md
 #, fuzzy
 msgid "Note that our panic handler can now log details of panics."
 msgstr ""
 "Notez que notre gestionnaire de panique peut désormais enregistrer les "
 "détails des paniques."
 
-#: src/bare-metal/aps/logging/using.md:47
+#: src/bare-metal/aps/logging/using.md
 #, fuzzy
 msgid ""
 "Run the example in QEMU with `make qemu_logger` under `src/bare-metal/aps/"
@@ -17235,7 +17914,7 @@ msgstr ""
 "Exécutez l'exemple dans QEMU avec `make qemu_logger` sous `src/bare-metal/"
 "aps/examples`."
 
-#: src/bare-metal/aps/exceptions.md:3
+#: src/bare-metal/aps/exceptions.md
 msgid ""
 "AArch64 defines an exception vector table with 16 entries, for 4 types of "
 "exceptions (synchronous, IRQ, FIQ, SError) from 4 states (current EL with "
@@ -17244,23 +17923,23 @@ msgid ""
 "calling into Rust code:"
 msgstr ""
 
-#: src/bare-metal/aps/exceptions.md:64
+#: src/bare-metal/aps/exceptions.md
 msgid "EL is exception level; all our examples this afternoon run in EL1."
 msgstr ""
 
-#: src/bare-metal/aps/exceptions.md:65
+#: src/bare-metal/aps/exceptions.md
 msgid ""
 "For simplicity we aren't distinguishing between SP0 and SPx for the current "
 "EL exceptions, or between AArch32 and AArch64 for the lower EL exceptions."
 msgstr ""
 
-#: src/bare-metal/aps/exceptions.md:67
+#: src/bare-metal/aps/exceptions.md
 msgid ""
 "For this example we just log the exception and power down, as we don't "
 "expect any of them to actually happen."
 msgstr ""
 
-#: src/bare-metal/aps/exceptions.md:69
+#: src/bare-metal/aps/exceptions.md
 msgid ""
 "We can think of exception handlers and our main execution context more or "
 "less like different threads. [`Send` and `Sync`](../../concurrency/send-sync."
@@ -17270,28 +17949,28 @@ msgid ""
 "it in something like a `Mutex` and put it in a static."
 msgstr ""
 
-#: src/bare-metal/aps/other-projects.md:3
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "[oreboot](https://github.com/oreboot/oreboot)"
 msgstr "[oreboot](https://github.com/oreboot/oreboot)"
 
-#: src/bare-metal/aps/other-projects.md:4
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "\"coreboot without the C\""
 msgstr "\"coreboot sans le C\""
 
-#: src/bare-metal/aps/other-projects.md:5
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "Supports x86, aarch64 and RISC-V."
 msgstr "Prend en charge x86, aarch64 et RISC-V."
 
-#: src/bare-metal/aps/other-projects.md:6
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "Relies on LinuxBoot rather than having many drivers itself."
 msgstr ""
 "S'appuie sur LinuxBoot plutôt que d'avoir lui-même de nombreux pilotes."
 
-#: src/bare-metal/aps/other-projects.md:7
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid ""
 "[Rust RaspberryPi OS tutorial](https://github.com/rust-embedded/rust-"
@@ -17300,7 +17979,7 @@ msgstr ""
 "\\[Tutoriel Rust RaspberryPi OS\\] (https://github.com/rust-embedded/rust-"
 "raspberrypi-OS-tutorials)"
 
-#: src/bare-metal/aps/other-projects.md:8
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid ""
 "Initialisation, UART driver, simple bootloader, JTAG, exception levels, "
@@ -17309,30 +17988,30 @@ msgstr ""
 "Initialisation, pilote UART, chargeur de démarrage simple, JTAG, niveaux "
 "d'exception, gestion des exceptions, tables de pages"
 
-#: src/bare-metal/aps/other-projects.md:10
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid ""
 "Some dodginess around cache maintenance and initialisation in Rust, not "
 "necessarily a good example to copy for production code."
 msgstr "Pas tous très bien écrits, alors méfiez-vous."
 
-#: src/bare-metal/aps/other-projects.md:12
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "[`cargo-call-stack`](https://crates.io/crates/cargo-call-stack)"
 msgstr "[`pile-appel-cargo`](https://crates.io/crates/pile-appel-cargo)"
 
-#: src/bare-metal/aps/other-projects.md:13
+#: src/bare-metal/aps/other-projects.md
 #, fuzzy
 msgid "Static analysis to determine maximum stack usage."
 msgstr "Analyse statique pour déterminer l'utilisation maximale de la pile."
 
-#: src/bare-metal/aps/other-projects.md:17
+#: src/bare-metal/aps/other-projects.md
 msgid ""
 "The RaspberryPi OS tutorial runs Rust code before the MMU and caches are "
 "enabled. This will read and write memory (e.g. the stack). However:"
 msgstr ""
 
-#: src/bare-metal/aps/other-projects.md:19
+#: src/bare-metal/aps/other-projects.md
 msgid ""
 "Without the MMU and cache, unaligned accesses will fault. It builds with "
 "`aarch64-unknown-none` which sets `+strict-align` to prevent the compiler "
@@ -17340,7 +18019,7 @@ msgid ""
 "necessarily the case in general."
 msgstr ""
 
-#: src/bare-metal/aps/other-projects.md:22
+#: src/bare-metal/aps/other-projects.md
 msgid ""
 "If it were running in a VM, this can lead to cache coherency issues. The "
 "problem is that the VM is accessing memory directly with the cache disabled, "
@@ -17351,11 +18030,11 @@ msgid ""
 "hypervisor), but isn't a good pattern in general."
 msgstr ""
 
-#: src/bare-metal/useful-crates.md:1
+#: src/bare-metal/useful-crates.md
 msgid "Useful crates"
 msgstr "Crates utiles"
 
-#: src/bare-metal/useful-crates.md:3
+#: src/bare-metal/useful-crates.md
 #, fuzzy
 msgid ""
 "We'll go over a few crates which solve some common problems in bare-metal "
@@ -17364,7 +18043,7 @@ msgstr ""
 "Nous allons passer en revue quelques caisses qui résolvent certains "
 "problèmes courants de la programmation bare-metal."
 
-#: src/bare-metal/useful-crates/zerocopy.md:3
+#: src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid ""
 "The [`zerocopy`](https://docs.rs/zerocopy/) crate (from Fuchsia) provides "
@@ -17375,7 +18054,7 @@ msgstr ""
 "traits et des macros pour convertir en toute sécurité entre séquences "
 "d'octets et autres types."
 
-#: src/bare-metal/useful-crates/zerocopy.md:40
+#: src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid ""
 "This is not suitable for MMIO (as it doesn't use volatile reads and writes), "
@@ -17387,7 +18066,7 @@ msgstr ""
 "structures partagées avec du matériel, par ex. par DMA, ou envoyé sur une "
 "interface externe."
 
-#: src/bare-metal/useful-crates/zerocopy.md:45
+#: src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid ""
 "`FromBytes` can be implemented for types for which any byte pattern is "
@@ -17397,7 +18076,7 @@ msgstr ""
 "modèle d'octet est valide, et peut donc être en toute sécurité converti à "
 "partir d'une séquence d'octets non fiable."
 
-#: src/bare-metal/useful-crates/zerocopy.md:47
+#: src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid ""
 "Attempting to derive `FromBytes` for these types would fail, because "
@@ -17408,7 +18087,7 @@ msgstr ""
 "n'utilise pas tous les valeurs u32 possibles comme discriminants, donc tous "
 "les modèles d'octets ne sont pas valides."
 
-#: src/bare-metal/useful-crates/zerocopy.md:49
+#: src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid ""
 "`zerocopy::byteorder` has types for byte-order aware numeric primitives."
@@ -17416,7 +18095,7 @@ msgstr ""
 "`zerocopy::byteorder` a des types pour les primitives numériques sensibles à "
 "l'ordre des octets."
 
-#: src/bare-metal/useful-crates/zerocopy.md:50
+#: src/bare-metal/useful-crates/zerocopy.md
 #, fuzzy
 msgid ""
 "Run the example with `cargo run` under `src/bare-metal/useful-crates/"
@@ -17427,7 +18106,7 @@ msgstr ""
 "zerocopy-example/`. (Ce ne sera pas exécuter dans le Playground en raison de "
 "la dépendance de la caisse.)"
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:3
+#: src/bare-metal/useful-crates/aarch64-paging.md
 #, fuzzy
 msgid ""
 "The [`aarch64-paging`](https://crates.io/crates/aarch64-paging) crate lets "
@@ -17438,19 +18117,19 @@ msgstr ""
 "permet de créer des tables de pages en fonction de la mémoire virtuelle "
 "AArch64 Architecture du système."
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:14
+#: src/bare-metal/useful-crates/aarch64-paging.md
 msgid "// Create a new page table with identity mapping.\n"
 msgstr ""
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:16
+#: src/bare-metal/useful-crates/aarch64-paging.md
 msgid "// Map a 2 MiB region of memory as read-only.\n"
 msgstr ""
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:21
+#: src/bare-metal/useful-crates/aarch64-paging.md
 msgid "// Set `TTBR0_EL1` to activate the page table.\n"
 msgstr ""
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:28
+#: src/bare-metal/useful-crates/aarch64-paging.md
 #, fuzzy
 msgid ""
 "For now it only supports EL1, but support for other exception levels should "
@@ -17459,7 +18138,7 @@ msgstr ""
 "Pour l'instant, il ne prend en charge que EL1, mais la prise en charge "
 "d'autres niveaux d'exception devrait être simple à ajouter."
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:30
+#: src/bare-metal/useful-crates/aarch64-paging.md
 #, fuzzy
 msgid ""
 "This is used in Android for the [Protected VM Firmware](https://cs.android."
@@ -17470,7 +18149,7 @@ msgstr ""
 "virtuelle protégée\\] [2](https://cs.android.com/android/platform/"
 "superproject/+/master:packages/modules/Virtualization/pvmfw/)."
 
-#: src/bare-metal/useful-crates/aarch64-paging.md:31
+#: src/bare-metal/useful-crates/aarch64-paging.md
 #, fuzzy
 msgid ""
 "There's no easy way to run this example, as it needs to run on real hardware "
@@ -17479,7 +18158,7 @@ msgstr ""
 "Il n'y a pas de moyen simple d'exécuter cet exemple, car il doit être "
 "exécuté sur du matériel réel ou sous QEMU."
 
-#: src/bare-metal/useful-crates/buddy_system_allocator.md:3
+#: src/bare-metal/useful-crates/buddy_system_allocator.md
 #, fuzzy
 msgid ""
 "[`buddy_system_allocator`](https://crates.io/crates/buddy_system_allocator) "
@@ -17501,12 +18180,12 @@ msgstr ""
 "autre espace d'adressage. Par exemple, nous pourrions vouloir allouer de "
 "l'espace MMIO pour les PCI BAR :"
 
-#: src/bare-metal/useful-crates/buddy_system_allocator.md:26
+#: src/bare-metal/useful-crates/buddy_system_allocator.md
 #, fuzzy
 msgid "PCI BARs always have alignment equal to their size."
 msgstr "Les PCI BAR ont toujours un alignement égal à leur taille."
 
-#: src/bare-metal/useful-crates/buddy_system_allocator.md:27
+#: src/bare-metal/useful-crates/buddy_system_allocator.md
 #, fuzzy
 msgid ""
 "Run the example with `cargo run` under `src/bare-metal/useful-crates/"
@@ -17517,7 +18196,7 @@ msgstr ""
 "allocator-example/`. (Ce ne sera pas exécuter dans le Playground en raison "
 "de la dépendance de la caisse.)"
 
-#: src/bare-metal/useful-crates/tinyvec.md:3
+#: src/bare-metal/useful-crates/tinyvec.md
 #, fuzzy
 msgid ""
 "Sometimes you want something which can be resized like a `Vec`, but without "
@@ -17533,7 +18212,7 @@ msgstr ""
 "nombre d'éléments utilisés et panique si vous essayez de utiliser plus que "
 "ce qui est alloué."
 
-#: src/bare-metal/useful-crates/tinyvec.md:23
+#: src/bare-metal/useful-crates/tinyvec.md
 #, fuzzy
 msgid ""
 "`tinyvec` requires that the element type implement `Default` for "
@@ -17542,7 +18221,7 @@ msgstr ""
 "`tinyvec` nécessite que le type d'élément implémente `Default` pour "
 "l'initialisation."
 
-#: src/bare-metal/useful-crates/tinyvec.md:24
+#: src/bare-metal/useful-crates/tinyvec.md
 #, fuzzy
 msgid ""
 "The Rust Playground includes `tinyvec`, so this example will run fine inline."
@@ -17550,7 +18229,7 @@ msgstr ""
 "Le Rust Playground inclut `tinyvec`, donc cet exemple fonctionnera bien en "
 "ligne."
 
-#: src/bare-metal/useful-crates/spin.md:3
+#: src/bare-metal/useful-crates/spin.md
 #, fuzzy
 msgid ""
 "`std::sync::Mutex` and the other synchronisation primitives from `std::sync` "
@@ -17562,7 +18241,7 @@ msgstr ""
 "synchronisation ou la mutabilité intérieure, comme pour le partage état "
 "entre différents processeurs ?"
 
-#: src/bare-metal/useful-crates/spin.md:7
+#: src/bare-metal/useful-crates/spin.md
 #, fuzzy
 msgid ""
 "The [`spin`](https://crates.io/crates/spin) crate provides spinlock-based "
@@ -17571,29 +18250,29 @@ msgstr ""
 "Le crate [`spin`](https://crates.io/crates/spin) fournit des équivalents "
 "basés sur des verrous d'attente de plusieurs de ces primitives."
 
-#: src/bare-metal/useful-crates/spin.md:23
+#: src/bare-metal/useful-crates/spin.md
 msgid "Be careful to avoid deadlock if you take locks in interrupt handlers."
 msgstr ""
 
-#: src/bare-metal/useful-crates/spin.md:24
+#: src/bare-metal/useful-crates/spin.md
 msgid ""
 "`spin` also has a ticket lock mutex implementation; equivalents of `RwLock`, "
-"`Barrier` and `Once` from `std::sync`;  and `Lazy` for lazy initialisation."
+"`Barrier` and `Once` from `std::sync`; and `Lazy` for lazy initialisation."
 msgstr ""
 
-#: src/bare-metal/useful-crates/spin.md:26
+#: src/bare-metal/useful-crates/spin.md
 msgid ""
 "The [`once_cell`](https://crates.io/crates/once_cell) crate also has some "
 "useful types for late initialisation with a slightly different approach to "
 "`spin::once::Once`."
 msgstr ""
 
-#: src/bare-metal/useful-crates/spin.md:28
+#: src/bare-metal/useful-crates/spin.md
 msgid ""
 "The Rust Playground includes `spin`, so this example will run fine inline."
 msgstr ""
 
-#: src/bare-metal/android.md:3
+#: src/bare-metal/android.md
 #, fuzzy
 msgid ""
 "To build a bare-metal Rust binary in AOSP, you need to use a "
@@ -17607,11 +18286,11 @@ msgstr ""
 "puis un `raw_binary` pour convertir l'ELF en un binaire brut prêt à être "
 "exécuté."
 
-#: src/bare-metal/android/vmbase.md:1
+#: src/bare-metal/android/vmbase.md
 msgid "vmbase"
 msgstr "vmbase"
 
-#: src/bare-metal/android/vmbase.md:3
+#: src/bare-metal/android/vmbase.md
 #, fuzzy
 msgid ""
 "For VMs running under crosvm on aarch64, the [vmbase](https://android."
@@ -17626,7 +18305,7 @@ msgstr ""
 "construction, ainsi qu'un point d'entrée, la journalisation de la console "
 "UART et plus encore."
 
-#: src/bare-metal/android/vmbase.md:21
+#: src/bare-metal/android/vmbase.md
 #, fuzzy
 msgid ""
 "The `main!` macro marks your main function, to be called from the `vmbase` "
@@ -17635,7 +18314,7 @@ msgstr ""
 "La macro `main!` marque votre fonction principale, à appeler depuis le point "
 "d'entrée `vmbase`."
 
-#: src/bare-metal/android/vmbase.md:22
+#: src/bare-metal/android/vmbase.md
 #, fuzzy
 msgid ""
 "The `vmbase` entry point handles console initialisation, and issues a "
@@ -17644,15 +18323,14 @@ msgstr ""
 "Le point d'entrée `vmbase` gère l'initialisation de la console et émet un "
 "PSCI_SYSTEM_OFF pour l'arrêt la VM si votre fonction principale revient."
 
-#: src/exercises/bare-metal/afternoon.md:3
+#: src/exercises/bare-metal/afternoon.md
 #, fuzzy
 msgid "We will write a driver for the PL031 real-time clock device."
 msgstr ""
 "Nous allons écrire un pilote pour le dispositif d'horloge en temps réel "
 "PL031."
 
-#: src/exercises/bare-metal/afternoon.md:7
-#: src/exercises/concurrency/afternoon.md:13
+#: src/exercises/bare-metal/afternoon.md src/exercises/concurrency/afternoon.md
 #, fuzzy
 msgid ""
 "After looking at the exercises, you can look at the [solutions](solutions-"
@@ -17661,13 +18339,13 @@ msgstr ""
 "Après avoir regardé l'exercice, vous pouvez regarder la [solution](solutions-"
 "afternoon.md) fournie."
 
-#: src/exercises/bare-metal/rtc.md:1
-#: src/exercises/bare-metal/solutions-afternoon.md:3
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 #, fuzzy
 msgid "RTC driver"
 msgstr "Pilote RTC"
 
-#: src/exercises/bare-metal/rtc.md:3
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid ""
 "The QEMU aarch64 virt machine has a [PL031](https://developer.arm.com/"
@@ -17681,37 +18359,37 @@ msgstr ""
 "caisse [`chrono`](https://crates.io/crates/chrono) pour le formatage de la "
 "date/heure."
 
-#: src/exercises/bare-metal/rtc.md:6
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "Use it to print the current time to the serial console. You can use the "
 "[`chrono`](https://crates.io/crates/chrono) crate for date/time formatting."
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:8
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "Use the match register and raw interrupt status to busy-wait until a given "
 "time, e.g. 3 seconds in the future. (Call [`core::hint::spin_loop`](https://"
 "doc.rust-lang.org/core/hint/fn.spin_loop.html) inside the loop.)"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:10
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "_Extension if you have time:_ Enable and handle the interrupt generated by "
 "the RTC match. You can use the driver provided in the [`arm-gic`](https://"
 "docs.rs/arm-gic/) crate to configure the Arm Generic Interrupt Controller."
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:12
+#: src/exercises/bare-metal/rtc.md
 msgid "Use the RTC interrupt, which is wired to the GIC as `IntId::spi(2)`."
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:13
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "Once the interrupt is enabled, you can put the core to sleep via `arm_gic::"
 "wfi()`, which will cause the core to sleep until it receives an interrupt."
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:16
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid ""
 "Download the [exercise template](../../comprehensive-rust-exercises.zip) and "
@@ -17720,33 +18398,33 @@ msgstr ""
 "Téléchargez le \\[modèle d'exercice\\] (../../comprehensive-rust-exercises."
 "zip) et regardez dans le `rtc` répertoire pour les fichiers suivants."
 
-#: src/exercises/bare-metal/rtc.md:37
-#: src/exercises/bare-metal/solutions-afternoon.md:29
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Base addresses of the GICv3.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:52
-#: src/exercises/bare-metal/solutions-afternoon.md:49
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"main({:#x}, {:#x}, {:#x}, {:#x})\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:54
-#: src/exercises/bare-metal/solutions-afternoon.md:51
+#: src/exercises/bare-metal/rtc.md
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "// Safe because `GICD_BASE_ADDRESS` and `GICR_BASE_ADDRESS` are the base\n"
 "    // addresses of a GICv3 distributor and redistributor respectively, and\n"
 "    // nothing else accesses those address ranges.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:60
+#: src/exercises/bare-metal/rtc.md
 msgid "// TODO: Create instance of RTC driver and print current time.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:62
+#: src/exercises/bare-metal/rtc.md
 msgid "// TODO: Wait for 3 seconds.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:75
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid ""
 "_src/exceptions.rs_ (you should only need to change this for the 3rd part of "
@@ -17754,8 +18432,7 @@ msgid ""
 msgstr ""
 "`src/exceptions.rs` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:80 src/exercises/bare-metal/rtc.md:154
-#: src/exercises/bare-metal/rtc.md:215 src/exercises/bare-metal/rtc.md:415
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "// Copyright 2023 Google LLC\n"
 "//\n"
@@ -17772,104 +18449,104 @@ msgid ""
 "// limitations under the License.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:101
+#: src/exercises/bare-metal/rtc.md
 msgid "\"sync_exception_current\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:107
+#: src/exercises/bare-metal/rtc.md
 msgid "\"irq_current\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:108
+#: src/exercises/bare-metal/rtc.md
 msgid "\"No pending interrupt\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:109
+#: src/exercises/bare-metal/rtc.md
 msgid "\"IRQ {intid:?}\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:114
+#: src/exercises/bare-metal/rtc.md
 msgid "\"fiq_current\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:120
+#: src/exercises/bare-metal/rtc.md
 msgid "\"serr_current\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:126
+#: src/exercises/bare-metal/rtc.md
 msgid "\"sync_lower\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:132
+#: src/exercises/bare-metal/rtc.md
 msgid "\"irq_lower\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:138
+#: src/exercises/bare-metal/rtc.md
 msgid "\"fiq_lower\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:144
+#: src/exercises/bare-metal/rtc.md
 msgid "\"serr_lower\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:149
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_src/logger.rs_ (you shouldn't need to change this):"
 msgstr "`src/logger.rs` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:167
+#: src/exercises/bare-metal/rtc.md
 msgid "// ANCHOR: main\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:210
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_src/pl011.rs_ (you shouldn't need to change this):"
 msgstr "`src/pl011.rs` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:233
+#: src/exercises/bare-metal/rtc.md
 msgid "// ANCHOR: Flags\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:261
+#: src/exercises/bare-metal/rtc.md
 msgid "// ANCHOR_END: Flags\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:265
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "/// Flags from the UART Receive Status Register / Error Clear Register.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:269
+#: src/exercises/bare-metal/rtc.md
 msgid "/// Framing error.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:271
+#: src/exercises/bare-metal/rtc.md
 msgid "/// Parity error.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:273
+#: src/exercises/bare-metal/rtc.md
 msgid "/// Break error.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:275
+#: src/exercises/bare-metal/rtc.md
 msgid "/// Overrun error.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:279
+#: src/exercises/bare-metal/rtc.md
 msgid "// ANCHOR: Registers\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:311
+#: src/exercises/bare-metal/rtc.md
 msgid "// ANCHOR_END: Registers\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:313
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "// ANCHOR: Uart\n"
 "/// Driver for a PL011 UART.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:322
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "/// Constructs a new instance of the UART driver for a PL011 device at the\n"
 "    /// given base address.\n"
@@ -17883,55 +18560,55 @@ msgid ""
 "    /// as device memory and not have any other aliases.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:368
+#: src/exercises/bare-metal/rtc.md
 msgid "// ANCHOR_END: Uart\n"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:410
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_build.rs_ (you shouldn't need to change this):"
 msgstr "`build.rs` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:433 src/exercises/bare-metal/rtc.md:435
+#: src/exercises/bare-metal/rtc.md
 msgid "\"linux\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:434 src/exercises/bare-metal/rtc.md:436
+#: src/exercises/bare-metal/rtc.md
 msgid "\"CROSS_COMPILE\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:434
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "\"aarch64-linux-gnu\""
 msgstr "aarch64-paging"
 
-#: src/exercises/bare-metal/rtc.md:436
+#: src/exercises/bare-metal/rtc.md
 msgid "\"aarch64-none-elf\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:439
+#: src/exercises/bare-metal/rtc.md
 msgid "\"entry.S\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:440
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "\"exceptions.S\""
 msgstr "Exceptions"
 
-#: src/exercises/bare-metal/rtc.md:441
+#: src/exercises/bare-metal/rtc.md
 msgid "\"idmap.S\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:442
+#: src/exercises/bare-metal/rtc.md
 msgid "\"empty\""
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:446
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_entry.S_ (you shouldn't need to change this):"
 msgstr "`entry.S` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:450
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "```armasm\n"
 "/*\n"
@@ -18093,12 +18770,12 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:595
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_exceptions.S_ (you shouldn't need to change this):"
 msgstr "`exceptions.S` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:599
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "```armasm\n"
 "/*\n"
@@ -18292,12 +18969,12 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:780
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_idmap.S_ (you shouldn't need to change this):"
 msgstr "`idmap.S` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:784
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "```armasm\n"
 "/*\n"
@@ -18346,12 +19023,12 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:829
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_image.ld_ (you shouldn't need to change this):"
 msgstr "`image.ld` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:833
+#: src/exercises/bare-metal/rtc.md
 msgid ""
 "```ld\n"
 "/*\n"
@@ -18462,139 +19139,134 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:940
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "_Makefile_ (you shouldn't need to change this):"
 msgstr "`Makefile` (vous ne devriez pas avoir besoin de le modifier) :"
 
-#: src/exercises/bare-metal/rtc.md:945
+#: src/exercises/bare-metal/rtc.md
 msgid "# Copyright 2023 Google LLC"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:959
+#: src/exercises/bare-metal/rtc.md
 msgid "$(shell uname -s)"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:961
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "aarch64-linux-gnu"
 msgstr "aarch64-paging"
 
-#: src/exercises/bare-metal/rtc.md:978
+#: src/exercises/bare-metal/rtc.md
 msgid "stdio -display none -kernel $< -s"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:981
+#: src/exercises/bare-metal/rtc.md
 msgid "cargo clean"
 msgstr ""
 
-#: src/exercises/bare-metal/rtc.md:995
+#: src/exercises/bare-metal/rtc.md
 #, fuzzy
 msgid "Run the code in QEMU with `make qemu`."
 msgstr "Exécutez le code dans QEMU avec `make qemu`."
 
-#: src/exercises/bare-metal/solutions-afternoon.md:1
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "Bare Metal Rust Afternoon"
 msgstr "Bare Metal Rust Après-midi"
 
-#: src/exercises/bare-metal/solutions-afternoon.md:5
+#: src/exercises/bare-metal/solutions-afternoon.md
 #, fuzzy
 msgid "([back to exercise](rtc.md))"
 msgstr "([retour à l'exercice](rtc.md))"
 
-#: src/exercises/bare-metal/solutions-afternoon.md:7
+#: src/exercises/bare-metal/solutions-afternoon.md
 #, fuzzy
 msgid "_main.rs_:"
 msgstr "`main.rs` :"
 
-#: src/exercises/bare-metal/solutions-afternoon.md:36
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Base address of the PL031 RTC.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:38
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// The IRQ used by the PL031 RTC.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:57
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "// Safe because `PL031_BASE_ADDRESS` is the base address of a PL031 device,\n"
 "    // and nothing else accesses that address range.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:62
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"RTC: {time}\""
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:70
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "// Wait for 3 seconds, without interrupts.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:74
-#: src/exercises/bare-metal/solutions-afternoon.md:95
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"Waiting for {}\""
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:78
-#: src/exercises/bare-metal/solutions-afternoon.md:86
-#: src/exercises/bare-metal/solutions-afternoon.md:102
-#: src/exercises/bare-metal/solutions-afternoon.md:110
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"matched={}, interrupt_pending={}\""
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:90
-#: src/exercises/bare-metal/solutions-afternoon.md:114
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "\"Finished waiting\""
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:92
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "// Wait another 3 seconds for an interrupt.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:127
+#: src/exercises/bare-metal/solutions-afternoon.md
 #, fuzzy
 msgid "_pl031.rs_:"
 msgstr "`pl031.rs` :"
 
-#: src/exercises/bare-metal/solutions-afternoon.md:134
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Data register\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:136
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Match register\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:138
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Load register\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:140
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Control register\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:143
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Interrupt Mask Set or Clear register\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:146
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Raw Interrupt Status\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:149
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Masked Interrupt Status\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:152
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Interrupt Clear Register\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:156
+#: src/exercises/bare-metal/solutions-afternoon.md
 #, fuzzy
 msgid "/// Driver for a PL031 real-time clock.\n"
 msgstr ""
 "Nous allons écrire un pilote pour le dispositif d'horloge en temps réel "
 "PL031."
 
-#: src/exercises/bare-metal/solutions-afternoon.md:164
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "/// Constructs a new instance of the RTC driver for a PL031 device at the\n"
 "    /// given base address.\n"
@@ -18608,35 +19280,30 @@ msgid ""
 "    /// as device memory and not have any other aliases.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:178
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Reads the current RTC value.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:180
-#: src/exercises/bare-metal/solutions-afternoon.md:188
-#: src/exercises/bare-metal/solutions-afternoon.md:196
-#: src/exercises/bare-metal/solutions-afternoon.md:207
-#: src/exercises/bare-metal/solutions-afternoon.md:219
-#: src/exercises/bare-metal/solutions-afternoon.md:226
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "// Safe because we know that self.registers points to the control\n"
 "        // registers of a PL031 device which is appropriately mapped.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:185
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "/// Writes a match value. When the RTC value matches this then an interrupt\n"
 "    /// will be generated (if it is enabled).\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:193
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "/// Returns whether the match register matches the RTC value, whether or "
 "not\n"
 "    /// the interrupt is enabled.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:202
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "/// Returns whether there is currently an interrupt pending.\n"
 "    ///\n"
@@ -18644,7 +19311,7 @@ msgid ""
 "    /// interrupt is masked.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:213
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid ""
 "/// Sets or clears the interrupt mask.\n"
 "    ///\n"
@@ -18653,16 +19320,16 @@ msgid ""
 "    /// interrupt is disabled.\n"
 msgstr ""
 
-#: src/exercises/bare-metal/solutions-afternoon.md:224
+#: src/exercises/bare-metal/solutions-afternoon.md
 msgid "/// Clears a pending interrupt, if any.\n"
 msgstr ""
 
-#: src/concurrency.md:1
+#: src/concurrency.md
 #, fuzzy
 msgid "Welcome to Concurrency in Rust"
 msgstr "Bienvenue à Comprehensive Rust(le guide complet de Rust) 🦀"
 
-#: src/concurrency.md:3
+#: src/concurrency.md
 #, fuzzy
 msgid ""
 "Rust has full support for concurrency using OS threads with mutexes and "
@@ -18671,7 +19338,7 @@ msgstr ""
 "Rust prend entièrement en charge la concurrence en utilisant des threads de "
 "système d'exploitation avec des mutex et canaux."
 
-#: src/concurrency.md:6
+#: src/concurrency.md
 #, fuzzy
 msgid ""
 "The Rust type system plays an important role in making many concurrency bugs "
@@ -18683,41 +19350,41 @@ msgstr ""
 "_concurrence sans peur_ puisque vous peut compter sur le compilateur pour "
 "assurer l'exactitude au moment de l'exécution."
 
-#: src/concurrency/threads.md:3
+#: src/concurrency/threads.md
 #, fuzzy
 msgid "Rust threads work similarly to threads in other languages:"
 msgstr ""
 "Les threads Rust fonctionnent de la même manière que les threads dans "
 "d'autres langages :"
 
-#: src/concurrency/threads.md:12
+#: src/concurrency/threads.md
 msgid "\"Count in thread: {i}!\""
 msgstr ""
 
-#: src/concurrency/threads.md:18
+#: src/concurrency/threads.md
 msgid "\"Main thread: {i}\""
 msgstr ""
 
-#: src/concurrency/threads.md:24
+#: src/concurrency/threads.md
 #, fuzzy
 msgid "Threads are all daemon threads, the main thread does not wait for them."
 msgstr ""
 "Les threads sont tous des threads démons, le thread principal ne les attend "
 "pas."
 
-#: src/concurrency/threads.md:25
+#: src/concurrency/threads.md
 #, fuzzy
 msgid "Thread panics are independent of each other."
 msgstr "Les thread panics sont indépendants les uns des autres."
 
-#: src/concurrency/threads.md:26
+#: src/concurrency/threads.md
 #, fuzzy
 msgid "Panics can carry a payload, which can be unpacked with `downcast_ref`."
 msgstr ""
 "Les paniques peuvent transporter une charge utile, qui peut être "
 "décompressée avec `downcast_ref`."
 
-#: src/concurrency/threads.md:32
+#: src/concurrency/threads.md
 #, fuzzy
 msgid ""
 "Notice that the thread is stopped before it reaches 10 --- the main thread "
@@ -18726,7 +19393,7 @@ msgstr ""
 "Notez que le thread est arrêté avant d'atteindre 10 — le thread principal "
 "est pas attendre."
 
-#: src/concurrency/threads.md:35
+#: src/concurrency/threads.md
 #, fuzzy
 msgid ""
 "Use `let handle = thread::spawn(...)` and later `handle.join()` to wait for "
@@ -18735,13 +19402,13 @@ msgstr ""
 "Utilisez `let handle = thread::spawn(...)` et plus tard `handle.join()` pour "
 "attendre le fil pour finir."
 
-#: src/concurrency/threads.md:38
+#: src/concurrency/threads.md
 #, fuzzy
 msgid "Trigger a panic in the thread, notice how this doesn't affect `main`."
 msgstr ""
 "Déclenchez une panique dans le fil, notez que cela n'affecte pas `main`."
 
-#: src/concurrency/threads.md:40
+#: src/concurrency/threads.md
 #, fuzzy
 msgid ""
 "Use the `Result` return value from `handle.join()` to get access to the "
@@ -18751,12 +19418,12 @@ msgstr ""
 "Utilisez la valeur de retour `Result` de `handle.join()` pour accéder à la "
 "panique charge utile. C'est le bon moment pour parler de \\[`Tous`\\]."
 
-#: src/concurrency/scoped-threads.md:3
+#: src/concurrency/scoped-threads.md
 #, fuzzy
 msgid "Normal threads cannot borrow from their environment:"
 msgstr "Les threads normaux ne peuvent pas emprunter à leur environnement :"
 
-#: src/concurrency/scoped-threads.md:20
+#: src/concurrency/scoped-threads.md
 #, fuzzy
 msgid ""
 "However, you can use a [scoped thread](https://doc.rust-lang.org/std/thread/"
@@ -18765,7 +19432,7 @@ msgstr ""
 "Cependant, vous pouvez utiliser un [fil de discussion de portée](https://doc."
 "rust-lang.org/std/thread/fn.scope.html) pour cela :"
 
-#: src/concurrency/scoped-threads.md:40
+#: src/concurrency/scoped-threads.md
 #, fuzzy
 msgid ""
 "The reason for that is that when the `thread::scope` function completes, all "
@@ -18775,7 +19442,7 @@ msgstr ""
 "les threads sont garantis d'être joints, afin qu'ils puissent renvoyer des "
 "données empruntées."
 
-#: src/concurrency/scoped-threads.md:41
+#: src/concurrency/scoped-threads.md
 #, fuzzy
 msgid ""
 "Normal Rust borrowing rules apply: you can either borrow mutably by one "
@@ -18785,7 +19452,7 @@ msgstr ""
 "emprunter de manière mutable par un thread, soit de manière immuable par "
 "n'importe quel nombre de threads."
 
-#: src/concurrency/channels.md:3
+#: src/concurrency/channels.md
 #, fuzzy
 msgid ""
 "Rust channels have two parts: a `Sender<T>` and a `Receiver<T>`. The two "
@@ -18795,12 +19462,11 @@ msgstr ""
 "deux parties sont connectés via le canal, mais vous ne voyez que les "
 "extrémités."
 
-#: src/concurrency/channels.md:15 src/concurrency/channels.md:16
-#: src/concurrency/channels.md:20
+#: src/concurrency/channels.md
 msgid "\"Received: {:?}\""
 msgstr ""
 
-#: src/concurrency/channels.md:26
+#: src/concurrency/channels.md
 #, fuzzy
 msgid ""
 "`mpsc` stands for Multi-Producer, Single-Consumer. `Sender` and `SyncSender` "
@@ -18811,7 +19477,7 @@ msgstr ""
 "implémentent `Clone` (donc vous pouvez créer plusieurs producteurs) mais "
 "`Receiver` ne le fait pas."
 
-#: src/concurrency/channels.md:28
+#: src/concurrency/channels.md
 #, fuzzy
 msgid ""
 "`send()` and `recv()` return `Result`. If they return `Err`, it means the "
@@ -18821,58 +19487,54 @@ msgstr ""
 "signifie que la contrepartie `Sender` ou `Receiver` est supprimé et le canal "
 "est fermé."
 
-#: src/concurrency/channels/unbounded.md:3
+#: src/concurrency/channels/unbounded.md
 #, fuzzy
 msgid "You get an unbounded and asynchronous channel with `mpsc::channel()`:"
 msgstr "Vous obtenez un canal illimité et asynchrone avec `mpsc::channel()` :"
 
-#: src/concurrency/channels/unbounded.md:16
-#: src/concurrency/channels/bounded.md:16
+#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md
 msgid "\"Message {i}\""
 msgstr ""
 
-#: src/concurrency/channels/unbounded.md:17
-#: src/concurrency/channels/bounded.md:17
+#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md
 msgid "\"{thread_id:?}: sent Message {i}\""
 msgstr ""
 
-#: src/concurrency/channels/unbounded.md:19
-#: src/concurrency/channels/bounded.md:19
+#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md
 msgid "\"{thread_id:?}: done\""
 msgstr ""
 
-#: src/concurrency/channels/unbounded.md:24
-#: src/concurrency/channels/bounded.md:24
+#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md
 msgid "\"Main: got {msg}\""
 msgstr ""
 
-#: src/concurrency/channels/bounded.md:3
+#: src/concurrency/channels/bounded.md
 #, fuzzy
 msgid ""
 "With bounded (synchronous) channels, `send` can block the current thread:"
 msgstr ""
 "Les canaux bornés et synchrones font que \"send\" bloque le thread actuel :"
 
-#: src/concurrency/channels/bounded.md:31
+#: src/concurrency/channels/bounded.md
 msgid ""
 "Calling `send` will block the current thread until there is space in the "
 "channel for the new message. The thread can be blocked indefinitely if there "
 "is nobody who reads from the channel."
 msgstr ""
 
-#: src/concurrency/channels/bounded.md:32
+#: src/concurrency/channels/bounded.md
 msgid ""
 "A call to `send` will abort with an error (that is why it returns `Result`) "
 "if the channel is closed. A channel is closed when the receiver is dropped."
 msgstr ""
 
-#: src/concurrency/channels/bounded.md:33
+#: src/concurrency/channels/bounded.md
 msgid ""
 "A bounded channel with a size of zero is called a \"rendezvous channel\". "
 "Every send will block the current thread until another thread calls `read`."
 msgstr ""
 
-#: src/concurrency/send-sync.md:3
+#: src/concurrency/send-sync.md
 #, fuzzy
 msgid ""
 "How does Rust know to forbid shared access across threads? The answer is in "
@@ -18881,7 +19543,7 @@ msgstr ""
 "Comment Rust sait-il interdire l'accès partagé à travers le thread? La "
 "réponse est en deux traits :"
 
-#: src/concurrency/send-sync.md:5
+#: src/concurrency/send-sync.md
 #, fuzzy
 msgid ""
 "[`Send`](https://doc.rust-lang.org/std/marker/trait.Send.html): a type `T` "
@@ -18890,7 +19552,7 @@ msgstr ""
 "[`Send`](https://doc.rust-lang.org/std/marker/trait.Send.html) : un type `T` "
 "est `Send` s'il est sûr de déplacer un `T` à travers un thread frontière."
 
-#: src/concurrency/send-sync.md:7
+#: src/concurrency/send-sync.md
 #, fuzzy
 msgid ""
 "[`Sync`](https://doc.rust-lang.org/std/marker/trait.Sync.html): a type `T` "
@@ -18899,7 +19561,7 @@ msgstr ""
 "[`Sync`](https://doc.rust-lang.org/std/marker/trait.Sync.html) : un type `T` "
 "est `Sync` s'il est sûr de déplacer un `&T` à travers un thread frontière."
 
-#: src/concurrency/send-sync.md:10
+#: src/concurrency/send-sync.md
 #, fuzzy
 msgid ""
 "`Send` and `Sync` are [unsafe traits](../unsafe/unsafe-traits.md). The "
@@ -18913,7 +19575,7 @@ msgstr ""
 "pouvez également les implémenter manuellement lorsque vous sachez qu'il est "
 "valide."
 
-#: src/concurrency/send-sync.md:20
+#: src/concurrency/send-sync.md
 #, fuzzy
 msgid ""
 "One can think of these traits as markers that the type has certain thread-"
@@ -18922,14 +19584,14 @@ msgstr ""
 "On peut considérer ces traits comme des marqueurs indiquant que le type "
 "possède certaines propriétés de sécurité des threads."
 
-#: src/concurrency/send-sync.md:21
+#: src/concurrency/send-sync.md
 #, fuzzy
 msgid "They can be used in the generic constraints as normal traits."
 msgstr ""
 "Ils peuvent être utilisés dans les contraintes génériques comme des traits "
 "normaux."
 
-#: src/concurrency/send-sync/send.md:3
+#: src/concurrency/send-sync/send.md
 #, fuzzy
 msgid ""
 "A type `T` is [`Send`](https://doc.rust-lang.org/std/marker/trait.Send.html) "
@@ -18938,7 +19600,7 @@ msgstr ""
 "Un type `T` est [`Send`](https://doc.rust-lang.org/std/marker/trait.Send."
 "html) s'il est sûr de déplacer une valeur `T` vers un autre thread."
 
-#: src/concurrency/send-sync/send.md:5
+#: src/concurrency/send-sync/send.md
 #, fuzzy
 msgid ""
 "The effect of moving ownership to another thread is that _destructors_ will "
@@ -18949,13 +19611,13 @@ msgstr ""
 "_destructors_ s'exécutera dans ce fil. La question est donc de savoir quand "
 "vous pouvez allouer une valeur dans un thread et le désallouer dans un autre."
 
-#: src/concurrency/send-sync/send.md:13
+#: src/concurrency/send-sync/send.md
 msgid ""
 "As an example, a connection to the SQLite library must only be accessed from "
 "a single thread."
 msgstr ""
 
-#: src/concurrency/send-sync/sync.md:3
+#: src/concurrency/send-sync/sync.md
 #, fuzzy
 msgid ""
 "A type `T` is [`Sync`](https://doc.rust-lang.org/std/marker/trait.Sync.html) "
@@ -18965,17 +19627,17 @@ msgstr ""
 "html) s'il est sûr d'accéder à une valeur `T` à partir de plusieurs fils en "
 "même temps."
 
-#: src/concurrency/send-sync/sync.md:6
+#: src/concurrency/send-sync/sync.md
 #, fuzzy
 msgid "More precisely, the definition is:"
 msgstr "Plus précisément, la définition est :"
 
-#: src/concurrency/send-sync/sync.md:8
+#: src/concurrency/send-sync/sync.md
 #, fuzzy
 msgid "`T` is `Sync` if and only if `&T` is `Send`"
 msgstr "`T` est `Sync` si et seulement si `&T` est `Envoyer`"
 
-#: src/concurrency/send-sync/sync.md:14
+#: src/concurrency/send-sync/sync.md
 #, fuzzy
 msgid ""
 "This statement is essentially a shorthand way of saying that if a type is "
@@ -18986,7 +19648,7 @@ msgstr ""
 "type est thread-safe pour une utilisation partagée, il est également thread-"
 "safe pour en passer des références à travers les threads."
 
-#: src/concurrency/send-sync/sync.md:16
+#: src/concurrency/send-sync/sync.md
 #, fuzzy
 msgid ""
 "This is because if a type is Sync it means that it can be shared across "
@@ -19002,41 +19664,41 @@ msgstr ""
 "autre thread, car les données auxquelles elle fait référence sont "
 "accessibles à partir de n'importe quel thread en toute sécurité."
 
-#: src/concurrency/send-sync/examples.md:3
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`Send + Sync`"
 msgstr "`Envoyer + Synchroniser`"
 
-#: src/concurrency/send-sync/examples.md:5
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "Most types you come across are `Send + Sync`:"
 msgstr "La plupart des types que vous rencontrez sont `Send + Sync` :"
 
-#: src/concurrency/send-sync/examples.md:7
+#: src/concurrency/send-sync/examples.md
 msgid "`i8`, `f32`, `bool`, `char`, `&str`, ..."
 msgstr ""
 
-#: src/concurrency/send-sync/examples.md:8
+#: src/concurrency/send-sync/examples.md
 msgid "`(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ..."
 msgstr ""
 
-#: src/concurrency/send-sync/examples.md:9
+#: src/concurrency/send-sync/examples.md
 msgid "`String`, `Option<T>`, `Vec<T>`, `Box<T>`, ..."
 msgstr ""
 
-#: src/concurrency/send-sync/examples.md:10
+#: src/concurrency/send-sync/examples.md
 msgid "`Arc<T>`: Explicitly thread-safe via atomic reference count."
 msgstr ""
 
-#: src/concurrency/send-sync/examples.md:11
+#: src/concurrency/send-sync/examples.md
 msgid "`Mutex<T>`: Explicitly thread-safe via internal locking."
 msgstr ""
 
-#: src/concurrency/send-sync/examples.md:12
+#: src/concurrency/send-sync/examples.md
 msgid "`AtomicBool`, `AtomicU8`, ...: Uses special atomic instructions."
 msgstr ""
 
-#: src/concurrency/send-sync/examples.md:14
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid ""
 "The generic types are typically `Send + Sync` when the type parameters are "
@@ -19045,12 +19707,12 @@ msgstr ""
 "Les types génériques sont généralement \"Send + Sync\" lorsque les "
 "paramètres de type sont `Envoyer + Synchroniser`."
 
-#: src/concurrency/send-sync/examples.md:17
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`Send + !Sync`"
 msgstr "`Envoyer + !Sync`"
 
-#: src/concurrency/send-sync/examples.md:19
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid ""
 "These types can be moved to other threads, but they're not thread-safe. "
@@ -19059,32 +19721,32 @@ msgstr ""
 "Ces types peuvent être déplacés vers d'autres threads, mais ils ne sont pas "
 "thread-safe. Typiquement à cause de la mutabilité intérieure :"
 
-#: src/concurrency/send-sync/examples.md:22
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`mpsc::Sender<T>`"
 msgstr "`mpsc::Expéditeur<T>`"
 
-#: src/concurrency/send-sync/examples.md:23
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`mpsc::Receiver<T>`"
 msgstr "`mpsc::Récepteur<T>`"
 
-#: src/concurrency/send-sync/examples.md:24
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`Cell<T>`"
 msgstr "`Cellule<T>`"
 
-#: src/concurrency/send-sync/examples.md:25
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`RefCell<T>`"
 msgstr "`RefCell<T>`"
 
-#: src/concurrency/send-sync/examples.md:27
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`!Send + Sync`"
 msgstr "` !Envoyer + Synchroniser`"
 
-#: src/concurrency/send-sync/examples.md:29
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid ""
 "These types are thread-safe, but they cannot be moved to another thread:"
@@ -19092,7 +19754,7 @@ msgstr ""
 "Ces types sont thread-safe, mais ils ne peuvent pas être déplacés vers un "
 "autre thread :"
 
-#: src/concurrency/send-sync/examples.md:31
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid ""
 "`MutexGuard<T: Sync>`: Uses OS level primitives which must be deallocated on "
@@ -19101,19 +19763,19 @@ msgstr ""
 "`MutexGuard<T>` : utilise des primitives au niveau du système d'exploitation "
 "qui doivent être désallouées sur le fil qui les a créés."
 
-#: src/concurrency/send-sync/examples.md:34
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "`!Send + !Sync`"
 msgstr "`!Envoyer + !Synchroniser`"
 
-#: src/concurrency/send-sync/examples.md:36
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid "These types are not thread-safe and cannot be moved to other threads:"
 msgstr ""
 "Ces types ne sont pas thread-safe et ne peuvent pas être déplacés vers "
 "d'autres threads :"
 
-#: src/concurrency/send-sync/examples.md:38
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid ""
 "`Rc<T>`: each `Rc<T>` has a reference to an `RcBox<T>`, which contains a non-"
@@ -19122,7 +19784,7 @@ msgstr ""
 "`Rc<T>` : chaque `Rc<T>` a une référence à un `RcBox<T>`, qui contient un "
 "comptage de référence non atomique."
 
-#: src/concurrency/send-sync/examples.md:40
+#: src/concurrency/send-sync/examples.md
 #, fuzzy
 msgid ""
 "`*const T`, `*mut T`: Rust assumes raw pointers may have special concurrency "
@@ -19131,7 +19793,7 @@ msgstr ""
 "`*const T`, `*mut T` : Rust suppose que les pointeurs bruts peuvent avoir "
 "des considérations de concurrence."
 
-#: src/concurrency/shared_state.md:3
+#: src/concurrency/shared_state.md
 #, fuzzy
 msgid ""
 "Rust uses the type system to enforce synchronization of shared data. This is "
@@ -19140,7 +19802,7 @@ msgstr ""
 "Rust utilise le système de type pour appliquer la synchronisation des "
 "données partagées. C'est se fait principalement via deux types:"
 
-#: src/concurrency/shared_state.md:6
+#: src/concurrency/shared_state.md
 #, fuzzy
 msgid ""
 "[`Arc<T>`](https://doc.rust-lang.org/std/sync/struct.Arc.html), atomic "
@@ -19151,7 +19813,7 @@ msgstr ""
 "atomique comptée `T` : gère le partage entre les threads et prend soin de "
 "désallouer 'T' lorsque la dernière référence est supprimée,"
 
-#: src/concurrency/shared_state.md:8
+#: src/concurrency/shared_state.md
 #, fuzzy
 msgid ""
 "[`Mutex<T>`](https://doc.rust-lang.org/std/sync/struct.Mutex.html): ensures "
@@ -19160,7 +19822,7 @@ msgstr ""
 "[`Mutex<T>`](https://doc.rust-lang.org/std/sync/struct.Mutex.html) : "
 "garantit un accès mutuellement exclusif à la valeur `T`."
 
-#: src/concurrency/shared_state/arc.md:3
+#: src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid ""
 "[`Arc<T>`](https://doc.rust-lang.org/std/sync/struct.Arc.html) allows shared "
@@ -19169,17 +19831,15 @@ msgstr ""
 "[`Arc<T>`](https://doc.rust-lang.org/std/sync/struct.Arc.html) permet un "
 "accès partagé en lecture seule via sa méthode `clone` :"
 
-#: src/concurrency/shared_state/arc.md:16
+#: src/concurrency/shared_state/arc.md
 msgid "\"{thread_id:?}: {v:?}\""
 msgstr ""
 
-#: src/concurrency/shared_state/arc.md:21
-#: src/concurrency/shared_state/example.md:17
-#: src/concurrency/shared_state/example.md:45
+#: src/concurrency/shared_state/arc.md src/concurrency/shared_state/example.md
 msgid "\"v: {v:?}\""
 msgstr ""
 
-#: src/concurrency/shared_state/arc.md:29
+#: src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid ""
 "`Arc` stands for \"Atomic Reference Counted\", a thread safe version of `Rc` "
@@ -19188,7 +19848,7 @@ msgstr ""
 "`Arc` signifie \"Atomic Reference Counted\", une version thread-safe de `Rc` "
 "qui utilise opérations."
 
-#: src/concurrency/shared_state/arc.md:31
+#: src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid ""
 "`Arc<T>` implements `Clone` whether or not `T` does. It implements `Send` "
@@ -19197,7 +19857,7 @@ msgstr ""
 "`Arc<T>` implémente `Clone` que `T` le fasse ou non. Il implémente `Send` et "
 "`Sync` ssi `T` les met en œuvre tous les deux."
 
-#: src/concurrency/shared_state/arc.md:33
+#: src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid ""
 "`Arc::clone()` has the cost of atomic operations that get executed, but "
@@ -19206,7 +19866,7 @@ msgstr ""
 "`Arc::clone()` a le coût des opérations atomiques qui sont exécutées, mais "
 "après cela, l'utilisation du 'T' est libre."
 
-#: src/concurrency/shared_state/arc.md:35
+#: src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid ""
 "Beware of reference cycles, `Arc` does not use a garbage collector to detect "
@@ -19215,28 +19875,28 @@ msgstr ""
 "Méfiez-vous des cycles de référence, `Arc` n'utilise pas de ramasse-miettes "
 "pour les détecter."
 
-#: src/concurrency/shared_state/arc.md:36
+#: src/concurrency/shared_state/arc.md
 #, fuzzy
 msgid "`std::sync::Weak` can help."
 msgstr "`std::sync::Weak` peut aider."
 
-#: src/concurrency/shared_state/mutex.md:3
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "[`Mutex<T>`](https://doc.rust-lang.org/std/sync/struct.Mutex.html) ensures "
 "mutual exclusion _and_ allows mutable access to `T` behind a read-only "
-"interface:"
+"interface (another form of [interior mutability](../../borrowing/interior-"
+"mutability)):"
 msgstr ""
 "[`Mutex<T>`](https://doc.rust-lang.org/std/sync/struct.Mutex.html) garantit "
 "l'exclusion mutuelle _et_ permet un accès mutable à `T` derrière une "
 "interface en lecture seule :"
 
-#: src/concurrency/shared_state/mutex.md:11
-#: src/concurrency/shared_state/mutex.md:18
+#: src/concurrency/shared_state/mutex.md
 msgid "\"v: {:?}\""
 msgstr ""
 
-#: src/concurrency/shared_state/mutex.md:22
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "Notice how we have a [`impl<T: Send> Sync for Mutex<T>`](https://doc.rust-"
@@ -19247,7 +19907,7 @@ msgstr ""
 "Mutex<T>`](https://doc.rust-lang.org/std/sync/struct.Mutex.html#impl-Sync-"
 "for-Mutex%3CT%3E) mise en œuvre."
 
-#: src/concurrency/shared_state/mutex.md:31
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "`Mutex` in Rust looks like a collection with just one element --- the "
@@ -19256,7 +19916,7 @@ msgstr ""
 "`Mutex` dans Rust ressemble à une collection avec un seul élément - les "
 "données protégées."
 
-#: src/concurrency/shared_state/mutex.md:32
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "It is not possible to forget to acquire the mutex before accessing the "
@@ -19265,7 +19925,7 @@ msgstr ""
 "Il n'est pas possible d'oublier d'acquérir le mutex avant d'accéder aux "
 "données protégées."
 
-#: src/concurrency/shared_state/mutex.md:33
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "You can get an `&mut T` from an `&Mutex<T>` by taking the lock. The "
@@ -19275,7 +19935,7 @@ msgstr ""
 "verrou. Le `MutexGuard` garantit que le `&mut T` ne survit pas au "
 "verrouillage en cours."
 
-#: src/concurrency/shared_state/mutex.md:35
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "`Mutex<T>` implements both `Send` and `Sync` iff (if and only if) `T` "
@@ -19283,17 +19943,17 @@ msgid ""
 msgstr ""
 "`Mutex<T>` implémente à la fois `Send` et `Sync` ssi `T` implémente `Send`."
 
-#: src/concurrency/shared_state/mutex.md:36
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid "A read-write lock counterpart: `RwLock`."
 msgstr "Un homologue de verrouillage en lecture-écriture - `RwLock`."
 
-#: src/concurrency/shared_state/mutex.md:37
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
-msgid "Why does `lock()` return a `Result`? "
+msgid "Why does `lock()` return a `Result`?"
 msgstr "Pourquoi `lock()` renvoie-t-il un `Result` ?"
 
-#: src/concurrency/shared_state/mutex.md:38
+#: src/concurrency/shared_state/mutex.md
 #, fuzzy
 msgid ""
 "If the thread that held the `Mutex` panicked, the `Mutex` becomes "
@@ -19309,26 +19969,26 @@ msgstr ""
 "html). Vous pouvez appeler `into_inner()` sur l'erreur pour récupérer les "
 "données indépendamment de."
 
-#: src/concurrency/shared_state/example.md:3
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid "Let us see `Arc` and `Mutex` in action:"
 msgstr "Voyons `Arc` et `Mutex` en action :"
 
-#: src/concurrency/shared_state/example.md:6
+#: src/concurrency/shared_state/example.md
 msgid "// use std::sync::{Arc, Mutex};\n"
 msgstr ""
 
-#: src/concurrency/shared_state/example.md:23
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid "Possible solution:"
 msgstr "Solution possible:"
 
-#: src/concurrency/shared_state/example.md:49
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid "Notable parts:"
 msgstr "Parties notables :"
 
-#: src/concurrency/shared_state/example.md:51
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid ""
 "`v` is wrapped in both `Arc` and `Mutex`, because their concerns are "
@@ -19337,7 +19997,7 @@ msgstr ""
 "`v` est enveloppé à la fois dans `Arc` et `Mutex`, car leurs préoccupations "
 "sont orthogonales."
 
-#: src/concurrency/shared_state/example.md:52
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid ""
 "Wrapping a `Mutex` in an `Arc` is a common pattern to share mutable state "
@@ -19346,7 +20006,7 @@ msgstr ""
 "Envelopper un `Mutex` dans un `Arc` est un modèle courant pour partager un "
 "état mutable entre les threads."
 
-#: src/concurrency/shared_state/example.md:53
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid ""
 "`v: Arc<_>` needs to be cloned as `v2` before it can be moved into another "
@@ -19355,7 +20015,7 @@ msgstr ""
 "`v: Arc<_>` doit être cloné en tant que `v2` avant de pouvoir être déplacé "
 "dans un autre thread. Remarque \"move\" a été ajouté à la signature lambda."
 
-#: src/concurrency/shared_state/example.md:54
+#: src/concurrency/shared_state/example.md
 #, fuzzy
 msgid ""
 "Blocks are introduced to narrow the scope of the `LockGuard` as much as "
@@ -19364,18 +20024,18 @@ msgstr ""
 "Des blocs sont introduits pour réduire autant que possible la portée du "
 "\"LockGuard\"."
 
-#: src/exercises/concurrency/morning.md:3
+#: src/exercises/concurrency/morning.md
 #, fuzzy
 msgid "Let us practice our new concurrency skills with"
 msgstr ""
 "Mettons en pratique nos nouvelles compétences en matière de concurrence avec"
 
-#: src/exercises/concurrency/morning.md:5
+#: src/exercises/concurrency/morning.md
 #, fuzzy
 msgid "Dining philosophers: a classic problem in concurrency."
 msgstr "Dîner des philosophes : un problème classique de la concurrence."
 
-#: src/exercises/concurrency/morning.md:7
+#: src/exercises/concurrency/morning.md
 #, fuzzy
 msgid ""
 "Multi-threaded link checker: a larger project where you'll use Cargo to "
@@ -19385,14 +20045,14 @@ msgstr ""
 "utiliserez Cargo pour télécharger les dépendances puis vérifier les liens en "
 "parallèle."
 
-#: src/exercises/concurrency/dining-philosophers.md:3
+#: src/exercises/concurrency/dining-philosophers.md
 #, fuzzy
 msgid "The dining philosophers problem is a classic problem in concurrency:"
 msgstr ""
 "Le problème du dîner des philosophes est un problème classique en "
 "concurrence :"
 
-#: src/exercises/concurrency/dining-philosophers.md:5
+#: src/exercises/concurrency/dining-philosophers.md
 #, fuzzy
 msgid ""
 "Five philosophers dine together at the same table. Each philosopher has "
@@ -19414,7 +20074,7 @@ msgstr ""
 "pas. Après un philosophe individuel finit de manger, ils poseront les deux "
 "fourchettes."
 
-#: src/exercises/concurrency/dining-philosophers.md:13
+#: src/exercises/concurrency/dining-philosophers.md
 #, fuzzy
 msgid ""
 "You will need a local [Cargo installation](../../cargo/running-locally.md) "
@@ -19426,98 +20086,98 @@ msgstr ""
 "`src/main.rs`, remplissez le vides, et testez que `cargo run` ne se bloque "
 "pas :"
 
-#: src/exercises/concurrency/dining-philosophers.md:28
-#: src/exercises/concurrency/dining-philosophers-async.md:23
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/dining-philosophers-async.md
 msgid ""
 "// left_fork: ...\n"
 "    // right_fork: ...\n"
 "    // thoughts: ...\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:36
-#: src/exercises/concurrency/solutions-morning.md:24
-#: src/exercises/concurrency/dining-philosophers-async.md:31
-#: src/exercises/concurrency/solutions-afternoon.md:25
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Eureka! {} has a new idea!\""
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:41
-#: src/exercises/concurrency/dining-philosophers-async.md:36
-#: src/exercises/concurrency/solutions-afternoon.md:30
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Pick up forks...\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:42
-#: src/exercises/concurrency/solutions-morning.md:33
-#: src/exercises/concurrency/dining-philosophers-async.md:37
-#: src/exercises/concurrency/solutions-afternoon.md:37
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"{} is eating...\""
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:48
-#: src/exercises/concurrency/solutions-morning.md:39
-#: src/exercises/concurrency/dining-philosophers-async.md:43
-#: src/exercises/concurrency/solutions-afternoon.md:45
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "\"Socrates\""
 msgstr "caisses HAL"
 
-#: src/exercises/concurrency/dining-philosophers.md:48
-#: src/exercises/concurrency/solutions-morning.md:39
-#: src/exercises/concurrency/dining-philosophers-async.md:43
-#: src/exercises/concurrency/solutions-afternoon.md:45
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Hypatia\""
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:48
-#: src/exercises/concurrency/solutions-morning.md:39
-#: src/exercises/concurrency/dining-philosophers-async.md:43
-#: src/exercises/concurrency/solutions-afternoon.md:45
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Plato\""
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:48
-#: src/exercises/concurrency/solutions-morning.md:39
-#: src/exercises/concurrency/dining-philosophers-async.md:43
-#: src/exercises/concurrency/solutions-afternoon.md:45
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Aristotle\""
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:48
-#: src/exercises/concurrency/solutions-morning.md:39
-#: src/exercises/concurrency/dining-philosophers-async.md:43
-#: src/exercises/concurrency/solutions-afternoon.md:45
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/solutions-morning.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Pythagoras\""
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:51
-#: src/exercises/concurrency/dining-philosophers-async.md:47
-#: src/exercises/concurrency/solutions-afternoon.md:49
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Create forks\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:53
-#: src/exercises/concurrency/dining-philosophers-async.md:49
-#: src/exercises/concurrency/solutions-afternoon.md:53
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Create philosophers\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:55
+#: src/exercises/concurrency/dining-philosophers.md
 msgid "// Make each of them think and eat 100 times\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:57
-#: src/exercises/concurrency/dining-philosophers-async.md:53
-#: src/exercises/concurrency/solutions-afternoon.md:88
+#: src/exercises/concurrency/dining-philosophers.md
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Output their thoughts\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers.md:61
+#: src/exercises/concurrency/dining-philosophers.md
 #, fuzzy
 msgid "You can use the following `Cargo.toml`:"
 msgstr "Vous pouvez utiliser le fichier `Cargo.toml` suivant :"
 
-#: src/exercises/concurrency/dining-philosophers.md:65
+#: src/exercises/concurrency/dining-philosophers.md
 msgid ""
 "```toml\n"
 "[package]\n"
@@ -19527,7 +20187,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:3
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "Let us use our new knowledge to create a multi-threaded link checker. It "
@@ -19541,7 +20201,7 @@ msgstr ""
 "pages sur le même domaine et continuer à le faire jusqu'à ce que tous les "
 "pages ont été validées."
 
-#: src/exercises/concurrency/link-checker.md:8
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "For this, you will need an HTTP client such as [`reqwest`](https://docs.rs/"
@@ -19551,7 +20211,7 @@ msgstr ""
 "docs.rs/reqwest/). Créer un nouveau Projet Cargo et `reqwest` comme "
 "dépendance avec :"
 
-#: src/exercises/concurrency/link-checker.md:17
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "If `cargo add` fails with `error: no such subcommand`, then please edit the "
@@ -19561,7 +20221,7 @@ msgstr ""
 "Fichier `Cargo.toml` à la main. Ajoutez les dépendances répertoriées ci-"
 "dessous."
 
-#: src/exercises/concurrency/link-checker.md:20
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "You will also need a way to find links. We can use [`scraper`](https://docs."
@@ -19570,7 +20230,7 @@ msgstr ""
 "Vous aurez également besoin d'un moyen de trouver des liens. Nous pouvons "
 "utiliser [`scraper`](https://docs.rs/scraper/) pour cela :"
 
-#: src/exercises/concurrency/link-checker.md:26
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "Finally, we'll need some way of handling errors. We use [`thiserror`]"
@@ -19579,7 +20239,7 @@ msgstr ""
 "Enfin, nous aurons besoin d'un moyen de gérer les erreurs. Nous utilisons "
 "[`thiserror`](https://docs.rs/thiserror/) pour ce:"
 
-#: src/exercises/concurrency/link-checker.md:33
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "The `cargo add` calls will update the `Cargo.toml` file to look like this:"
@@ -19587,7 +20247,7 @@ msgstr ""
 "Les appels `cargo add` mettront à jour le fichier `Cargo.toml` pour qu'il "
 "ressemble à ceci :"
 
-#: src/exercises/concurrency/link-checker.md:37
+#: src/exercises/concurrency/link-checker.md
 msgid ""
 "```toml\n"
 "[package]\n"
@@ -19604,7 +20264,7 @@ msgid ""
 "```"
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:50
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "You can now download the start page. Try with a small site such as `https://"
@@ -19613,55 +20273,55 @@ msgstr ""
 "Vous pouvez maintenant télécharger la page de démarrage. Essayez avec un "
 "petit site comme `https://www.google.org/`."
 
-#: src/exercises/concurrency/link-checker.md:53
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid "Your `src/main.rs` file should look something like this:"
 msgstr "Votre fichier `src/main.rs` devrait ressembler à ceci :"
 
-#: src/exercises/concurrency/link-checker.md:64
-#: src/exercises/concurrency/solutions-morning.md:95
+#: src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"request error: {0}\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:66
-#: src/exercises/concurrency/solutions-morning.md:97
+#: src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"bad http response: {0}\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:77
-#: src/exercises/concurrency/solutions-morning.md:108
+#: src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"Checking {:#}\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:95
-#: src/exercises/concurrency/solutions-morning.md:126
+#: src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"href\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:102
-#: src/exercises/concurrency/solutions-morning.md:133
+#: src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"On {base_url:#}: ignored unparsable {href:?}: {err}\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:111
-#: src/exercises/concurrency/solutions-morning.md:249
+#: src/exercises/concurrency/link-checker.md
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"https://www.google.org\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:114
+#: src/exercises/concurrency/link-checker.md
 msgid "\"Links: {links:#?}\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:115
+#: src/exercises/concurrency/link-checker.md
 msgid "\"Could not extract links: {err:#}\""
 msgstr ""
 
-#: src/exercises/concurrency/link-checker.md:120
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid "Run the code in `src/main.rs` with"
 msgstr "Exécutez le code dans `src/main.rs` avec"
 
-#: src/exercises/concurrency/link-checker.md:128
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "Use threads to check the links in parallel: send the URLs to be checked to a "
@@ -19671,7 +20331,7 @@ msgstr ""
 "à vérifier à un channel et laissez quelques threads vérifier les URL en "
 "parallèle."
 
-#: src/exercises/concurrency/link-checker.md:130
+#: src/exercises/concurrency/link-checker.md
 #, fuzzy
 msgid ""
 "Extend this to recursively extract links from all pages on the `www.google."
@@ -19682,70 +20342,70 @@ msgstr ""
 "pages du domaine \"www.google.org\". Fixez une limite supérieure de 100 "
 "pages environ afin que vous ne finissez pas par être bloqué par le site."
 
-#: src/exercises/concurrency/solutions-morning.md:1
+#: src/exercises/concurrency/solutions-morning.md
 #, fuzzy
 msgid "Concurrency Morning Exercise"
 msgstr "Jour 3 Exercice du matin"
 
-#: src/exercises/concurrency/solutions-morning.md:5
+#: src/exercises/concurrency/solutions-morning.md
 #, fuzzy
 msgid "([back to exercise](dining-philosophers.md))"
 msgstr "([retour à l'exercice](dining-philosophers.md))"
 
-#: src/exercises/concurrency/solutions-morning.md:29
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"{} is trying to eat\""
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:53
+#: src/exercises/concurrency/solutions-morning.md
 msgid ""
 "// To avoid a deadlock, we have to break the symmetry\n"
 "        // somewhere. This will swap the forks without deinitializing\n"
 "        // either of them.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:77
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"{thought}\""
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:82
+#: src/exercises/concurrency/solutions-morning.md
 #, fuzzy
 msgid "Link Checker"
 msgstr "Vérificateur de liens à plusieurs threads"
 
-#: src/exercises/concurrency/solutions-morning.md:84
+#: src/exercises/concurrency/solutions-morning.md
 #, fuzzy
 msgid "([back to exercise](link-checker.md))"
 msgstr "([retour à l'exercice](luhn.md))"
 
-#: src/exercises/concurrency/solutions-morning.md:155
+#: src/exercises/concurrency/solutions-morning.md
 msgid ""
 "/// Determine whether links within the given page should be extracted.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:163
+#: src/exercises/concurrency/solutions-morning.md
 msgid ""
 "/// Mark the given page as visited, returning false if it had already\n"
 "    /// been visited.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:189
+#: src/exercises/concurrency/solutions-morning.md
 msgid "// The sender got dropped. No more commands coming in.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:233
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"Got crawling error: {:#}\""
 msgstr ""
 
-#: src/exercises/concurrency/solutions-morning.md:251
+#: src/exercises/concurrency/solutions-morning.md
 msgid "\"Bad URLs: {:#?}\""
 msgstr ""
 
-#: src/async.md:1
+#: src/async.md
 #, fuzzy
 msgid "Async Rust"
 msgstr "Pourquoi Rust ?"
 
-#: src/async.md:3
+#: src/async.md
 msgid ""
 "\"Async\" is a concurrency model where multiple tasks are executed "
 "concurrently by executing each task until it would block, then switching to "
@@ -19755,88 +20415,88 @@ msgid ""
 "primitives for efficiently identifying I/O that is able to proceed."
 msgstr ""
 
-#: src/async.md:10
+#: src/async.md
 msgid ""
 "Rust's asynchronous operation is based on \"futures\", which represent work "
 "that may be completed in the future. Futures are \"polled\" until they "
 "signal that they are complete."
 msgstr ""
 
-#: src/async.md:14
+#: src/async.md
 msgid ""
 "Futures are polled by an async runtime, and several different runtimes are "
 "available."
 msgstr ""
 
-#: src/async.md:19
+#: src/async.md
 msgid ""
 "Python has a similar model in its `asyncio`. However, its `Future` type is "
 "callback-based, and not polled. Async Python programs require a \"loop\", "
 "similar to a runtime in Rust."
 msgstr ""
 
-#: src/async.md:23
+#: src/async.md
 msgid ""
 "JavaScript's `Promise` is similar, but again callback-based. The language "
 "runtime implements the event loop, so many of the details of Promise "
 "resolution are hidden."
 msgstr ""
 
-#: src/async/async-await.md:3
+#: src/async/async-await.md
 msgid ""
 "At a high level, async Rust code looks very much like \"normal\" sequential "
 "code:"
 msgstr ""
 
-#: src/async/async-await.md:10
+#: src/async/async-await.md
 msgid "\"Count is: {i}!\""
 msgstr ""
 
-#: src/async/async-await.md:27
+#: src/async/async-await.md
 msgid ""
 "Note that this is a simplified example to show the syntax. There is no long "
 "running operation or any real concurrency in it!"
 msgstr ""
 
-#: src/async/async-await.md:30
+#: src/async/async-await.md
 msgid "What is the return type of an async call?"
 msgstr ""
 
-#: src/async/async-await.md:31
+#: src/async/async-await.md
 msgid "Use `let future: () = async_main(10);` in `main` to see the type."
 msgstr ""
 
-#: src/async/async-await.md:33
+#: src/async/async-await.md
 msgid ""
 "The \"async\" keyword is syntactic sugar. The compiler replaces the return "
-"type with a future. "
+"type with a future."
 msgstr ""
 
-#: src/async/async-await.md:36
+#: src/async/async-await.md
 msgid ""
 "You cannot make `main` async, without additional instructions to the "
 "compiler on how to use the returned future."
 msgstr ""
 
-#: src/async/async-await.md:39
+#: src/async/async-await.md
 msgid ""
 "You need an executor to run async code. `block_on` blocks the current thread "
-"until the provided future has run to completion. "
+"until the provided future has run to completion."
 msgstr ""
 
-#: src/async/async-await.md:42
+#: src/async/async-await.md
 msgid ""
 "`.await` asynchronously waits for the completion of another operation. "
 "Unlike `block_on`, `.await` doesn't block the current thread."
 msgstr ""
 
-#: src/async/async-await.md:45
+#: src/async/async-await.md
 msgid ""
 "`.await` can only be used inside an `async` function (or block; these are "
-"introduced later). "
+"introduced later)."
 msgstr ""
 
-#: src/async/futures.md:3
+#: src/async/futures.md
 msgid ""
 "[`Future`](https://doc.rust-lang.org/std/future/trait.Future.html) is a "
 "trait, implemented by objects that represent an operation that may not be "
@@ -19844,7 +20504,7 @@ msgid ""
 "doc.rust-lang.org/std/task/enum.Poll.html)."
 msgstr ""
 
-#: src/async/futures.md:23
+#: src/async/futures.md
 msgid ""
 "An async function returns an `impl Future`. It's also possible (but "
 "uncommon) to implement `Future` for your own types. For example, the "
@@ -19852,76 +20512,76 @@ msgid ""
 "joining to it."
 msgstr ""
 
-#: src/async/futures.md:27
+#: src/async/futures.md
 msgid ""
 "The `.await` keyword, applied to a Future, causes the current async function "
 "to pause until that Future is ready, and then evaluates to its output."
 msgstr ""
 
-#: src/async/futures.md:32
+#: src/async/futures.md
 msgid ""
 "The `Future` and `Poll` types are implemented exactly as shown; click the "
 "links to show the implementations in the docs."
 msgstr ""
 
-#: src/async/futures.md:35
+#: src/async/futures.md
 msgid ""
 "We will not get to `Pin` and `Context`, as we will focus on writing async "
 "code, rather than building new async primitives. Briefly:"
 msgstr ""
 
-#: src/async/futures.md:38
+#: src/async/futures.md
 msgid ""
 "`Context` allows a Future to schedule itself to be polled again when an "
 "event occurs."
 msgstr ""
 
-#: src/async/futures.md:41
+#: src/async/futures.md
 msgid ""
 "`Pin` ensures that the Future isn't moved in memory, so that pointers into "
 "that future remain valid. This is required to allow references to remain "
 "valid after an `.await`."
 msgstr ""
 
-#: src/async/runtimes.md:3
+#: src/async/runtimes.md
 msgid ""
 "A _runtime_ provides support for performing operations asynchronously (a "
 "_reactor_) and is responsible for executing futures (an _executor_). Rust "
 "does not have a \"built-in\" runtime, but several options are available:"
 msgstr ""
 
-#: src/async/runtimes.md:7
+#: src/async/runtimes.md
 msgid ""
 "[Tokio](https://tokio.rs/): performant, with a well-developed ecosystem of "
 "functionality like [Hyper](https://hyper.rs/) for HTTP or [Tonic](https://"
 "github.com/hyperium/tonic) for gRPC."
 msgstr ""
 
-#: src/async/runtimes.md:10
+#: src/async/runtimes.md
 msgid ""
 "[async-std](https://async.rs/): aims to be a \"std for async\", and includes "
 "a basic runtime in `async::task`."
 msgstr ""
 
-#: src/async/runtimes.md:12
+#: src/async/runtimes.md
 msgid "[smol](https://docs.rs/smol/latest/smol/): simple and lightweight"
 msgstr ""
 
-#: src/async/runtimes.md:14
+#: src/async/runtimes.md
 msgid ""
 "Several larger applications have their own runtimes. For example, [Fuchsia]"
 "(https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/src/lib/fuchsia-"
 "async/src/lib.rs) already has one."
 msgstr ""
 
-#: src/async/runtimes.md:20
+#: src/async/runtimes.md
 msgid ""
 "Note that of the listed runtimes, only Tokio is supported in the Rust "
 "playground. The playground also does not permit any I/O, so most interesting "
 "async things can't run in the playground."
 msgstr ""
 
-#: src/async/runtimes.md:24
+#: src/async/runtimes.md
 msgid ""
 "Futures are \"inert\" in that they do not do anything (not even start an I/O "
 "operation) unless there is an executor polling them. This differs from JS "
@@ -19929,66 +20589,66 @@ msgid ""
 "used."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:4
-msgid "Tokio provides: "
+#: src/async/runtimes/tokio.md
+msgid "Tokio provides:"
 msgstr ""
 
-#: src/async/runtimes/tokio.md:6
+#: src/async/runtimes/tokio.md
 msgid "A multi-threaded runtime for executing asynchronous code."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:7
+#: src/async/runtimes/tokio.md
 msgid "An asynchronous version of the standard library."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:8
+#: src/async/runtimes/tokio.md
 msgid "A large ecosystem of libraries."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:15
+#: src/async/runtimes/tokio.md
 msgid "\"Count in task: {i}!\""
 msgstr ""
 
-#: src/async/runtimes/tokio.md:25
+#: src/async/runtimes/tokio.md
 msgid "\"Main task: {i}\""
 msgstr ""
 
-#: src/async/runtimes/tokio.md:33
+#: src/async/runtimes/tokio.md
 msgid "With the `tokio::main` macro we can now make `main` async."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:35
+#: src/async/runtimes/tokio.md
 msgid "The `spawn` function creates a new, concurrent \"task\"."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:37
+#: src/async/runtimes/tokio.md
 msgid "Note: `spawn` takes a `Future`, you don't call `.await` on `count_to`."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:39
+#: src/async/runtimes/tokio.md
 msgid "**Further exploration:**"
 msgstr ""
 
-#: src/async/runtimes/tokio.md:41
+#: src/async/runtimes/tokio.md
 msgid ""
 "Why does `count_to` not (usually) get to 10? This is an example of async "
 "cancellation. `tokio::spawn` returns a handle which can be awaited to wait "
 "until it finishes."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:45
+#: src/async/runtimes/tokio.md
 msgid "Try `count_to(10).await` instead of spawning."
 msgstr ""
 
-#: src/async/runtimes/tokio.md:47
+#: src/async/runtimes/tokio.md
 msgid "Try awaiting the task returned from `tokio::spawn`."
 msgstr ""
 
-#: src/async/tasks.md:3
+#: src/async/tasks.md
 msgid "Rust has a task system, which is a form of lightweight threading."
 msgstr ""
 
-#: src/async/tasks.md:5
+#: src/async/tasks.md
 msgid ""
 "A task has a single top-level future which the executor polls to make "
 "progress. That future may have one or more nested futures that its `poll` "
@@ -19997,171 +20657,171 @@ msgid ""
 "and an I/O operation."
 msgstr ""
 
-#: src/async/tasks.md:16
-msgid "\"127.0.0.1:6142\""
+#: src/async/tasks.md
+msgid "\"127.0.0.1:0\""
 msgstr ""
 
-#: src/async/tasks.md:17
-msgid "\"listening on port 6142\""
+#: src/async/tasks.md
+msgid "\"listening on port {}\""
 msgstr ""
 
-#: src/async/tasks.md:22
+#: src/async/tasks.md
 msgid "\"connection from {addr:?}\""
 msgstr ""
 
-#: src/async/tasks.md:25
+#: src/async/tasks.md
 msgid "b\"Who are you?\\n\""
 msgstr ""
 
-#: src/async/tasks.md:26 src/async/tasks.md:37 src/async/tasks.md:43
-msgid "\"socket error: {e:?}\""
+#: src/async/tasks.md
+msgid "\"socket error\""
 msgstr ""
 
-#: src/async/tasks.md:34
+#: src/async/tasks.md
 msgid "\"Thanks for dialing in, {name}!\\n\""
 msgstr ""
 
-#: src/async/tasks.md:52 src/async/control-flow/join.md:36
+#: src/async/tasks.md src/async/control-flow/join.md
 msgid ""
 "Copy this example into your prepared `src/main.rs` and run it from there."
 msgstr ""
 
-#: src/async/tasks.md:54
+#: src/async/tasks.md
 msgid ""
 "Try connecting to it with a TCP connection tool like [nc](https://www.unix."
 "com/man-page/linux/1/nc/) or [telnet](https://www.unix.com/man-page/linux/1/"
 "telnet/)."
 msgstr ""
 
-#: src/async/tasks.md:56
+#: src/async/tasks.md
 msgid ""
 "Ask students to visualize what the state of the example server would be with "
 "a few connected clients. What tasks exist? What are their Futures?"
 msgstr ""
 
-#: src/async/tasks.md:59
+#: src/async/tasks.md
 msgid ""
 "This is the first time we've seen an `async` block. This is similar to a "
 "closure, but does not take any arguments. Its return value is a Future, "
-"similar to an `async fn`. "
+"similar to an `async fn`."
 msgstr ""
 
-#: src/async/tasks.md:63
+#: src/async/tasks.md
 msgid ""
 "Refactor the async block into a function, and improve the error handling "
-"using `?`. "
+"using `?`."
 msgstr ""
 
-#: src/async/channels.md:3
+#: src/async/channels.md
 msgid ""
 "Several crates have support for asynchronous channels. For instance `tokio`:"
 msgstr ""
 
-#: src/async/channels.md:13
+#: src/async/channels.md
 msgid "\"Received {count} pings so far.\""
 msgstr ""
 
-#: src/async/channels.md:16
+#: src/async/channels.md
 msgid "\"ping_handler complete\""
 msgstr ""
 
-#: src/async/channels.md:24
+#: src/async/channels.md
 msgid "\"Failed to send ping.\""
 msgstr ""
 
-#: src/async/channels.md:25
+#: src/async/channels.md
 msgid "\"Sent {} pings so far.\""
 msgstr ""
 
-#: src/async/channels.md:29
+#: src/async/channels.md
 msgid "\"Something went wrong in ping handler task.\""
 msgstr ""
 
-#: src/async/channels.md:35
+#: src/async/channels.md
 msgid "Change the channel size to `3` and see how it affects the execution."
 msgstr ""
 
-#: src/async/channels.md:37
+#: src/async/channels.md
 msgid ""
 "Overall, the interface is similar to the `sync` channels as seen in the "
 "[morning class](concurrency/channels.md)."
 msgstr ""
 
-#: src/async/channels.md:40
+#: src/async/channels.md
 msgid "Try removing the `std::mem::drop` call. What happens? Why?"
 msgstr ""
 
-#: src/async/channels.md:42
+#: src/async/channels.md
 msgid ""
 "The [Flume](https://docs.rs/flume/latest/flume/) crate has channels that "
 "implement both `sync` and `async` `send` and `recv`. This can be convenient "
 "for complex applications with both IO and heavy CPU processing tasks."
 msgstr ""
 
-#: src/async/channels.md:46
+#: src/async/channels.md
 msgid ""
 "What makes working with `async` channels preferable is the ability to "
 "combine them with other `future`s to combine them and create complex control "
 "flow."
 msgstr ""
 
-#: src/async/control-flow.md:1
+#: src/async/control-flow.md
 #, fuzzy
 msgid "Futures Control Flow"
 msgstr "Flux de contrôle"
 
-#: src/async/control-flow.md:3
+#: src/async/control-flow.md
 msgid ""
 "Futures can be combined together to produce concurrent compute flow graphs. "
 "We have already seen tasks, that function as independent threads of "
 "execution."
 msgstr ""
 
-#: src/async/control-flow.md:6
+#: src/async/control-flow.md
 msgid "[Join](control-flow/join.md)"
 msgstr ""
 
-#: src/async/control-flow.md:7
+#: src/async/control-flow.md
 msgid "[Select](control-flow/select.md)"
 msgstr ""
 
-#: src/async/control-flow/join.md:3
+#: src/async/control-flow/join.md
 msgid ""
 "A join operation waits until all of a set of futures are ready, and returns "
 "a collection of their results. This is similar to `Promise.all` in "
 "JavaScript or `asyncio.gather` in Python."
 msgstr ""
 
-#: src/async/control-flow/join.md:21
+#: src/async/control-flow/join.md
 msgid "\"https://google.com\""
 msgstr ""
 
-#: src/async/control-flow/join.md:22
+#: src/async/control-flow/join.md
 msgid "\"https://httpbin.org/ip\""
 msgstr ""
 
-#: src/async/control-flow/join.md:23
+#: src/async/control-flow/join.md
 msgid "\"https://play.rust-lang.org/\""
 msgstr ""
 
-#: src/async/control-flow/join.md:24
+#: src/async/control-flow/join.md
 msgid "\"BAD_URL\""
 msgstr ""
 
-#: src/async/control-flow/join.md:38
+#: src/async/control-flow/join.md
 msgid ""
 "For multiple futures of disjoint types, you can use `std::future::join!` but "
 "you must know how many futures you will have at compile time. This is "
 "currently in the `futures` crate, soon to be stabilised in `std::future`."
 msgstr ""
 
-#: src/async/control-flow/join.md:42
+#: src/async/control-flow/join.md
 msgid ""
 "The risk of `join` is that one of the futures may never resolve, this would "
-"cause your program to stall. "
+"cause your program to stall."
 msgstr ""
 
-#: src/async/control-flow/join.md:45
+#: src/async/control-flow/join.md
 msgid ""
 "You can also combine `join_all` with `join!` for instance to join all "
 "requests to an http service as well as a database query. Try adding a "
@@ -20170,7 +20830,7 @@ msgid ""
 "demonstrates `join!`."
 msgstr ""
 
-#: src/async/control-flow/select.md:3
+#: src/async/control-flow/select.md
 msgid ""
 "A select operation waits until any of a set of futures is ready, and "
 "responds to that future's result. In JavaScript, this is similar to `Promise."
@@ -20178,39 +20838,40 @@ msgid ""
 "FIRST_COMPLETED)`."
 msgstr ""
 
-#: src/async/control-flow/select.md:8
+#: src/async/control-flow/select.md
 msgid ""
 "Similar to a match statement, the body of `select!` has a number of arms, "
-"each of the form `pattern = future => statement`. When the `future` is "
-"ready, the `statement` is executed with the variables in `pattern` bound to "
-"the `future`'s result."
+"each of the form `pattern = future => statement`. When a `future` is ready, "
+"its return value is destructured by the `pattern`. The `statement` is then "
+"run with the resulting variables. The `statement` result becomes the result "
+"of the `select!` macro."
 msgstr ""
 
-#: src/async/control-flow/select.md:40
+#: src/async/control-flow/select.md
 msgid "\"Felix\""
 msgstr ""
 
-#: src/async/control-flow/select.md:42
+#: src/async/control-flow/select.md
 msgid "\"Failed to send cat.\""
 msgstr ""
 
-#: src/async/control-flow/select.md:47
+#: src/async/control-flow/select.md
 msgid "\"Rex\""
 msgstr ""
 
-#: src/async/control-flow/select.md:49
+#: src/async/control-flow/select.md
 msgid "\"Failed to send dog.\""
 msgstr ""
 
-#: src/async/control-flow/select.md:54
+#: src/async/control-flow/select.md
 msgid "\"Failed to receive winner\""
 msgstr ""
 
-#: src/async/control-flow/select.md:56
+#: src/async/control-flow/select.md
 msgid "\"Winner is {winner:?}\""
 msgstr ""
 
-#: src/async/control-flow/select.md:62
+#: src/async/control-flow/select.md
 msgid ""
 "In this example, we have a race between a cat and a dog. "
 "`first_animal_to_finish_race` listens to both channels and will pick "
@@ -20218,35 +20879,35 @@ msgid ""
 "that take 500ms."
 msgstr ""
 
-#: src/async/control-flow/select.md:67
+#: src/async/control-flow/select.md
 msgid ""
 "You can use `oneshot` channels in this example as the channels are supposed "
 "to receive only one `send`."
 msgstr ""
 
-#: src/async/control-flow/select.md:70
+#: src/async/control-flow/select.md
 msgid ""
 "Try adding a deadline to the race, demonstrating selecting different sorts "
 "of futures."
 msgstr ""
 
-#: src/async/control-flow/select.md:73
+#: src/async/control-flow/select.md
 msgid ""
 "Note that `select!` drops unmatched branches, which cancels their futures. "
 "It is easiest to use when every execution of `select!` creates new futures."
 msgstr ""
 
-#: src/async/control-flow/select.md:76
+#: src/async/control-flow/select.md
 msgid ""
 "An alternative is to pass `&mut future` instead of the future itself, but "
 "this can lead to issues, further discussed in the pinning slide."
 msgstr ""
 
-#: src/async/pitfalls.md:1
+#: src/async/pitfalls.md
 msgid "Pitfalls of async/await"
 msgstr ""
 
-#: src/async/pitfalls.md:3
+#: src/async/pitfalls.md
 msgid ""
 "Async / await provides convenient and efficient abstraction for concurrent "
 "asynchronous programming. However, the async/await model in Rust also comes "
@@ -20254,27 +20915,27 @@ msgid ""
 "chapter:"
 msgstr ""
 
-#: src/async/pitfalls.md:5
+#: src/async/pitfalls.md
 msgid "[Blocking the Executor](pitfalls/blocking-executor.md)"
 msgstr ""
 
-#: src/async/pitfalls.md:6
+#: src/async/pitfalls.md
 msgid "[Pin](pitfalls/pin.md)"
 msgstr ""
 
-#: src/async/pitfalls.md:7
+#: src/async/pitfalls.md
 msgid "[Async Traits](pitfalls/async-traits.md)"
 msgstr ""
 
-#: src/async/pitfalls.md:8
+#: src/async/pitfalls.md
 msgid "[Cancellation](pitfalls/cancellation.md)"
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:1
+#: src/async/pitfalls/blocking-executor.md
 msgid "Blocking the executor"
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:3
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "Most async runtimes only allow IO tasks to run concurrently. This means that "
 "CPU blocking tasks will block the executor and prevent other tasks from "
@@ -20282,39 +20943,39 @@ msgid ""
 "possible."
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:14
+#: src/async/pitfalls/blocking-executor.md
 msgid "\"future {id} slept for {duration_ms}ms, finished after {}ms\""
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:19
+#: src/async/pitfalls/blocking-executor.md
 msgid "\"current_thread\""
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:29
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "Run the code and see that the sleeps happen consecutively rather than "
 "concurrently."
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:32
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "The `\"current_thread\"` flavor puts all tasks on a single thread. This "
 "makes the effect more obvious, but the bug is still present in the multi-"
 "threaded flavor."
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:36
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "Switch the `std::thread::sleep` to `tokio::time::sleep` and await its result."
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:38
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "Another fix would be to `tokio::task::spawn_blocking` which spawns an actual "
 "thread and transforms its handle into a future without blocking the executor."
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:41
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "You should not think of tasks as OS threads. They do not map 1 to 1 and most "
 "executors will allow many tasks to run on a single OS thread. This is "
@@ -20324,116 +20985,146 @@ msgid ""
 "situations."
 msgstr ""
 
-#: src/async/pitfalls/blocking-executor.md:47
+#: src/async/pitfalls/blocking-executor.md
 msgid ""
 "Use sync mutexes with care. Holding a mutex over an `.await` may cause "
 "another task to block, and that task may be running on the same thread."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:3
+#: src/async/pitfalls/pin.md
 msgid ""
-"When you await a future, all local variables (that would ordinarily be "
-"stored on a stack frame) are instead stored in the Future for the current "
-"async block. If your future has pointers to data on the stack, those "
-"pointers might get invalidated. This is unsafe."
+"Async blocks and functions return types implementing the `Future` trait. The "
+"type returned is the result of a compiler transformation which turns local "
+"variables into data stored inside the future."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:8
+#: src/async/pitfalls/pin.md
 msgid ""
-"Therefore, you must guarantee that the addresses your future points to don't "
-"change. That is why we need to \"pin\" futures. Using the same future "
-"repeatedly in a `select!` often leads to issues with pinned values."
+"Some of those variables can hold pointers to other local variables. Because "
+"of that, the future should never be moved to a different memory location, as "
+"it would invalidate those pointers."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:16
+#: src/async/pitfalls/pin.md
+msgid ""
+"To prevent moving the future type in memory, it can only be polled through a "
+"pinned pointer. `Pin` is a wrapper around a reference that disallows all "
+"operations that would move the instance it points to into a different memory "
+"location."
+msgstr ""
+
+#: src/async/pitfalls/pin.md
 msgid ""
 "// A work item. In this case, just sleep for the given time and respond\n"
 "// with a message on the `respond_on` channel.\n"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:24
+#: src/async/pitfalls/pin.md
 msgid "// A worker which listens for work on a queue and performs it.\n"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:31
+#: src/async/pitfalls/pin.md
 msgid "// Pretend to work.\n"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:34
+#: src/async/pitfalls/pin.md
 msgid "\"failed to send response\""
 msgstr ""
 
-#: src/async/pitfalls/pin.md:37
+#: src/async/pitfalls/pin.md
 msgid "// TODO: report number of iterations every 100ms\n"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:41
+#: src/async/pitfalls/pin.md
 msgid "// A requester which requests work and waits for it to complete.\n"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:51
+#: src/async/pitfalls/pin.md
 msgid "\"failed to send on work queue\""
 msgstr ""
 
-#: src/async/pitfalls/pin.md:52
+#: src/async/pitfalls/pin.md
 msgid "\"failed waiting for response\""
 msgstr ""
 
-#: src/async/pitfalls/pin.md:61
+#: src/async/pitfalls/pin.md
 msgid "\"work result for iteration {i}: {resp}\""
 msgstr ""
 
-#: src/async/pitfalls/pin.md:68
+#: src/async/pitfalls/pin.md
 msgid ""
 "You may recognize this as an example of the actor pattern. Actors typically "
 "call `select!` in a loop."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:71
+#: src/async/pitfalls/pin.md
 msgid ""
 "This serves as a summation of a few of the previous lessons, so take your "
 "time with it."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:74
+#: src/async/pitfalls/pin.md
 msgid ""
 "Naively add a `_ = sleep(Duration::from_millis(100)) => { println!(..) }` to "
 "the `select!`. This will never execute. Why?"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:77
+#: src/async/pitfalls/pin.md
 msgid ""
 "Instead, add a `timeout_fut` containing that future outside of the `loop`:"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:88
+#: src/async/pitfalls/pin.md
 msgid ""
 "This still doesn't work. Follow the compiler errors, adding `&mut` to the "
 "`timeout_fut` in the `select!` to work around the move, then using `Box::"
 "pin`:"
 msgstr ""
 
-#: src/async/pitfalls/pin.md:102
+#: src/async/pitfalls/pin.md
 msgid ""
 "This compiles, but once the timeout expires it is `Poll::Ready` on every "
 "iteration (a fused future would help with this). Update to reset "
 "`timeout_fut` every time it expires."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:106
+#: src/async/pitfalls/pin.md
 msgid ""
 "Box allocates on the heap. In some cases, `std::pin::pin!` (only recently "
 "stabilized, with older code often using `tokio::pin!`) is also an option, "
 "but that is difficult to use for a future that is reassigned."
 msgstr ""
 
-#: src/async/pitfalls/pin.md:110
+#: src/async/pitfalls/pin.md
 msgid ""
 "Another alternative is to not use `pin` at all but spawn another task that "
 "will send to a `oneshot` channel every 100ms."
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:3
+#: src/async/pitfalls/pin.md
+msgid ""
+"Data that contains pointers to itself is called self-referential. Normally, "
+"the Rust borrow checker would prevent self-referential data from being "
+"moved, as the references cannot outlive the data they point to. However, the "
+"code transformation for async blocks and functions is not verified by the "
+"borrow checker."
+msgstr ""
+
+#: src/async/pitfalls/pin.md
+msgid ""
+"`Pin` is a wrapper around a reference. An object cannot be moved from its "
+"place using a pinned pointer. However, it can still be moved through an "
+"unpinned pointer."
+msgstr ""
+
+#: src/async/pitfalls/pin.md
+msgid ""
+"The `poll` method of the `Future` trait uses `Pin<&mut Self>` instead of "
+"`&mut Self` to refer to the instance. That's why it can only be called on a "
+"pinned pointer."
+msgstr ""
+
+#: src/async/pitfalls/async-traits.md
 msgid ""
 "Async methods in traits are not yet supported in the stable channel ([An "
 "experimental feature exists in nightly and should be stabilized in the mid "
@@ -20441,27 +21132,27 @@ msgid ""
 "nightly.html))"
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:5
+#: src/async/pitfalls/async-traits.md
 msgid ""
 "The crate [async_trait](https://docs.rs/async-trait/latest/async_trait/) "
 "provides a workaround through a macro:"
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:30
+#: src/async/pitfalls/async-traits.md
 msgid "\"running all sleepers..\""
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:34
+#: src/async/pitfalls/async-traits.md
 msgid "\"slept for {}ms\""
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:51
+#: src/async/pitfalls/async-traits.md
 msgid ""
 "`async_trait` is easy to use, but note that it's using heap allocations to "
 "achieve this. This heap allocation has performance overhead."
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:54
+#: src/async/pitfalls/async-traits.md
 msgid ""
 "The challenges in language support for `async trait` are deep Rust and "
 "probably not worth describing in-depth. Niko Matsakis did a good job of "
@@ -20470,13 +21161,13 @@ msgid ""
 "digging deeper."
 msgstr ""
 
-#: src/async/pitfalls/async-traits.md:60
+#: src/async/pitfalls/async-traits.md
 msgid ""
 "Try creating a new sleeper struct that will sleep for a random amount of "
 "time and adding it to the Vec."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:3
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "Dropping a future implies it can never be polled again. This is called "
 "_cancellation_ and it can occur at any `await` point. Care is needed to "
@@ -20484,101 +21175,101 @@ msgid ""
 "example, it shouldn't deadlock or lose data."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:35
+#: src/async/pitfalls/cancellation.md
 msgid "\"not UTF-8\""
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:51
+#: src/async/pitfalls/cancellation.md
 msgid "\"hi\\nthere\\n\""
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:57
+#: src/async/pitfalls/cancellation.md
 msgid "\"tick!\""
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:72
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "The compiler doesn't help with cancellation-safety. You need to read API "
 "documentation and consider what state your `async fn` holds."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:75
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "Unlike `panic` and `?`, cancellation is part of normal control flow (vs "
 "error-handling)."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:78
+#: src/async/pitfalls/cancellation.md
 msgid "The example loses parts of the string."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:80
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "Whenever the `tick()` branch finishes first, `next()` and its `buf` are "
 "dropped."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:82
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "`LinesReader` can be made cancellation-safe by making `buf` part of the "
 "struct:"
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:95
+#: src/async/pitfalls/cancellation.md
 msgid "// prefix buf and bytes with self.\n"
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:104
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "[`Interval::tick`](https://docs.rs/tokio/latest/tokio/time/struct.Interval."
 "html#method.tick) is cancellation-safe because it keeps track of whether a "
 "tick has been 'delivered'."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:107
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "[`AsyncReadExt::read`](https://docs.rs/tokio/latest/tokio/io/trait."
 "AsyncReadExt.html#method.read) is cancellation-safe because it either "
 "returns or doesn't read data."
 msgstr ""
 
-#: src/async/pitfalls/cancellation.md:110
+#: src/async/pitfalls/cancellation.md
 msgid ""
 "[`AsyncBufReadExt::read_line`](https://docs.rs/tokio/latest/tokio/io/trait."
 "AsyncBufReadExt.html#method.read_line) is similar to the example and _isn't_ "
 "cancellation-safe. See its documentation for details and alternatives."
 msgstr ""
 
-#: src/exercises/concurrency/afternoon.md:3
+#: src/exercises/concurrency/afternoon.md
 msgid ""
 "To practice your Async Rust skills, we have again two exercises for you:"
 msgstr ""
 
-#: src/exercises/concurrency/afternoon.md:5
+#: src/exercises/concurrency/afternoon.md
 msgid ""
 "Dining philosophers: we already saw this problem in the morning. This time "
 "you are going to implement it with Async Rust."
 msgstr ""
 
-#: src/exercises/concurrency/afternoon.md:8
+#: src/exercises/concurrency/afternoon.md
 msgid ""
 "A Broadcast Chat Application: this is a larger project that allows you "
 "experiment with more advanced Async Rust features."
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers-async.md:1
-#: src/exercises/concurrency/solutions-afternoon.md:3
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "Dining Philosophers --- Async"
 msgstr "Dîner des philosophes - Asynchrone"
 
-#: src/exercises/concurrency/dining-philosophers-async.md:3
+#: src/exercises/concurrency/dining-philosophers-async.md
 msgid ""
 "See [dining philosophers](dining-philosophers.md) for a description of the "
 "problem."
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers-async.md:6
+#: src/exercises/concurrency/dining-philosophers-async.md
 #, fuzzy
 msgid ""
 "As before, you will need a local [Cargo installation](../../cargo/running-"
@@ -20590,18 +21281,18 @@ msgstr ""
 "`src/main.rs`, remplissez le vides, et testez que `cargo run` ne se bloque "
 "pas :"
 
-#: src/exercises/concurrency/dining-philosophers-async.md:51
-#: src/exercises/concurrency/solutions-afternoon.md:77
+#: src/exercises/concurrency/dining-philosophers-async.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Make them think and eat\n"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers-async.md:57
+#: src/exercises/concurrency/dining-philosophers-async.md
 msgid ""
 "Since this time you are using Async Rust, you'll need a `tokio` dependency. "
 "You can use the following `Cargo.toml`:"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers-async.md:62
+#: src/exercises/concurrency/dining-philosophers-async.md
 msgid ""
 "```toml\n"
 "[package]\n"
@@ -20610,22 +21301,22 @@ msgid ""
 "edition = \"2021\"\n"
 "\n"
 "[dependencies]\n"
-"tokio = {version = \"1.26.0\", features = [\"sync\", \"time\", \"macros\", "
-"\"rt-multi-thread\"]}\n"
+"tokio = { version = \"1.26.0\", features = [\"sync\", \"time\", \"macros\", "
+"\"rt-multi-thread\"] }\n"
 "```"
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers-async.md:72
+#: src/exercises/concurrency/dining-philosophers-async.md
 msgid ""
 "Also note that this time you have to use the `Mutex` and the `mpsc` module "
 "from the `tokio` crate."
 msgstr ""
 
-#: src/exercises/concurrency/dining-philosophers-async.md:77
-msgid "Can you make your implementation single-threaded? "
+#: src/exercises/concurrency/dining-philosophers-async.md
+msgid "Can you make your implementation single-threaded?"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:3
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "In this exercise, we want to use our new knowledge to implement a broadcast "
 "chat application. We have a chat server that the clients connect to and "
@@ -20634,23 +21325,23 @@ msgid ""
 "that it receives to all the clients."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:9
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "For this, we use [a broadcast channel](https://docs.rs/tokio/latest/tokio/"
 "sync/broadcast/fn.channel.html) on the server, and [`tokio_websockets`]"
-"(https://docs.rs/tokio-websockets/0.4.0/tokio_websockets/) for the "
-"communication between the client and the server."
+"(https://docs.rs/tokio-websockets/) for the communication between the client "
+"and the server."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:13
+#: src/exercises/concurrency/chat-app.md
 msgid "Create a new Cargo project and add the following dependencies:"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:15
+#: src/exercises/concurrency/chat-app.md
 msgid "_Cargo.toml_:"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:19
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "```toml\n"
 "[package]\n"
@@ -20659,58 +21350,57 @@ msgid ""
 "edition = \"2021\"\n"
 "\n"
 "[dependencies]\n"
-"futures-util = { version = \"0.3.28\", features = [\"sink\"] }\n"
-"http = \"0.2.9\"\n"
+"futures-util = { version = \"0.3.30\", features = [\"sink\"] }\n"
+"http = \"1.0.0\"\n"
 "tokio = { version = \"1.28.1\", features = [\"full\"] }\n"
-"tokio-websockets = { version = \"0.4.0\", features = [\"client\", "
+"tokio-websockets = { version = \"0.5.1\", features = [\"client\", "
 "\"fastrand\", \"server\", \"sha1_smol\"] }\n"
 "```"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:32
+#: src/exercises/concurrency/chat-app.md
 msgid "The required APIs"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:33
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "You are going to need the following functions from `tokio` and "
-"[`tokio_websockets`](https://docs.rs/tokio-websockets/0.4.0/"
-"tokio_websockets/). Spend a few minutes to familiarize yourself with the "
-"API. "
+"[`tokio_websockets`](https://docs.rs/tokio-websockets/). Spend a few minutes "
+"to familiarize yourself with the API."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:37
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "[StreamExt::next()](https://docs.rs/futures-util/0.3.28/futures_util/stream/"
-"trait.StreamExt.html#method.next) implemented by `WebsocketStream`: for "
+"trait.StreamExt.html#method.next) implemented by `WebSocketStream`: for "
 "asynchronously reading messages from a Websocket Stream."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:39
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "[SinkExt::send()](https://docs.rs/futures-util/0.3.28/futures_util/sink/"
-"trait.SinkExt.html#method.send) implemented by `WebsocketStream`: for "
+"trait.SinkExt.html#method.send) implemented by `WebSocketStream`: for "
 "asynchronously sending messages on a Websocket Stream."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:41
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "[Lines::next_line()](https://docs.rs/tokio/latest/tokio/io/struct.Lines."
 "html#method.next_line): for asynchronously reading user messages from the "
 "standard input."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:43
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "[Sender::subscribe()](https://docs.rs/tokio/latest/tokio/sync/broadcast/"
 "struct.Sender.html#method.subscribe): for subscribing to a broadcast channel."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:46
+#: src/exercises/concurrency/chat-app.md
 msgid "Two binaries"
 msgstr "Deux binaires"
 
-#: src/exercises/concurrency/chat-app.md:48
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "Normally in a Cargo project, you can have only one binary, and one `src/main."
 "rs` file. In this project, we need two binaries. One for the client, and one "
@@ -20718,89 +21408,88 @@ msgid ""
 "but we are going to put them in a single Cargo project with two binaries. "
 "For this to work, the client and the server code should go under `src/bin` "
 "(see the [documentation](https://doc.rust-lang.org/cargo/reference/cargo-"
-"targets.html#binaries)). "
+"targets.html#binaries))."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:55
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "Copy the following server and client code into `src/bin/server.rs` and `src/"
 "bin/client.rs`, respectively. Your task is to complete these files as "
-"described below. "
+"described below."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:59
-#: src/exercises/concurrency/solutions-afternoon.md:99
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "_src/bin/server.rs_:"
 msgstr "`src/main.rs` :"
 
-#: src/exercises/concurrency/chat-app.md:78
-#: src/exercises/concurrency/chat-app.md:125
+#: src/exercises/concurrency/chat-app.md
 msgid "// TODO: For a hint, see the description of the task below.\n"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:86
-#: src/exercises/concurrency/solutions-afternoon.md:149
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"127.0.0.1:2000\""
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:87
-#: src/exercises/concurrency/solutions-afternoon.md:150
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"listening on port 2000\""
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:91
-#: src/exercises/concurrency/solutions-afternoon.md:154
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"New connection from {addr:?}\""
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:94
-#: src/exercises/concurrency/solutions-afternoon.md:157
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Wrap the raw TCP stream into a websocket.\n"
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:103
-#: src/exercises/concurrency/solutions-afternoon.md:166
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "_src/bin/client.rs_:"
 msgstr "`src/main.rs` :"
 
-#: src/exercises/concurrency/chat-app.md:117
-#: src/exercises/concurrency/solutions-afternoon.md:178
+#: src/exercises/concurrency/chat-app.md
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"ws://127.0.0.1:2000\""
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:130
+#: src/exercises/concurrency/chat-app.md
 #, fuzzy
 msgid "Running the binaries"
 msgstr "Exécution du parcours"
 
-#: src/exercises/concurrency/chat-app.md:131
+#: src/exercises/concurrency/chat-app.md
 #, fuzzy
 msgid "Run the server with:"
 msgstr "Exécutez l'exemple avec :"
 
-#: src/exercises/concurrency/chat-app.md:137
+#: src/exercises/concurrency/chat-app.md
 #, fuzzy
 msgid "and the client with:"
 msgstr "Exécutez l'exemple avec :"
 
-#: src/exercises/concurrency/chat-app.md:145
+#: src/exercises/concurrency/chat-app.md
 msgid "Implement the `handle_connection` function in `src/bin/server.rs`."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:146
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "Hint: Use `tokio::select!` for concurrently performing two tasks in a "
 "continuous loop. One task receives messages from the client and broadcasts "
 "them. The other sends messages received by the server to the client."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:149
+#: src/exercises/concurrency/chat-app.md
 msgid "Complete the main function in `src/bin/client.rs`."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:150
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "Hint: As before, use `tokio::select!` in a continuous loop for concurrently "
 "performing two tasks: (1) reading user messages from standard input and "
@@ -20808,76 +21497,76 @@ msgid ""
 "displaying them for the user."
 msgstr ""
 
-#: src/exercises/concurrency/chat-app.md:154
+#: src/exercises/concurrency/chat-app.md
 msgid ""
 "Optional: Once you are done, change the code to broadcast messages to all "
 "clients, but the sender of the message."
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:1
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "Concurrency Afternoon Exercise"
 msgstr "Exercices de l'après-midi du jour 1"
 
-#: src/exercises/concurrency/solutions-afternoon.md:5
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "([back to exercise](dining-philosophers-async.md))"
 msgstr "([retour à l'exercice](dining-philosophers.md))"
 
-#: src/exercises/concurrency/solutions-afternoon.md:32
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid ""
 "// Add a delay before picking the second fork to allow the execution\n"
 "        // to transfer to another task\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:40
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// The locks are dropped here\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:60
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid ""
 "// To avoid a deadlock, we have to break the symmetry\n"
 "            // somewhere. This will swap the forks without deinitializing\n"
 "            // either of them.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:74
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// tx is dropped here, so we don't need to explicitly drop it later\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:90
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Here is a thought: {thought}\""
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:97
+#: src/exercises/concurrency/solutions-afternoon.md
 #, fuzzy
 msgid "([back to exercise](chat-app.md))"
 msgstr "([retour à l'exercice](rtc.md))"
 
-#: src/exercises/concurrency/solutions-afternoon.md:117
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"Welcome to chat! Type a message\""
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:121
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid ""
 "// A continuous loop for concurrently performing two tasks: (1) receiving\n"
 "    // messages from `ws_stream` and broadcasting them, and (2) receiving\n"
 "    // messages on `bcast_rx` and sending them to the client.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:130
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"From client {addr:?} {text:?}\""
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:185
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "// Continuous loop for concurrently sending and receiving messages.\n"
 msgstr ""
 
-#: src/exercises/concurrency/solutions-afternoon.md:192
+#: src/exercises/concurrency/solutions-afternoon.md
 msgid "\"From server: {}\""
 msgstr ""
 
-#: src/thanks.md:3
+#: src/thanks.md
 msgid ""
 "_Thank you for taking Comprehensive Rust 🦀!_ We hope you enjoyed it and "
 "that it was useful."
@@ -20885,7 +21574,7 @@ msgstr ""
 "_Merci d'avoir pris Comprehensive Rust(le guide complet de Rust) 🦀!_ Nous "
 "espérons que vous l'avez apprécié et qu'il était utile."
 
-#: src/thanks.md:6
+#: src/thanks.md
 #, fuzzy
 msgid ""
 "We've had a lot of fun putting the course together. The course is not "
@@ -20899,184 +21588,185 @@ msgstr ""
 "(https://github.com/google/comprehensive-rust/discussions). Nous aimerions "
 "d'avoir de tes nouvelles."
 
-#: src/glossary.md:3
+#: src/glossary.md
 msgid ""
 "The following is a glossary which aims to give a short definition of many "
 "Rust terms. For translations, this also serves to connect the term back to "
 "the English original."
 msgstr ""
 
-#: src/glossary.md:30
+#: src/glossary.md
 msgid ""
 "allocate:  \n"
 "Dynamic memory allocation on [the heap](memory-management/stack-vs-heap.md)."
 msgstr ""
 
-#: src/glossary.md:32
+#: src/glossary.md
 msgid ""
 "argument:  \n"
 "Information that is passed into a function or method."
 msgstr ""
 
-#: src/glossary.md:34
+#: src/glossary.md
 msgid ""
 "Bare-metal Rust:  \n"
 "Low-level Rust development, often deployed to a system without an operating "
 "system. See [Bare-metal Rust](bare-metal.md)."
 msgstr ""
 
-#: src/glossary.md:37
+#: src/glossary.md
 msgid ""
 "block:  \n"
 "See [Blocks](control-flow/blocks.md) and _scope_."
 msgstr ""
 
-#: src/glossary.md:39
+#: src/glossary.md
 msgid ""
 "borrow:  \n"
 "See [Borrowing](ownership/borrowing.md)."
 msgstr ""
 
-#: src/glossary.md:41
+#: src/glossary.md
 msgid ""
 "borrow checker:  \n"
 "The part of the Rust compiler which checks that all borrows are valid."
 msgstr ""
 
-#: src/glossary.md:43
+#: src/glossary.md
 msgid ""
 "brace:  \n"
 "`{` and `}`. Also called _curly brace_, they delimit _blocks_."
 msgstr ""
 
-#: src/glossary.md:45
+#: src/glossary.md
 msgid ""
 "build:  \n"
 "The process of converting source code into executable code or a usable "
 "program."
 msgstr ""
 
-#: src/glossary.md:47
+#: src/glossary.md
 msgid ""
 "call:  \n"
 "To invoke or execute a function or method."
 msgstr ""
 
-#: src/glossary.md:49
+#: src/glossary.md
 msgid ""
 "channel:  \n"
 "Used to safely pass messages [between threads](concurrency/channels.md)."
 msgstr ""
 
-#: src/glossary.md:51
+#: src/glossary.md
 msgid ""
 "Comprehensive Rust 🦀:  \n"
 "The courses here are jointly called Comprehensive Rust 🦀."
 msgstr ""
 
-#: src/glossary.md:53
+#: src/glossary.md
 msgid ""
 "concurrency:  \n"
 "The execution of multiple tasks or processes at the same time."
 msgstr ""
 
-#: src/glossary.md:55
+#: src/glossary.md
 msgid ""
 "Concurrency in Rust:  \n"
 "See [Concurrency in Rust](concurrency.md)."
 msgstr ""
 
-#: src/glossary.md:57
+#: src/glossary.md
 msgid ""
 "constant:  \n"
 "A value that does not change during the execution of a program."
 msgstr ""
 
-#: src/glossary.md:59
+#: src/glossary.md
 msgid ""
 "control flow:  \n"
 "The order in which the individual statements or instructions are executed in "
 "a program."
 msgstr ""
 
-#: src/glossary.md:61
+#: src/glossary.md
 msgid ""
 "crash:  \n"
 "An unexpected and unhandled failure or termination of a program."
 msgstr ""
 
-#: src/glossary.md:63
+#: src/glossary.md
 msgid ""
 "enumeration:  \n"
-"A data type that consists of named constant values."
+"A data type that holds one of several named constants, possibly with an "
+"associated tuple or struct."
 msgstr ""
 
-#: src/glossary.md:65
+#: src/glossary.md
 msgid ""
 "error:  \n"
 "An unexpected condition or result that deviates from the expected behavior."
 msgstr ""
 
-#: src/glossary.md:67
+#: src/glossary.md
 msgid ""
 "error handling:  \n"
 "The process of managing and responding to errors that occur during program "
 "execution."
 msgstr ""
 
-#: src/glossary.md:69
+#: src/glossary.md
 msgid ""
 "exercise:  \n"
 "A task or problem designed to practice and test programming skills."
 msgstr ""
 
-#: src/glossary.md:71
+#: src/glossary.md
 msgid ""
 "function:  \n"
 "A reusable block of code that performs a specific task."
 msgstr ""
 
-#: src/glossary.md:73
+#: src/glossary.md
 msgid ""
 "garbage collector:  \n"
 "A mechanism that automatically frees up memory occupied by objects that are "
 "no longer in use."
 msgstr ""
 
-#: src/glossary.md:75
+#: src/glossary.md
 msgid ""
 "generics:  \n"
 "A feature that allows writing code with placeholders for types, enabling "
 "code reuse with different data types."
 msgstr ""
 
-#: src/glossary.md:77
+#: src/glossary.md
 msgid ""
 "immutable:  \n"
 "Unable to be changed after creation."
 msgstr ""
 
-#: src/glossary.md:79
+#: src/glossary.md
 msgid ""
 "integration test:  \n"
 "A type of test that verifies the interactions between different parts or "
 "components of a system."
 msgstr ""
 
-#: src/glossary.md:81
+#: src/glossary.md
 msgid ""
 "keyword:  \n"
 "A reserved word in a programming language that has a specific meaning and "
 "cannot be used as an identifier."
 msgstr ""
 
-#: src/glossary.md:83
+#: src/glossary.md
 msgid ""
 "library:  \n"
 "A collection of precompiled routines or code that can be used by programs."
 msgstr ""
 
-#: src/glossary.md:85
+#: src/glossary.md
 msgid ""
 "macro:  \n"
 "Rust macros can be recognized by a `!` in the name. Macros are used when "
@@ -21084,262 +21774,282 @@ msgid ""
 "a variable number of arguments, which isn't supported by Rust functions."
 msgstr ""
 
-#: src/glossary.md:90
+#: src/glossary.md
 msgid ""
 "`main` function:  \n"
 "Rust programs start executing with the `main` function."
 msgstr ""
 
-#: src/glossary.md:92
+#: src/glossary.md
 msgid ""
 "match:  \n"
 "A control flow construct in Rust that allows for pattern matching on the "
 "value of an expression."
 msgstr ""
 
-#: src/glossary.md:94
+#: src/glossary.md
 msgid ""
 "memory leak:  \n"
 "A situation where a program fails to release memory that is no longer "
 "needed, leading to a gradual increase in memory usage."
 msgstr ""
 
-#: src/glossary.md:96
+#: src/glossary.md
 msgid ""
 "method:  \n"
 "A function associated with an object or a type in Rust."
 msgstr ""
 
-#: src/glossary.md:98
+#: src/glossary.md
 msgid ""
 "module:  \n"
 "A namespace that contains definitions, such as functions, types, or traits, "
 "to organize code in Rust."
 msgstr ""
 
-#: src/glossary.md:100
+#: src/glossary.md
 msgid ""
 "move:  \n"
 "The transfer of ownership of a value from one variable to another in Rust."
 msgstr ""
 
-#: src/glossary.md:102
+#: src/glossary.md
 msgid ""
 "mutable:  \n"
 "A property in Rust that allows variables to be modified after they have been "
 "declared."
 msgstr ""
 
-#: src/glossary.md:104
+#: src/glossary.md
 msgid ""
 "ownership:  \n"
 "The concept in Rust that defines which part of the code is responsible for "
 "managing the memory associated with a value."
 msgstr ""
 
-#: src/glossary.md:106
+#: src/glossary.md
 msgid ""
 "panic:  \n"
 "An unrecoverable error condition in Rust that results in the termination of "
 "the program."
 msgstr ""
 
-#: src/glossary.md:108
+#: src/glossary.md
 msgid ""
 "parameter:  \n"
 "A value that is passed into a function or method when it is called."
 msgstr ""
 
-#: src/glossary.md:110
+#: src/glossary.md
 msgid ""
 "pattern:  \n"
 "A combination of values, literals, or structures that can be matched against "
 "an expression in Rust."
 msgstr ""
 
-#: src/glossary.md:112
+#: src/glossary.md
 msgid ""
 "payload:  \n"
 "The data or information carried by a message, event, or data structure."
 msgstr ""
 
-#: src/glossary.md:114
+#: src/glossary.md
 msgid ""
 "program:  \n"
 "A set of instructions that a computer can execute to perform a specific task "
 "or solve a particular problem."
 msgstr ""
 
-#: src/glossary.md:116
+#: src/glossary.md
 msgid ""
 "programming language:  \n"
 "A formal system used to communicate instructions to a computer, such as Rust."
 msgstr ""
 
-#: src/glossary.md:118
+#: src/glossary.md
 msgid ""
 "receiver:  \n"
 "The first parameter in a Rust method that represents the instance on which "
 "the method is called."
 msgstr ""
 
-#: src/glossary.md:120
+#: src/glossary.md
 msgid ""
 "reference counting:  \n"
 "A memory management technique in which the number of references to an object "
 "is tracked, and the object is deallocated when the count reaches zero."
 msgstr ""
 
-#: src/glossary.md:122
+#: src/glossary.md
 msgid ""
 "return:  \n"
 "A keyword in Rust used to indicate the value to be returned from a function."
 msgstr ""
 
-#: src/glossary.md:124
+#: src/glossary.md
 msgid ""
 "Rust:  \n"
 "A systems programming language that focuses on safety, performance, and "
 "concurrency."
 msgstr ""
 
-#: src/glossary.md:126
+#: src/glossary.md
 msgid ""
 "Rust Fundamentals:  \n"
 "Days 1 to 3 of this course."
 msgstr ""
 
-#: src/glossary.md:128
+#: src/glossary.md
 msgid ""
 "Rust in Android:  \n"
 "See [Rust in Android](android.md)."
 msgstr ""
 
-#: src/glossary.md:130
+#: src/glossary.md
 msgid ""
 "Rust in Chromium:  \n"
 "See [Rust in Chromium](chromium.md)."
 msgstr ""
 
-#: src/glossary.md:132
+#: src/glossary.md
 msgid ""
 "safe:  \n"
 "Refers to code that adheres to Rust's ownership and borrowing rules, "
 "preventing memory-related errors."
 msgstr ""
 
-#: src/glossary.md:134
+#: src/glossary.md
 msgid ""
 "scope:  \n"
 "The region of a program where a variable is valid and can be used."
 msgstr ""
 
-#: src/glossary.md:136
+#: src/glossary.md
 msgid ""
 "standard library:  \n"
 "A collection of modules providing essential functionality in Rust."
 msgstr ""
 
-#: src/glossary.md:138
+#: src/glossary.md
 msgid ""
 "static:  \n"
 "A keyword in Rust used to define static variables or items with a `'static` "
 "lifetime."
 msgstr ""
 
-#: src/glossary.md:140
+#: src/glossary.md
 msgid ""
 "string:  \n"
 "A data type storing textual data. See [`String` vs `str`](basic-syntax/"
 "string-slices.html) for more."
 msgstr ""
 
-#: src/glossary.md:142
+#: src/glossary.md
 msgid ""
 "struct:  \n"
 "A composite data type in Rust that groups together variables of different "
 "types under a single name."
 msgstr ""
 
-#: src/glossary.md:144
+#: src/glossary.md
 msgid ""
 "test:  \n"
 "A Rust module containing functions that test the correctness of other "
 "functions."
 msgstr ""
 
-#: src/glossary.md:146
+#: src/glossary.md
 msgid ""
 "thread:  \n"
 "A separate sequence of execution in a program, allowing concurrent execution."
 msgstr ""
 
-#: src/glossary.md:148
+#: src/glossary.md
 msgid ""
 "thread safety:  \n"
 "The property of a program that ensures correct behavior in a multithreaded "
 "environment."
 msgstr ""
 
-#: src/glossary.md:150
+#: src/glossary.md
 msgid ""
 "trait:  \n"
 "A collection of methods defined for an unknown type, providing a way to "
 "achieve polymorphism in Rust."
 msgstr ""
 
-#: src/glossary.md:152
+#: src/glossary.md
+msgid ""
+"trait bound:  \n"
+"An abstraction where you can require types to implement some traits of your "
+"interest."
+msgstr ""
+
+#: src/glossary.md
+msgid ""
+"tuple:  \n"
+"A composite data type that contains variables of different types. Tuple "
+"fields have no names, and are accessed by their ordinal numbers."
+msgstr ""
+
+#: src/glossary.md
 msgid ""
 "type:  \n"
 "A classification that specifies which operations can be performed on values "
 "of a particular kind in Rust."
 msgstr ""
 
-#: src/glossary.md:154
+#: src/glossary.md
 msgid ""
 "type inference:  \n"
 "The ability of the Rust compiler to deduce the type of a variable or "
 "expression."
 msgstr ""
 
-#: src/glossary.md:156
+#: src/glossary.md
 msgid ""
 "undefined behavior:  \n"
 "Actions or conditions in Rust that have no specified result, often leading "
 "to unpredictable program behavior."
 msgstr ""
 
-#: src/glossary.md:158
+#: src/glossary.md
 msgid ""
 "union:  \n"
 "A data type that can hold values of different types but only one at a time."
 msgstr ""
 
-#: src/glossary.md:160
+#: src/glossary.md
 msgid ""
 "unit test:  \n"
 "Rust comes with built-in support for running small unit tests and larger "
 "integration tests. See [Unit Tests](testing/unit-tests.html)."
 msgstr ""
 
-#: src/glossary.md:163
+#: src/glossary.md
+msgid ""
+"unit type:  \n"
+"Type that holds no data, written as a tuple with no members."
+msgstr ""
+
+#: src/glossary.md
 msgid ""
 "unsafe:  \n"
 "The subset of Rust which allows you to trigger _undefined behavior_. See "
 "[Unsafe Rust](unsafe.html)."
 msgstr ""
 
-#: src/glossary.md:165
+#: src/glossary.md
 msgid ""
 "variable:  \n"
-"A memory location storing data. Variables are valid in a _scope_. "
+"A memory location storing data. Variables are valid in a _scope_."
 msgstr ""
 
-#: src/other-resources.md:1
+#: src/other-resources.md
 msgid "Other Rust Resources"
 msgstr "Autres ressources Rust"
 
-#: src/other-resources.md:3
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "The Rust community has created a wealth of high-quality and free resources "
@@ -21348,19 +22058,19 @@ msgstr ""
 "La communauté Rust a créé une multitude de ressources gratuites et de haute "
 "qualité en ligne."
 
-#: src/other-resources.md:6
+#: src/other-resources.md
 #, fuzzy
 msgid "Official Documentation"
 msgstr "Documents officiels"
 
-#: src/other-resources.md:8
+#: src/other-resources.md
 #, fuzzy
 msgid "The Rust project hosts many resources. These cover Rust in general:"
 msgstr ""
 "Le projet Rust héberge de nombreuses ressources. Celles-ci couvrent Rust en "
 "général :"
 
-#: src/other-resources.md:10
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[The Rust Programming Language](https://doc.rust-lang.org/book/): the "
@@ -21371,7 +22081,7 @@ msgstr ""
 "livre canonique gratuit sur Rust. Couvre la langue en détail et comprend un "
 "peu de projets à construire."
 
-#: src/other-resources.md:13
+#: src/other-resources.md
 msgid ""
 "[Rust By Example](https://doc.rust-lang.org/rust-by-example/): covers the "
 "Rust syntax via a series of examples which showcase different constructs. "
@@ -21383,7 +22093,7 @@ msgstr ""
 "constructions. Parfois comprend de petits exercices où l'on vous demande de "
 "développer le code de l'exemple."
 
-#: src/other-resources.md:17
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[Rust Standard Library](https://doc.rust-lang.org/std/): full documentation "
@@ -21392,7 +22102,7 @@ msgstr ""
 "[Bibliothèque standard Rust](https://doc.rust-lang.org/std/) : documentation "
 "complète de la bibliothèque standard de Rust."
 
-#: src/other-resources.md:19
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[The Rust Reference](https://doc.rust-lang.org/reference/): an incomplete "
@@ -21401,12 +22111,12 @@ msgstr ""
 "[The Rust Reference](https://doc.rust-lang.org/reference/) : un livre "
 "incomplet qui décrit la grammaire et le modèle de mémoire de Rust."
 
-#: src/other-resources.md:22
+#: src/other-resources.md
 #, fuzzy
 msgid "More specialized guides hosted on the official Rust site:"
 msgstr "Des guides plus spécialisés hébergés sur le site officiel de Rust :"
 
-#: src/other-resources.md:24
+#: src/other-resources.md
 msgid ""
 "[The Rustonomicon](https://doc.rust-lang.org/nomicon/): covers unsafe Rust, "
 "including working with raw pointers and interfacing with other languages "
@@ -21416,7 +22126,7 @@ msgstr ""
 "securisé (_unsafe_), y compris les pointeurs nus et l'interfaçage avec "
 "d'autres langages (FFI)."
 
-#: src/other-resources.md:27
+#: src/other-resources.md
 msgid ""
 "[Asynchronous Programming in Rust](https://rust-lang.github.io/async-book/): "
 "covers the new asynchronous programming model which was introduced after the "
@@ -21426,7 +22136,7 @@ msgstr ""
 "book/) : couvre le nouveau modèle de programmation asynchrone qui a été "
 "introduit après la publication du livre Rust."
 
-#: src/other-resources.md:30
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[The Embedded Rust Book](https://doc.rust-lang.org/stable/embedded-book/): "
@@ -21437,17 +22147,17 @@ msgstr ""
 "un introduction à l'utilisation de Rust sur des appareils embarqués sans "
 "système d'exploitation."
 
-#: src/other-resources.md:33
+#: src/other-resources.md
 #, fuzzy
 msgid "Unofficial Learning Material"
 msgstr "Matériel d'apprentissage non officiel"
 
-#: src/other-resources.md:35
+#: src/other-resources.md
 #, fuzzy
 msgid "A small selection of other guides and tutorial for Rust:"
 msgstr "Une petite sélection d'autres guides et tutoriels pour Rust :"
 
-#: src/other-resources.md:37
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[Learn Rust the Dangerous Way](http://cliffle.com/p/dangerust/): covers Rust "
@@ -21456,7 +22166,7 @@ msgstr ""
 "[Learn Rust the Dangerous Way](http://cliffle.com/p/dangerust/) : couvre "
 "Rust du point de vue des programmeurs C de bas niveau."
 
-#: src/other-resources.md:39
+#: src/other-resources.md
 msgid ""
 "[Rust for Embedded C Programmers](https://docs.opentitan.org/doc/ug/"
 "rust_for_c/): covers Rust from the perspective of developers who write "
@@ -21466,7 +22176,7 @@ msgstr ""
 "rust_for_c/) : couvre Rust du point de vue des développeurs qui écrivent des "
 "firmwares en C."
 
-#: src/other-resources.md:42
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[Rust for professionals](https://overexact.com/rust-for-professionals/): "
@@ -21478,7 +22188,7 @@ msgstr ""
 "côte à côte avec d'autres langages tels que C, C++, Java, JavaScript et "
 "Python."
 
-#: src/other-resources.md:45
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[Rust on Exercism](https://exercism.org/tracks/rust): 100+ exercises to help "
@@ -21487,7 +22197,7 @@ msgstr ""
 "[Rust on Exercism](https://exercism.org/tracks/rust) : plus de 100 exercices "
 "pour vous aider vous apprenez Rust."
 
-#: src/other-resources.md:47
+#: src/other-resources.md
 msgid ""
 "[Ferrous Teaching Material](https://ferrous-systems.github.io/teaching-"
 "material/index.html): a series of small presentations covering both basic "
@@ -21499,7 +22209,7 @@ msgstr ""
 "la fois la partie de base et avancée de Rust. D'autres sujets tels que "
 "WebAssembly et async/wait sont également couvert."
 
-#: src/other-resources.md:52
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[Beginner's Series to Rust](https://docs.microsoft.com/en-us/shows/beginners-"
@@ -21515,7 +22225,7 @@ msgstr ""
 "et le le second est un ensemble de 11 modules qui couvre la syntaxe Rust et "
 "les constructions de base."
 
-#: src/other-resources.md:58
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "[Learn Rust With Entirely Too Many Linked Lists](https://rust-unofficial."
@@ -21527,7 +22237,7 @@ msgstr ""
 "de la mémoire de Rust, en implémentant quelques différents types de "
 "structures de liste."
 
-#: src/other-resources.md:63
+#: src/other-resources.md
 #, fuzzy
 msgid ""
 "Please see the [Little Book of Rust Books](https://lborb.github.io/book/) "
@@ -21536,7 +22246,7 @@ msgstr ""
 "Veuillez consulter le [Little Book of Rust Books](https://lborb.github.io/"
 "book/) pour encore plus de livres Rust."
 
-#: src/credits.md:3
+#: src/credits.md
 #, fuzzy
 msgid ""
 "The material here builds on top of the many great sources of Rust "
@@ -21547,7 +22257,7 @@ msgstr ""
 "Rust. Voir la page sur \\[autres ressources\\] (other-resources.md) pour une "
 "liste complète des ressources utiles ressources."
 
-#: src/credits.md:7
+#: src/credits.md
 #, fuzzy
 msgid ""
 "The material of Comprehensive Rust is licensed under the terms of the Apache "
@@ -21558,11 +22268,11 @@ msgstr ""
 "sous les termes de la licence d'Apache 2.0, veuillez consulter [`LICENSE`]"
 "(../LICENSE) pour plus de détails."
 
-#: src/credits.md:12
+#: src/credits.md
 msgid "Rust by Example"
 msgstr "Rust by Example"
 
-#: src/credits.md:14
+#: src/credits.md
 #, fuzzy
 msgid ""
 "Some examples and exercises have been copied and adapted from [Rust by "
@@ -21575,11 +22285,11 @@ msgstr ""
 "Répertoire `third_party/rust-by-example/` pour plus de détails, y compris la "
 "licence conditions."
 
-#: src/credits.md:19
+#: src/credits.md
 msgid "Rust on Exercism"
 msgstr "Rust sur Exercism"
 
-#: src/credits.md:21
+#: src/credits.md
 msgid ""
 "Some exercises have been copied and adapted from [Rust on Exercism](https://"
 "exercism.org/tracks/rust). Please see the `third_party/rust-on-exercism/` "
@@ -21590,12 +22300,12 @@ msgstr ""
 "`third_party/rust-on-exercism/` pour plus de détails, y compris les "
 "conditions  de la licence."
 
-#: src/credits.md:26
+#: src/credits.md
 #, fuzzy
 msgid "CXX"
 msgstr "\\## CXX"
 
-#: src/credits.md:28
+#: src/credits.md
 #, fuzzy
 msgid ""
 "The [Interoperability with C++](android/interoperability/cpp.md) section "
@@ -21606,6 +22316,114 @@ msgstr ""
 "utilise un image de [CXX](https://cxx.rs/). Veuillez consulter le répertoire "
 "`third_party/cxx/` pour plus de détails, y compris les termes de la licence."
 
+#, fuzzy
+#~ msgid "With C++)"
+#~ msgstr "Avec C++"
+
+#, fuzzy
+#~ msgid "{{%course outline Fundamentals}}"
+#~ msgstr "Fondamentaux de Rust"
+
+#, fuzzy
+#~ msgid ""
+#~ "Let us design a classical GUI library using our new knowledge of traits "
+#~ "and trait objects. We'll only implement the drawing of it (as text) for "
+#~ "simplicity."
+#~ msgstr ""
+#~ "Concevons une bibliothèque d'interface graphique classique en utilisant "
+#~ "nos nouvelles connaissances sur les traits et objets trait."
+
+#, fuzzy
+#~ msgid "We will have a number of widgets in our library:"
+#~ msgstr "Nous aurons un certain nombre de widgets dans notre bibliothèque :"
+
+#, fuzzy
+#~ msgid "`Window`: has a `title` and contains other widgets."
+#~ msgstr "`Window` : a un `title` et contient d'autres widgets."
+
+#, fuzzy
+#~ msgid "`Label`: has a `label`."
+#~ msgstr "`Label` : a un `label`."
+
+#, fuzzy
+#~ msgid "The widgets will implement a `Widget` trait, see below."
+#~ msgstr "Les widgets implémenteront un trait `Widget`, voir ci-dessous."
+
+#, fuzzy
+#~ msgid ""
+#~ "Copy the code below to <https://play.rust-lang.org/>, fill in the missing "
+#~ "`draw_into` methods so that you implement the `Widget` trait:"
+#~ msgstr ""
+#~ "Copiez le code ci-dessous sur <https://play.rust-lang.org/>, remplissez "
+#~ "les champs manquants méthodes `draw_into` afin que vous implémentiez le "
+#~ "trait `Widget` :"
+
+#, fuzzy
+#~ msgid "The output of the above program can be something simple like this:"
+#~ msgstr ""
+#~ "La sortie du programme ci-dessus peut être quelque chose de simple comme "
+#~ "ceci :"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you want to draw aligned text, you can use the [fill/alignment]"
+#~ "(https://doc.rust-lang.org/std/fmt/index.html#fillalignment) formatting "
+#~ "operators. In particular, notice how you can pad with different "
+#~ "characters (here a `'/'`) and how you can control alignment:"
+#~ msgstr ""
+#~ "Si vous voulez dessiner du texte aligné, vous pouvez utiliser le "
+#~ "[remplissage/alignement](https://doc.rust-lang.org/std/fmt/index."
+#~ "html#fillalignment) opérateurs de formatage. En particulier, notez "
+#~ "comment vous pouvez compléter avec différents caractères (ici un `'/'`) "
+#~ "et comment vous pouvez contrôler l'alignement :"
+
+#, fuzzy
+#~ msgid ""
+#~ "Using such alignment tricks, you can for example produce output like this:"
+#~ msgstr ""
+#~ "En utilisant de telles astuces d'alignement, vous pouvez par exemple "
+#~ "produire une sortie comme celle-ci :"
+
+#, fuzzy
+#~ msgid ""
+#~ "In the above example, you can even leave out the `*` in the `println!` "
+#~ "statement thanks to `Deref`."
+#~ msgstr ""
+#~ "Dans l'exemple ci-dessus, vous pouvez même omettre le `*` dans "
+#~ "l'instruction `println!` grâce à `Deref`."
+
+#, fuzzy
+#~ msgid ""
+#~ "[`Cell`](https://doc.rust-lang.org/std/cell/struct.Cell.html) and "
+#~ "[`RefCell`](https://doc.rust-lang.org/std/cell/struct.RefCell.html) "
+#~ "implement what Rust calls _interior mutability:_ mutation of values in an "
+#~ "immutable context."
+#~ msgstr ""
+#~ "En utilisant [`Read`](https://doc.rust-lang.org/std/io/trait.Read.html) "
+#~ "et [`BufRead`](https://doc.rust-lang.org/std/io/trait.BufRead.html), vous "
+#~ "pouvez résumer les sources `u8` :"
+
+#~ msgid "Lifetimes"
+#~ msgstr "Durées de vie"
+
+#, fuzzy
+#~ msgid ""
+#~ "It's generally helpful for them to implement `Clone` and `Eq` too where "
+#~ "possible, to make life easier for tests and consumers of your library. In "
+#~ "this case we can't easily do so, because `io::Error` doesn't implement "
+#~ "them."
+#~ msgstr ""
+#~ "C'est une bonne pratique pour tous les types d'erreurs d'implémenter "
+#~ "`std::error::Error`, qui nécessite `Debug` et 'Affichage'. Il est "
+#~ "généralement utile pour eux d'implémenter `Clone` et `Eq` aussi lorsque "
+#~ "cela est possible, pour faire la vie plus facile pour les testeurs et les "
+#~ "consommateurs de votre bibliothèque. Dans ce cas, nous ne pouvons pas le "
+#~ "faire facilement, car `io::Error` ne les implémente pas."
+
+#, fuzzy
+#~ msgid "`thiserror`  and `anyhow`"
+#~ msgstr "`De` et `Dans`"
+
 #~ msgid "Small Example"
 #~ msgstr "Petit exemple"
 
@@ -22760,13 +23578,6 @@ msgstr ""
 #~ "Les énumérations de Rust sont emballées étroitement, en tenant compte des "
 #~ "contraintes d'alignement :"
 
-#~ msgid ""
-#~ "See [pattern matching](../pattern-matching.md) for more details on "
-#~ "patterns in Rust."
-#~ msgstr ""
-#~ "Voir [Filtrage par motif](../pattern-matching.md) pour plus de détails "
-#~ "sur les motifs avec Rust."
-
 #, fuzzy
 #~ msgid ""
 #~ "The [`match` keyword](https://doc.rust-lang.org/reference/expressions/"
@@ -23658,14 +24469,6 @@ msgstr ""
 #~ "L'opérateur try `?` est utilisé pour renvoyer des erreurs à l'appelant. "
 #~ "Il vous permet de tourner le commun"
 
-#, fuzzy
-#~ msgid ""
-#~ "The [thiserror](https://docs.rs/thiserror/) crate is a popular way to "
-#~ "create an error enum like we did on the previous page:"
-#~ msgstr ""
-#~ "La caisse [thiserror](https://docs.rs/thiserror/) est un moyen populaire "
-#~ "de créer un error enum comme nous l'avons fait sur la page précédente :"
-
 #, fuzzy
 #~ msgid ""
 #~ "`thiserror`'s derive macro automatically implements `std::error::Error`, "
@@ -23748,10 +24551,6 @@ msgstr ""
 #~ msgid "concurrency:"
 #~ msgstr "Concurrence"
 
-#, fuzzy
-#~ msgid "constant:"
-#~ msgstr "`const`"
-
 #, fuzzy
 #~ msgid "control flow:"
 #~ msgstr "Flux de contrôle"
@@ -23942,10 +24741,6 @@ msgstr ""
 #~ msgid "([back to exercise](health-statistics.md))"
 #~ msgstr "([retour à l'exercice](rtc.md))"
 
-#, fuzzy
-#~ msgid "Day 2 Afternoon Exercises"
-#~ msgstr "Exercices de l'après-midi du jour 2"
-
 #, fuzzy
 #~ msgid "([back to exercise](strings-iterators.md))"
 #~ msgstr "([retour à l'exercice](strings-iterators.md))"