From 8f715ebd18e6403bdcc81811660bf6cfba9e0adf Mon Sep 17 00:00:00 2001
From: Pootle Translation <pootle@dev.laptop.org>
Date: Sun, 15 Feb 2009 18:17:06 +0000
Subject: Fix conflicts

---
(limited to 'po/fr.po')

diff --git a/po/fr.po b/po/fr.po
index 770415d..70c1b28 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,6 +15,65 @@ msgstr ""
 msgid "Turtle Art"
 msgstr "ArtTortue"
 
+#: tasetup.py:46 tasetup.py:49 tasetup.py:50 tasetup.py:51 tasetup.py:52
+#: tasetup.py:53 tasetup.py:54
+msgid "title"
+msgstr ""
+
+#: tasetup.py:66
+msgid "text"
+msgstr ""
+
+#:
+msgid "Save as"
+msgstr ""
+
+#: TurtleArtActivity.py:173 TurtleArtActivity.py:262
+#: TurtleArtActivity.py:293
+msgid "hide palette"
+msgstr ""
+
+#: TurtleArtActivity.py:181 TurtleArtActivity.py:286
+msgid "hide blocks"
+msgstr ""
+
+#: TurtleArtActivity.py:194
+msgid "run"
+msgstr ""
+
+#: TurtleArtActivity.py:202
+msgid "step"
+msgstr ""
+
+#: TurtleArtActivity.py:210
+msgid "stop turtle"
+msgstr ""
+
+#: TurtleArtActivity.py:236
+msgid "samples"
+msgstr ""
+
+#: TurtleArtActivity.py:249
+msgid "save as HTML"
+msgstr ""
+
+#: TurtleArtActivity.py
+msgid "save Logo"
+msgstr ""
+
+#: TurtleArtActivity.py
+msgid "load my block"
+msgstr ""
+
+#: TurtleArtActivity.py:259 TurtleArtActivity.py:267
+#: TurtleArtActivity.py:290 TurtleArtActivity.py:299
+msgid "show palette"
+msgstr ""
+
+#: TurtleArtActivity.py:283 TurtleArtActivity.py:297
+msgid "show blocks"
+msgstr ""
+
 #:
 msgid "Flow"
 msgstr "Flux"
@@ -52,6 +111,14 @@ msgid "My Blocks"
 msgstr "Mes blocs"
 
 #:
+msgid "start"
+msgstr "commencer"
+
+#:
+msgid "box"
+msgstr "boîte"
+
+#:
 msgid "box 1"
 msgstr "boîte 1"
 
@@ -60,6 +127,10 @@ msgid "box 2"
 msgstr "boîte 2"
 
 #:
+msgid "stack"
+msgstr "pile"
+
+#:
 msgid "stack 1"
 msgstr "pile 1"
 
@@ -76,6 +147,10 @@ msgid "store in box 2"
 msgstr "range dans la boîte 2"
 
 #:
+msgid "name"
+msgstr "nom"
+
+#:
 msgid "Numbers"
 msgstr "Nombres"
 
@@ -156,6 +231,10 @@ msgid "set color"
 msgstr "fixe la couleur"
 
 #:
+msgid "set text color"
+msgstr ""
+
+#:
 msgid "Blocks"
 msgstr "Blocs"
 
@@ -228,7 +307,49 @@ msgstr "coord y"
 #:
 msgid "Project"
 msgstr "Projet"
+msgid "Sensors"
+msgstr ""
+
+#:
+msgid "volume"
+msgstr ""
+
+#:
+msgid "pitch"
+msgstr ""
+
+#:
+msgid "voltage"
+msgstr ""
+
+#:
+msgid "resistance"
+msgstr ""
+
+#:
+msgid "Templates"
+msgstr ""
+
+#:
+msgid "Keyboard"
+msgstr ""
+
+#:
+msgid "read key"
+msgstr ""
+
+#:
+msgid "sound"
+msgstr ""
 
 #:
 msgid "Samples"
 msgstr "Échantillons"
+
+msgid "hres"
+msgstr ""
+
+#:
+msgid "vres"
+msgstr ""
+
--
cgit v0.9.1