From 49e010109f15f362808d5bfdddff5189812c3c5a Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Tue, 12 Feb 2013 18:55:16 +0100
Subject: [PATCH] More French translations

---
 umap/locale/fr/LC_MESSAGES/django.mo   | Bin 2308 -> 3715 bytes
 umap/locale/fr/LC_MESSAGES/django.po   | 173 ++++++++++++++++++-------
 umap/templates/umap/about_summary.html |   4 +-
 umap/templates/umap/search_bar.html    |   2 +-
 4 files changed, 132 insertions(+), 47 deletions(-)

diff --git a/umap/locale/fr/LC_MESSAGES/django.mo b/umap/locale/fr/LC_MESSAGES/django.mo
index e6d8eb68700108fb1d4be3a4c957c7a946c0c343..2e4341ab9d1effa4616d22e030576ecd4c05e8e3 100644
GIT binary patch
delta 2329
zcmZn>YL>0PC&V(9fq{WRhk=1XhJk^hhLM56nt_4g4iiX}f#C!*0|P4q1H(yX1_o6I
z28Q#@5Vc>K85rak7#NgT7#QRk7#JK`7#L(37#I>+7#I{77#QkV7#Ktu7#J3?Ffi~i
zFfeRmVPFtpU|=}R!oa}6z`$^Wg@J*MfuWw^AqxY85Ca3l3l;_j2?hp+-%tf2tPBjy
z3=9mitPBk73=9m4tPBj23=9mKP;qBg1_n+B1_pOlut5xgP<0Wk5QikNGBDUOFfi1y
zLL9J%m4Sf;<PoU4bF2&ud<^vr4A)p84tUB6alj8&1_mPr1_nVk1_o&c1_l>41_mVt
z28IMSh(*n8kdWwNV_@KBU|`t5#=yYKz`(GF4dT#KY#@Uf7%s6fFz_=lFg#>qU=Uzn
zVE70XXJThyxC1huoq-{yo{@p!9XrG)-kb~!x(o~qp_~j177Ppw&72Gj8X$wA^ixg-
z1}O#x20ku`gEYAy4))=KSda>(%eWvuZs&rSI|Zt49v38PwsS$FfQx~l9u&k6xgaio
z3RU=)3lj8f+zbqY3=9lh+z^9gxFH6saWgO|GB7Y0b2Bi6fgH>Y35hk_kRaZ{&A`CL
zz`(GVn}I=$fq~%!HzXwPb3@X~du|2>2L=WPejbK;22BPAh5#N01_K5LhAJM2%U1I+
zFsL&yFl^yrU=Ri+MjnVmKJY+%%ESxtxiBvzk?HV4EOO$7L}et1&&a@#!^^<H2ua7_
zr~)NC5Eqm{K~W+Iihn+k2m>UQgW?gCNI)qY6n7wBfTTew8AOAk14M%y2TB_tHVA7o
zKpX&KgK`5XVS?DuOau-sH3moy0Hq~RP6Np^hcZBdR2jr$U|>*TfcRLP0TLyk90AH!
zT2Ofq#l`^52@H^g2+BR6><da8430_pr6rRMn4-;9HIhq<ic<4R;!BHDi!_VXixqMc
z3yK+>GZORCQx$R(i?UOT6pAwv3sMyl^HLOwD|3_bbMz+nGsUtdf|O2v!lWkTl3J3O
znNzHgpQn(PUzD3zQaqWHS=u@^H6<xAIh(;fAcDa?HQy`P-;cpPwL~E^ueczyC^bb#
zA*m?8yclFnK{123uMdMyVsQz`)Z)on%=-0-d5K^*6e#2ulw{`T6<aB!WEL0XBvvXU
zD&%J7W#%Rp=qTjmCnuJqDuCP%azIXgV#=e2WemQF1q#KfB_)}8>BS7b`9-M=zLj93
z8T|6Wb||Ffm*%DDF$93jE6*&+P$<brRY*zA&1VS6Nlh$Htyf6S$j>iMRY+7QD9SI(
zOi3+b2q?-gNG&SKOf3dkm|~@nmzbNXkYA)wl39|Is-uvSTAW;z33jcHLUMjiJ`ODq
zmDr7g$Q5PsfQ?}YPE9OI&X}CX?C2JpnVzSRna2=ZQkj!l3=0*8&;pRB71B}@OG=AU
ziy6W*5=#`46Y~@*^Gg*{^6eo4nZ*jF)xL=ZwUb{nD{9&#Dr6L;rr9c~YUCH^#+Mf5
zXcj9e=-c@hq~-;e6s4w?_$C(E=qK7umSo9QK`1UtEy#zew#zR_%~L4OFD*(=wb4(U
zynw}v*I3uUNY~Iv!O+6W#CY>}7EVUa!wsO|E66XN{GT-=&^bS^xHP9EwMYTvgXF}b
zlGI{_lvD-uga}Q6MG85I;53!0kWvatj)kSEr9}#<B?>vI3I&<TCHa%f*fJ-dW7Cju
zIlK~*3X4l2hQpHLS2krQY)R2Cu`DyaG_^<}B{8oU$vNPZ=#pBLmw9+aQEIUQ#F3L_
z*{$l`53ekOIvtuML2l1Ugs8DnNK8x1OwLFxQYg(!1*cH3ULA$>!z=Sa=`<&^7^Gdj
zv?MbpvpBINwX{f2PmduWu_!V3@QM;p<OSrE7Bl$5tz~d5O$HeTHfVAlJ9m9ZYB4zY
z5*1PouguM7@J%gB&ICClIU_%_I1^+yC}|hvWfm8wmO|2BQRd;5C5KlQD-;xE7N-^~
zq~<9k=jRrbq{0$#DS-rxFd!7G36L}kPR|IXcvM332!nG*Y7r>FCNE$YncTx}ZSP!k
zcqKUepblj42j>EC8p+KpP6as~6tSrcp1B42MWB#K0i~e)yu8CJQ;R46VwdC5QAk!#
cEiO?gEX~iHEXd(RLSj$gXjda9vD+~K021RVjQ{`u

delta 895
zcmZpcZ4s)!C&V(9fq{WRf`NfShJk_M4g&*&Dgy(<97d2R1A_q*gm1{iz@Wpxz!1*F
zz`)JGz|g|Pz#z-Oz%YS{fkA<RfngmJ1A{071H*YH1_luZ28O3h3=A9$3=F@R7#P?X
z7#NtDA$D*vGcd3-Ffb@HgT?C^w4nk<%n$>up!^7C1_nL`28IM?hy(JOAr?<%W?<lD
zU|?7XHE=yM1A`C)1H%bs1_l8J28P?r3=G>C7#Q9#Gcd$3GB7M=VPMb&`Gt*v!GeK-
zL641rfuDhaA)SqZL5iWCfuWp@fkBCZfngFG#D!bgAO@XdV_@K6U|_h<#=yV{GLQ}8
z({F5Gmotd7L&W9SA?h^P85k597#K|185p=gA;r$XAjZJJki^cwpw7U+P|41~APjOi
zI|G9t0|UcWb_NEidIkoD<LnTNA3-(zW@ljd$iToL#KFJ-iUnqn>lq-HfI<WmydWQd
zgjqoZ1H?ff%RpR^C7_T1u|XJQ8Hh&4Obn1{Fah~YoB<MdFa@Ca1^ED!CRi9C@d%Ow
z1v@CHC!b@EX30$~D4v|a5<B@6i`?YjEK+RwMcE3OC6fbK^(UWa6`S0}=3o<&T3n)#
zS)!1bm!gndl$uzQs*tFVn^?dQTAW%`tWc7#P>_>YsZgF-lEDz3kyxTonO~}qoS3JO
zl5am*fL)Q-zaTX)xTGjGwZu2EU~&|Du2gYJQGQ;!U4B7oo<ebcX;E^jjXp$d@@sal
z$*~-qEGAY47Mq<oI2k90a;Ec#<!2Ttq@)%rBqtV?q!v%+<;tAg&Luv1JC_n`eo=O6
z(PU|EtI2!0l_qcD@iPXwIJHP2wL~Gg=<v$aB8AetRESQ7(2~rY%;Ln7)Y772g@XLj
jB88IF;*!*&$&S2olZ$w*(Hwh?w_O(EFl>&sQ)B=Dcix#$

diff --git a/umap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po
index 20e6c11..65286dc 100644
--- a/umap/locale/fr/LC_MESSAGES/django.po
+++ b/umap/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-27 14:08+0100\n"
+"POT-Creation-Date: 2013-02-12 18:43+0100\n"
 "PO-Revision-Date: 2012-12-27 11:09+0100\n"
 "Last-Translator: YOHAN BONIFACE <yb@enix.org>\n"
 "Language-Team: FR <LL@li.org>\n"
@@ -18,8 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: templates/leaflet_storage/category_form.html:26
-#: templates/leaflet_storage/feature_form.html:14
+#: templates/auth/user_detail.html:7
+#, python-format
+msgid "Browse %(current_user)s's maps"
+msgstr "Consulter les cartes de %(current_user)s"
+
+#: templates/leaflet_storage/category_form.html:18
+#: templates/leaflet_storage/feature_form.html:12
 #: templates/leaflet_storage/map_form.html:17
 msgid "Delete"
 msgstr "Supprimer"
@@ -28,94 +33,174 @@ msgstr "Supprimer"
 msgid "Create your map now!"
 msgstr "Créer une carte"
 
-#: templates/leaflet_storage/map_list.html:8
+#: templates/leaflet_storage/map_list.html:6
 msgid "Cured by"
 msgstr "Maintenu par"
 
-#: templates/leaflet_storage/map_list.html:8
+#: templates/leaflet_storage/map_list.html:6
 msgid "See this map!"
 msgstr "Voir cette carte!"
 
+#: templates/leaflet_storage/map_list.html:10
+msgid "More"
+msgstr "Plus"
+
+#: templates/leaflet_storage/map_update_settings.html:2
+msgid "Map settings"
+msgstr "Paramètres"
+
 #: templates/leaflet_storage/map_update_tilelayers.html:2
 msgid "Choose your tilelayer"
 msgstr "Choisir un fond de carte"
 
-#: templates/youmap/home.html:39
+#: templates/leaflet_storage/upload_form.html:2
+msgid "Upload features"
+msgstr "Importer des données"
+
+#: templates/leaflet_storage/upload_form.html:11
+msgid "Details on formats"
+msgstr "Détails sur les formats"
+
+#: templates/leaflet_storage/upload_form.html:13
+msgid "GeoJSON"
+msgstr "GeoJSON"
+
+#: templates/leaflet_storage/upload_form.html:15
+msgid "Properties used: name or title, description, color"
+msgstr "Propriétés prises en compte: name ou title, description, color"
+
+#: templates/leaflet_storage/upload_form.html:20
+msgid "KML"
+msgstr "KML"
+
+#: templates/leaflet_storage/upload_form.html:22
+msgid "Properties used: name, description"
+msgstr "Propriétés prises en compte: name, description"
+
+#: templates/leaflet_storage/upload_form.html:27
+msgid "GPX"
+msgstr "GPX"
+
+#: templates/leaflet_storage/upload_form.html:29
+msgid "Properties used: name, desc"
+msgstr "Propriétés prises en compte: name, desc"
+
+#: templates/registration/login.html:4
+msgid "Please choose a provider"
+msgstr "Merci de choisir un fournisseur"
+
+#: templates/umap/about_summary.html:4
+msgid "What is u{Map}"
+msgstr "u{Map}, c'est quoi"
+
+#: templates/umap/about_summary.html:5
+#, python-format
 msgid ""
-"u{Map} let you create maps with OpenStreetMap layers in a minute and embed "
-"them in your site.<br /> This is a demo instance, you can host your own, "
-"it's <strong>open source</strong>!"
+"u{Map} let you create maps with <a href=\"%(osm_url)s\" />OpenStreetMap</a> "
+"layers in a minute and embed them in your site.<br /> This is a demo "
+"instance, you can host your own, it's <a href=\"%(repo_url)s\">open source</"
+"a>!"
 msgstr ""
-"u{Map} permet de créer des cartes personnalisées sur des fonds OpenStreetMap "
-"en un instant et les afficher dans votre site <br /> Ceci est une instance "
-"de démonstration, vous pouvez héberger la vôtre, c'est <strong>open source</"
-"strong>!"
+"u{Map} permet de créer des cartes personnalisées sur des fonds <a href="
+"\"%(osm_url)s\" />OpenStreetMap</a> en un instant et les afficher dans votre "
+"site <br /> Ceci est une instance de démonstration, vous pouvez héberger la "
+"vôtre, c'est <a href=\"%(repo_url)s\">open source</a>"
 
-#: templates/youmap/home.html:43
-msgid "What you can do?"
+#: templates/umap/about_summary.html:9
+msgid "What can you do?"
 msgstr "Que pouvez-vous faire?"
 
-#: templates/youmap/home.html:45
+#: templates/umap/about_summary.html:11
 msgid "Choose the layers of your map"
 msgstr "Choisir les fonds de carte"
 
-#: templates/youmap/home.html:46
+#: templates/umap/about_summary.html:12
 msgid "Add POIs: markers, lines, polygons..."
 msgstr "Ajouter des POI: markes, lignes, polygones..."
 
-#: templates/youmap/home.html:47
+#: templates/umap/about_summary.html:13
 msgid "Manage POIs colours and icons"
 msgstr "Choisir la couleur et les icônes"
 
-#: templates/youmap/home.html:48
+#: templates/umap/about_summary.html:14
+msgid "Manage map options: display a minimap, locate user on load…"
+msgstr ""
+"Gérer les options de la carte: afficher une minicarte, géolocaliser "
+"l'utilisateur..."
+
+#: templates/umap/about_summary.html:15
 msgid "Batch import geostructured data (GEOJson...)"
 msgstr "Import des données géographiques en masse (GeoJSON...)"
 
-#: templates/youmap/home.html:49
+#: templates/umap/about_summary.html:16
 msgid "Choose the licence for your data"
 msgstr "Choisir la licence de vos données"
 
-#: templates/youmap/home.html:50
+#: templates/umap/about_summary.html:17
 msgid "Embed and share your map"
 msgstr "Exporter et partager votre carte"
 
-#: templates/youmap/home.html:62
-msgid "Test it and create a map"
-msgstr "Tester et créer une carte"
+#: templates/umap/about_summary.html:23
+msgid "Play with the demo"
+msgstr "Tester la démo"
 
-#: templates/youmap/home.html:68
-msgid "Fork it"
-msgstr "Forker"
+#: templates/umap/content.html:26 templates/umap/search_bar.html:6
+msgid "Search maps"
+msgstr "Chercher des cartes"
 
-#: templates/youmap/home.html:73
-msgid "Users to play with"
-msgstr "Utilisateurs pour tester"
+#: templates/umap/content.html:35
+msgid "Last maps"
+msgstr "Dernières cartes"
 
-#: templates/youmap/home.html:87
-msgid "Browse maps"
-msgstr "Voir des cartes"
+#: templates/umap/home.html:12
+msgid "Get inspired, browse maps"
+msgstr "Naviguer dans les cartes"
 
-#: templates/youmap/navigation.html:11
+#: templates/umap/navigation.html:12
 msgid "My maps"
 msgstr "Mes cartes"
 
-#: templates/youmap/navigation.html:12
-msgid "Log out"
-msgstr "Déconnexion"
-
-#: templates/youmap/navigation.html:14
+#: templates/umap/navigation.html:14
 msgid "Log in"
 msgstr "Connexion"
 
-#: templates/youmap/navigation.html:21
-msgid "Search maps"
-msgstr "Chercher des cartes"
+#: templates/umap/navigation.html:14
+msgid "Sign in"
+msgstr "Créer un compte"
+
+#: templates/umap/navigation.html:16
+msgid "About"
+msgstr "À propos"
+
+#: templates/umap/navigation.html:17
+msgid "Feedback"
+msgstr "Feedback"
 
-#: templates/youmap/search.html:19
+#: templates/umap/navigation.html:19
+msgid "Log out"
+msgstr "Déconnexion"
+
+#: templates/umap/navigation.html:28
+msgid "Create a map"
+msgstr "Créer une carte"
+
+#: templates/umap/search.html:9
 #, python-format
 msgid "Search for maps containing «%(q)s» "
 msgstr "Chercher des cartes contenant «%(q)s»"
 
-#: templates/youmap/search.html:29
+#: templates/umap/search.html:17
 msgid "Not map found."
 msgstr "Aucune carte trouvée."
+
+#: templates/umap/search_bar.html:9
+msgid "Search"
+msgstr "Chercher"
+
+#: templates/umap/styles_fieldset.html:3
+msgid "Styles options"
+msgstr "Options de mise en forme"
+
+#: templates/umap/styles_fieldset.html:11
+msgid "Change marker shape and symbol."
+msgstr "Changer la forme du marqueur et le picto"
diff --git a/umap/templates/umap/about_summary.html b/umap/templates/umap/about_summary.html
index 2886b89..a11ae40 100644
--- a/umap/templates/umap/about_summary.html
+++ b/umap/templates/umap/about_summary.html
@@ -2,7 +2,7 @@
 <div class="col _35">
   <div class="col _11 c20_20 tintbox">
     <h5>{% trans "What is u{Map}" %}</h5>
-    <p>{% blocktrans %}u{Map} let you create maps with <a href="http://osm.org" />OpenStreetMap</a> layers in a minute and embed them in your site.<br /> This is a demo instance, you can host your own, it's <a href="https://bitbucket.org/yohanboniface/umap">open source</a>!{% endblocktrans %}
+    <p>{% blocktrans with osm_url="http://osm.org" repo_url="https://bitbucket.org/yohanboniface/umap" %}u{Map} let you create maps with <a href="{{ osm_url }}" />OpenStreetMap</a> layers in a minute and embed them in your site.<br /> This is a demo instance, you can host your own, it's <a href="{{ repo_url }}">open source</a>!{% endblocktrans %}
     </p>
   </div>
   <div class="col umap-features-list _11 c20_20 c30_18 c25_13">
@@ -20,7 +20,7 @@
   {% if demo_map %}
   <div class="col _11 demo_map c30_wide">
     {% map_fragment demo_map %}
-    <a href="{{ demo_map.get_absolute_url }}" class="button">Play with the demo</a>
+    <a href="{{ demo_map.get_absolute_url }}" class="button">{% trans "Play with the demo" %}</a>
   </div>
   {% endif %}
 </div>
diff --git a/umap/templates/umap/search_bar.html b/umap/templates/umap/search_bar.html
index 4bf116f..45ff8af 100644
--- a/umap/templates/umap/search_bar.html
+++ b/umap/templates/umap/search_bar.html
@@ -6,7 +6,7 @@
     <input name="q" type="search" placeholder="{% trans 'Search maps' %}" value="{{ q|default:"" }}" />
   </div>
   <div class="part _5">
-    <input type="submit" value="Search" />
+    <input type="submit" value="{% trans 'Search' %}" />
   </div>
   </form>
 </div>
-- 
GitLab