commit 1998daf8e8bc53de60bd2d4bb9e8a8c85d5a1de9
author Sunny Goyal <sunnygoyal@google.com> Tue Mar 10 21:07:28 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 10 21:07:28 2015 +0000
tree ae2905798942d48b15f916b3a8d892981e611e7d
parent 941aad08e1634f4ca0ce2f1431def0be875266a5
parent 434e667b5b488d6212e8c77c8ad3b02c4af37117

am 434e667b: Merge "Ensuring setQsbSearchBar is called whenever the QSB is created" into ub-launcher3-burnaby

* commit '434e667b5b488d6212e8c77c8ad3b02c4af37117':
  Ensuring setQsbSearchBar is called whenever the QSB is created

WallpaperPicker/res/values-fr/strings.xml

diff --git a/WallpaperPicker/res/values-fr/strings.xml b/WallpaperPicker/res/values-fr/strings.xml
index ea07db1..37846e0 100644
--- a/WallpaperPicker/res/values-fr/strings.xml
+++ b/WallpaperPicker/res/values-fr/strings.xml
@@ -32,5 +32,5 @@
     <string name="wallpaper_delete" msgid="1459353972739215344">"Supprimer"</string>
     <string name="pick_image" msgid="6704438906027442697">"Sélectionner une image"</string>
     <string name="pick_wallpaper" msgid="4628969645948454559">"Fonds d\'écran"</string>
-    <string name="crop_wallpaper" msgid="4882870800623585836">"Rogner le fond d\'écran"</string>
+    <string name="crop_wallpaper" msgid="4882870800623585836">"Recadrer le fond d\'écran"</string>
 </resources>