From ff553fd36cf1ef8bbda7a55f2e780dc0f3353b8c Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 27 Jul 2010 16:09:25 -0700
Subject: [PATCH 1/4] Added search UI to home page on green theme.

--HG--
branch : dev
---
 src/Orchard.Web/Themes/Green/Styles/site.css  | 30 ++++++++++++-------
 .../Themes/Green/Views/Layout.HomePage.ascx   |  1 +
 .../Themes/Green/Views/Layout.ascx            |  4 +--
 .../Views/Orchard.Search/Search/Index.ascx    | 15 ++++++++++
 4 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 src/Orchard.Web/Themes/Green/Views/Orchard.Search/Search/Index.ascx

diff --git a/src/Orchard.Web/Themes/Green/Styles/site.css b/src/Orchard.Web/Themes/Green/Styles/site.css
index e690daeae..4afeee90f 100644
--- a/src/Orchard.Web/Themes/Green/Styles/site.css
+++ b/src/Orchard.Web/Themes/Green/Styles/site.css
@@ -113,30 +113,39 @@ input[type="submit"], input[type="button"] {
 /* Search
 ----------------------------------------------------------*/
 
-.search 
-{
-    margin: 12px 0 12px 0;
+.search {
+    margin: 16px 0 12px 0;
 }
 
-.search fieldset 
-{
+.search fieldset {
     overflow: auto;
+    margin: 0;
 }
 
-.search input 
-{
+.search input {
     width: auto;
     float: left;
     padding: 3px;
     margin: 0;
 }
 
-.search button 
-{
-    float: left;
+.search button {
+    padding:1px 6px;
     margin: 0 0 0 4px;
+    font-weight:600;
 }
 
+.search-summary {
+    padding:12px 0 0 0; 
+}
+
+.search-summary em {
+  font-weight:600;  
+}
+
+.search-results li.first {
+    margin:0 0 12px 0;
+}
 
 /* Tables
 ----------------------------------------------------------*/
@@ -228,6 +237,7 @@ colgroup
 	margin:33px 2px 0 0;
 	font-size:104%;
 	float:right;
+	text-align:right;
 }
 
 #maincolumn {
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
index a46a784f6..1c6628638 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.HomePage.ascx
@@ -29,6 +29,7 @@ return false;
             <div id="logIn">
                 <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
                 <% Html.Include("User"); %>
+                <%Html.Zone("search");%>
             </div>
         </div>
     </div>
diff --git a/src/Orchard.Web/Themes/Green/Views/Layout.ascx b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
index f4442c1ad..2387e9c4a 100644
--- a/src/Orchard.Web/Themes/Green/Views/Layout.ascx
+++ b/src/Orchard.Web/Themes/Green/Views/Layout.ascx
@@ -27,6 +27,7 @@ return false;
             <div id="logIn">
                 <%-- todo:(nheskew) this will need to all go in the header zone (user widget) --%>
                 <% Html.Include("User"); %>
+                <%Html.Zone("search"); %>
             </div>
         </div>
     </div>
@@ -52,9 +53,6 @@ return false;
 <div>
 <%Html.Zone("sidebar");%>
 <ul>
-<li>
-    <%Html.Zone("search"); %>
-</li>
 <li>
     <%Html.Zone("sideBarZone1"); %>
 </li>
diff --git a/src/Orchard.Web/Themes/Green/Views/Orchard.Search/Search/Index.ascx b/src/Orchard.Web/Themes/Green/Views/Orchard.Search/Search/Index.ascx
new file mode 100644
index 000000000..ea41dfcbf
--- /dev/null
+++ b/src/Orchard.Web/Themes/Green/Views/Orchard.Search/Search/Index.ascx
@@ -0,0 +1,15 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Search.ViewModels.SearchViewModel>" %>
+<% Html.RegisterStyle("search.css"); %>
+<h1 class="page-title"><%:Html.TitleForPage(T("Search").Text)%></h1><%
+if (!string.IsNullOrWhiteSpace(Model.Query)) {
+    if (Model.PageOfResults.Count() == 0) { %>
+    <p class="search-summary"><%=T.Plural("There is <em>one</em> result", "Sorry, there are <em>no</em> results", Model.PageOfResults.Count()) %></p><%
+    }
+    else { %>
+    <p class="search-summary"><%=T.Plural("There is <em>one</em> result", "There are <em>{0}</em> results", Model.PageOfResults.TotalItemCount, Model.PageOfResults.StartPosition, Model.PageOfResults.EndPosition)%></p><%
+    }
+}
+if (Model.PageOfResults != null && Model.PageOfResults.Count() > 0) { %>
+<%=Html.UnorderedList(Model.PageOfResults, (r, i) => Html.DisplayForItem(r.Content) , "search-results contentItems") %>
+<%=Html.Pager(Model.PageOfResults, Model.PageOfResults.PageNumber, Model.DefaultPageSize, new {q = Model.Query}) %><%
+} %>
\ No newline at end of file

From b5693a1db26f2fb900f44e30f017f8939f655089 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 27 Jul 2010 16:10:29 -0700
Subject: [PATCH 2/4] Update to csproj for new file in green theme.

--HG--
branch : dev
---
 src/Orchard.Web/Orchard.Web.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj
index 9dcfeb5e1..f0c2901fe 100644
--- a/src/Orchard.Web/Orchard.Web.csproj
+++ b/src/Orchard.Web/Orchard.Web.csproj
@@ -104,6 +104,7 @@
     <Content Include="Themes\Contoso\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
     <Content Include="Themes\Contoso\Views\Orchard.Search\Search\Index.ascx" />
     <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
+    <Content Include="Themes\Green\Views\Orchard.Search\Search\Index.ascx" />
     <Content Include="Themes\TheAdmin\Scripts\admin.js" />
     <Content Include="Themes\TheAdmin\Styles\ie.css" />
     <Content Include="Themes\TheAdmin\Styles\images\menuClosed.gif" />

From 06f210e0a075c0daeac1d17a5e9bdaa3b0543df5 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Tue, 27 Jul 2010 16:41:48 -0700
Subject: [PATCH 3/4] Fixed translations rendering on all themes.

--HG--
branch : dev
---
 src/Orchard.Web/Core/Localization/Styles/base.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Core/Localization/Styles/base.css b/src/Orchard.Web/Core/Localization/Styles/base.css
index bede2a9a0..df409cd3d 100644
--- a/src/Orchard.Web/Core/Localization/Styles/base.css
+++ b/src/Orchard.Web/Core/Localization/Styles/base.css
@@ -1,5 +1,5 @@
 .content-localization {
-    overflow:auto;
+    overflow:hidden;
 }
 .content-localization .content-localizations,
 .content-localization .add-localization {
@@ -14,7 +14,7 @@
     font-size:.9em;
 }
 .content-localization .content-localizations>* {
-    display:inline;
+    display:inline-block;
 }
 .content-localization .localizations {
     margin:0;

From c20ff5fa51e16fd424dcb9e42a8344f469793e54 Mon Sep 17 00:00:00 2001
From: Bertrand Le Roy <bertrand.le.roy@microsoft.com>
Date: Tue, 27 Jul 2010 18:19:15 -0700
Subject: [PATCH 4/4] French localization fixes.

--HG--
branch : dev
---
 .../App_Data/Localization/fr/orchard.core.po  | 330 +++++++++++++++---
 .../Orchard.MultiTenancy/Views/Admin/Add.ascx |   2 +-
 .../Commands/GalleryCommands.cs               |  12 +-
 .../Views/Gallery/Harvest.ascx                |   6 +-
 .../Views/Gallery/Modules.ascx                |   6 +-
 .../Views/Gallery/_Subnav.ascx                |   8 +-
 .../DesignerNotes/ZoneManagerEvents.cs        |   5 +-
 7 files changed, 306 insertions(+), 63 deletions(-)

diff --git a/src/Orchard.Web/Core/App_Data/Localization/fr/orchard.core.po b/src/Orchard.Web/Core/App_Data/Localization/fr/orchard.core.po
index 86526aa07..7d1db433d 100644
--- a/src/Orchard.Web/Core/App_Data/Localization/fr/orchard.core.po
+++ b/src/Orchard.Web/Core/App_Data/Localization/fr/orchard.core.po
@@ -114,8 +114,8 @@ msgid "Manage Content"
 msgstr "Gérer le contenu"
 
 #: ~/Core/Contents/AdminMenu.cs
-#| msgid "Create New {0}"
-msgid "Create New {0}"
+#| msgid "Create {0}"
+msgid "Create {0}"
 msgstr "Créer {0}"
 
 #: ~/Core/Contents/Controllers/AdminController.cs
@@ -173,6 +173,16 @@ msgstr "Le contenu n'a pas pu être dépublié."
 msgid "{0} successfully unpublished."
 msgstr "{0} dépublié avec succès."
 
+#: ~/Core/Contents/Controllers/AdminController.cs
+#| msgid "Your content has been created."
+msgid "Your content has been created."
+msgstr "Votre contenu a été créé avec succès."
+
+#: ~/Core/Contents/Controllers/AdminController.cs
+#| msgid "Your {0} has been created."
+msgid "Your {0} has been created."
+msgstr "Votre {0} a été créé avec succès."
+
 #: ~/Core/Contents/Views/Admin/CreatableTypeList.ascx
 #| msgid "Create New Content"
 msgid "Create New Content"
@@ -239,13 +249,13 @@ msgid "Apply"
 msgstr "Appliquer"
 
 #: ~/Core/Contents/Views/Admin/List.ascx
-#| msgid "Show only of type"
-msgid "Show only of type"
-msgstr "Montrer seulement le contenu de type"
+#| msgid "Show"
+msgid "Show"
+msgstr "Montrer"
 
 #: ~/Core/Contents/Views/Admin/List.ascx
-#| msgid "Any (show all)"
-msgid "Any (show all)"
+#| msgid "any (show all)"
+msgid "any (show all)"
 msgstr "Tous"
 
 #: ~/Core/Contents/Views/Admin/List.ascx
@@ -254,14 +264,14 @@ msgid "Ordered by"
 msgstr "Trié par"
 
 #: ~/Core/Contents/Views/Admin/List.ascx
-#| msgid "most recently created"
-msgid "most recently created"
-msgstr "date de création décroissante"
+#| msgid "recently created"
+msgid "recently created"
+msgstr "date de création"
 
 #: ~/Core/Contents/Views/Admin/List.ascx
-#| msgid "most recently modified"
-msgid "most recently modified"
-msgstr "date de modification décroissante"
+#| msgid "recently modified"
+msgid "recently modified"
+msgstr "date de modification"
 
 #: ~/Core/Contents/Views/Admin/List.ascx
 #| msgid "Date Published"
@@ -329,9 +339,9 @@ msgid "Welcome to Orchard"
 msgstr "Bienvenue dans Orchard"
 
 #: ~/Core/Dashboard/Views/Admin/Index.ascx
-#| msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the \"Manage Themes\" menu entry. You can also create new pages and manage existing ones through the \"Manage Pages\" menu entry or create blogs through \"Manage Blogs\"."
-msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the \"Manage Themes\" menu entry. You can also create new pages and manage existing ones through the \"Manage Pages\" menu entry or create blogs through \"Manage Blogs\"."
-msgstr "Ceci est l'endroit où vous pouvez gérer votre site, son apparence et son contenu. Veuillez passer un instant à explorer le menu à gauche de l'écran pour vous familiariser avec les différents aspects de l'application. Par exemple, vous pouvez changer le thème en utilisant \"Gérer les thèmes\". Vous pouvez également créer de nouvelles pages et gérer les pages existantes via \"Gérer les pages\" ou bien créer de nouveaux blogs via \"Gérer les blogs\"."
+#| msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”."
+msgid "This is the place where you can manage your web site, its appearance and its contents. Please take a moment to explore the different menu items on the left of the screen to familiarize yourself with the features of the application. For example, try to change the theme through the “Manage Themes” menu entry. You can also create new pages and manage existing ones through the “Manage Pages” menu entry or create blogs through “Manage Blogs”."
+msgstr "Ceci est l'endroit où vous pouvez gérer votre site, son apparence et son contenu. Veuillez passer un instant à explorer le menu à gauche de l'écran pour vous familiariser avec les différents aspects de l'application. Par exemple, vous pouvez changer le thème en utilisant "Gérer les thèmes". Vous pouvez également créer de nouvelles pages et gérer les pages existantes via "Gérer les pages" ou bien créer de nouveaux blogs via "Gérer les blogs"."
 
 #: ~/Core/Dashboard/Views/Admin/Index.ascx
 #| msgid "Have fun!"
@@ -344,9 +354,14 @@ msgid "The Orchard Team"
 msgstr "L'équipe Orchard"
 
 #: ~/Core/Localization/Views/CultureSelection.ascx
-#| msgid "Translating to"
-msgid "Translating to"
-msgstr "Traduction vers"
+#| msgid "This is the <em>{0}</em> variation of {1}."
+msgid "This is the <em>{0}</em> variation of {1}."
+msgstr "Ceci est la traduction <em>{0}</em> de {1}."
+
+#: ~/Core/Localization/Views/CultureSelection.ascx
+#| msgid "Content Localization"
+msgid "Content Localization"
+msgstr "Localisation de contenu"
 
 #: ~/Core/Localization/Views/Admin/Translate.ascx
 #| msgid "Translate Content"
@@ -748,67 +763,282 @@ msgstr "Enregistrer"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ~/Modules/Futures.Modules.Packaging/AdminMenu.cs
-#| msgid "Site Configuration"
-msgid "Site Configuration"
-msgstr "Configuration du site"
+#: ~/Modules/Orchard.Packaging/AdminMenu.cs
+#| msgid "Gallery"
+msgid "Gallery"
+msgstr "Galerie"
 
-#: ~/Modules/Futures.Modules.Packaging/AdminMenu.cs
-#| msgid "Module Packaging"
-msgid "Module Packaging"
-msgstr "Emballage de module"
+#: ~/Modules/Orchard.Packaging/AdminMenu.cs
+#| msgid "Browse Gallery"
+msgid "Browse Gallery"
+msgstr "Consulter la galerie"
 
-#: ~/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs
+#: ~/Modules/Orchard.Packaging/AdminMenu.cs
+#| msgid "Gallery Feeds"
+msgid "Gallery Feeds"
+msgstr "Flux de galerie"
+
+#: ~/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
+#| msgid "Missing or incorrect User"
+msgid "Missing or incorrect User"
+msgstr "Utilisateur manquant ou incorrect."
+
+#: ~/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
+#| msgid "Missing or incorrect Password"
+msgid "Missing or incorrect Password"
+msgstr "Mot de passe manquant ou incorrect."
+
+#: ~/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
+#| msgid "Success"
+msgid "Success"
+msgstr "Succès"
+
+#: ~/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
+#| msgid "Module \"{0}\" does not exist in this Orchard installation."
+msgid "Module \"{0}\" does not exist in this Orchard installation."
+msgstr "Le module \"{0}\" n'existe pas dans cette installation d'Orchard."
+
+#: ~/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
+#| msgid "Package \"{0}\" successfully created"
+msgid "Package \"{0}\" successfully created"
+msgstr "Le paquetage \"{0}\" a été créé avec succès."
+
+#: ~/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
+#| msgid "File \"{0}\" does not exist."
+msgid "File \"{0}\" does not exist."
+msgstr "Le fichier \"{0}\" n'existe pas."
+
+#: ~/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
+#| msgid "Package \"{0}\" successfully installed at \"{1}\""
+msgid "Package \"{0}\" successfully installed at \"{1}\""
+msgstr "Le paquetage \"{0}\" a été installé avec succès dans \"{1}\"."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
 #| msgid "List of available modules and themes is updated."
 msgid "List of available modules and themes is updated."
 msgstr "La liste des modules et thèmes disponibles est mise à jour."
 
-#: ~/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
 #| msgid "May only push directly to one of the configured sources."
 msgid "May only push directly to one of the configured sources."
 msgstr "Il n'est possible de pousser que vers une des sources configurées."
 
-#: ~/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
 #| msgid "Harvested {0} and published onto {1}"
 msgid "Harvested {0} and published onto {1}"
 msgstr "{0} récolté et publié vers {1}"
 
-#: ~/Modules/Futures.Modules.Packaging/Controllers/PackagingController.cs
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
 #| msgid "Installed module"
 msgid "Installed module"
 msgstr "Module installé"
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "The feed has been removed successfully."
+msgid "The feed has been removed successfully."
+msgstr "Le flux a été enlevé avec succès."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "The Url is not valid"
+msgid "The Url is not valid"
+msgstr "L'Url n'est pas valide."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "Url is required"
+msgid "Url is required"
+msgstr "L'Url doit être spécifiée."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "The feed has no title."
+msgid "The feed has no title."
+msgstr "Le flux n'a pas de titre."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "The url of the feed or its content is not valid."
+msgid "The url of the feed or its content is not valid."
+msgstr "L'Url du flux ou son contenu n'est pas valide."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "The feed has been added successfully."
+msgid "The feed has been added successfully."
+msgstr "Le flux a été ajouté avec succès."
+
+#: ~/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+#| msgid "Adding feed failed: {0}"
+msgid "Adding feed failed: {0}"
+msgstr "L'ajout du flux a échoué: {0}"
+
+#: ~/Modules/Orchard.Packaging/Services/PackageExpander.cs
+#| msgid "Unknown extension type \"{0}\""
+msgid "Unknown extension type \"{0}\""
+msgstr "Type d'extension inconnu: {0}"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
+#| msgid "Browse Repository Packages"
+msgid "Browse Repository Packages"
+msgstr "Consulter les catalogues de paquetages"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
+#| msgid "Harvest Local Packages"
+msgid "Harvest Local Packages"
+msgstr "Récolter les paquetages locaux"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
+#| msgid "Edit Repository Sources"
+msgid "Edit Repository Sources"
+msgstr "Modifier les catalogues de paquetages"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/AddSource.ascx
+#| msgid "Add a Feed"
+msgid "Add a Feed"
+msgstr "Ajouter un flux"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/AddSource.ascx
+#| msgid "Add Feed"
+msgid "Add Feed"
+msgstr "Ajouter un flux"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/AddSource.ascx
+#| msgid "Feed Url"
+msgid "Feed Url"
+msgstr "Url du flux"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
 #| msgid "Packaging"
 msgid "Packaging"
 msgstr "Emballage"
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
 #| msgid "Harvest Packages"
 msgid "Harvest Packages"
 msgstr "Récolter des paquetages"
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Harvest.ascx
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
 #| msgid "Package creation was unsuccessful. Please correct the errors and try again."
 msgid "Package creation was unsuccessful. Please correct the errors and try again."
 msgstr "La création de paquetage a échoué. Veuillez corriger les erreurs et réessayer."
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
+#| msgid "Download"
+msgid "Download"
+msgstr "Télécharger"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
+#| msgid "Push to {0}"
+msgid "Push to {0}"
+msgstr "Pousser vers {0}"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
+#| msgid "Harvest"
+msgid "Harvest"
+msgstr "Récolter"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
 #| msgid "Packaging"
 msgid "Packaging"
 msgstr "Emballage"
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Modules.ascx
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
 #| msgid "Browse Packages"
 msgid "Browse Packages"
 msgstr "Consulter les paquetages"
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Browse Gallery"
+msgid "Browse Gallery"
+msgstr "Consulter la galerie"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Refresh"
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Feed:"
+msgid "Feed:"
+msgstr "Flux:"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Any (show all feeds)"
+msgid "Any (show all feeds)"
+msgstr "Tous"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Apply"
+msgid "Apply"
+msgstr "Appliquer"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Version: {0}"
+msgid "Version: {0}"
+msgstr "Version: {0}"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Last Updated: {0}"
+msgid "Last Updated: {0}"
+msgstr "Mis à jour le: {0}"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Author: {0}"
+msgid "Author: {0}"
+msgstr "Auteur: {0}"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Unknown"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Install"
+msgid "Install"
+msgstr "Installer"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid " | "
+msgid " | "
+msgstr " | "
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+#| msgid "Download"
+msgid "Download"
+msgstr "Télécharger"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
+#| msgid "Gallery Feeds"
+msgid "Gallery Feeds"
+msgstr "Flux de galerie"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
+#| msgid "Add Feed"
+msgid "Add Feed"
+msgstr "Ajouter un flux"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
+#| msgid "This is a table of the gallery feeds in your application"
+msgid "This is a table of the gallery feeds in your application"
+msgstr "Ceci est la liste des flux de galerie de l'application."
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
+#| msgid "Title"
+msgid "Title"
+msgstr "Titre"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
+#| msgid "Url"
+msgid "Url"
+msgstr "Url"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
+#| msgid "Remove"
+msgid "Remove"
+msgstr "Enlever"
+
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
 #| msgid "Packaging"
 msgid "Packaging"
 msgstr "Emballage"
 
-#: ~/Modules/Futures.Modules.Packaging/Views/Packaging/Sources.ascx
+#: ~/Modules/Orchard.Packaging/Views/Gallery/Sources.ascx
 #| msgid "Edit Sources"
 msgid "Edit Sources"
 msgstr "Modifier les sources"
@@ -1039,9 +1269,9 @@ msgid "Archives"
 msgstr "Archives"
 
 #: ~/Modules/Orchard.Blogs/Views/BlogPostAdmin/Create.ascx
-#| msgid "Add Post"
-msgid "Add Post"
-msgstr "Ajouter un billet"
+#| msgid "Create New Blog Post"
+msgid "Create New Blog Post"
+msgstr "Écrire un billet"
 
 #: ~/Modules/Orchard.Blogs/Views/BlogPostAdmin/Edit.ascx
 #| msgid "Edit Post"
@@ -2258,6 +2488,11 @@ msgstr "L'index de recherche ne contient aucun document."
 msgid "The search index contains {0} document(s)."
 msgstr "L'index de recherche contient {0} document(s)."
 
+#: ~/Modules/Orchard.Indexing/Views/Admin/Index.ascx
+#| msgid "The search index contains the following fields: {0}."
+msgid "The search index contains the following fields: {0}."
+msgstr "L'index de recherche contient les champs suivants: {0}."
+
 #: ~/Modules/Orchard.Indexing/Views/Admin/Index.ascx
 #| msgid "The search index does not contain any field."
 msgid "The search index does not contain any field."
@@ -2271,7 +2506,7 @@ msgstr ", "
 #: ~/Modules/Orchard.Indexing/Views/Admin/Index.ascx
 #| msgid "The search index was last updated {0}."
 msgid "The search index was last updated {0}."
-msgstr "L'index de recherche a été mis à jour le {0}."
+msgstr "L'index de recherche a été mis à jour {0}."
 
 #: ~/Modules/Orchard.Indexing/Views/Admin/Index.ascx
 #| msgid "Update the search index now: "
@@ -3054,9 +3289,9 @@ msgid "Host"
 msgstr "Hôte"
 
 #: ~/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
-#| msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\""
-msgid "Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\""
-msgstr "Exemple: si l'hôte est \"orchardproject.net\", l'URL de l'appartement est \"http://orchardproject.net/\"."
+#| msgid "Example: If host is 'orchardproject.net', the tenant site URL is 'http://orchardproject.net/'"
+msgid "Example: If host is 'orchardproject.net', the tenant site URL is 'http://orchardproject.net/'"
+msgstr "Exemple: si l'hôte est 'orchardproject.net', l'URL de l'appartement est 'http://orchardproject.net/'."
 
 #: ~/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
 #| msgid "Database Setup"
@@ -5292,3 +5527,8 @@ msgstr "<em>aucun</em> résultat"
 #| msgid "<em>{1} - {2}</em> of <em>{0}</em> results"
 msgid "<em>{1} - {2}</em> of <em>{0}</em> results"
 msgstr "<em>résultats {1} - {2}</em> parmi <em>{0}</em> trouvés"
+
+#: ~/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
+#| msgid "Edit"
+msgid "Edit"
+msgstr "Modifier"
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
index 65dee5bca..fbf8f4dbf 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.ascx
@@ -12,7 +12,7 @@
         <div>
             <label for="RequestUrlHost"><%: T("Host") %></label>
             <input id="RequestUrlHost" class="textMedium" name="RequestUrlHost" type="text" />
-            <span class="hint"><%: T("Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\"") %></span>
+            <span class="hint"><%: T("Example: If host is 'orchardproject.net', the tenant site URL is 'http://orchardproject.net/'") %></span>
         </div>
     </fieldset>
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
index c06cb966b..433522a16 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Commands/GalleryCommands.cs
@@ -49,18 +49,18 @@ namespace Orchard.Packaging.Commands {
             var packageData = _packageManager.Harvest(moduleName);
 
             if ( String.IsNullOrWhiteSpace(User) ) {
-                Context.Output.WriteLine("Missing or incorrect User");
+                Context.Output.WriteLine(T("Missing or incorrect User"));
                 return;
             }
 
             if ( String.IsNullOrWhiteSpace(Password) ) {
-                Context.Output.WriteLine("Missing or incorrect Password");
+                Context.Output.WriteLine(T("Missing or incorrect Password"));
                 return;
             }
 
             try {
                 _packageManager.Push(packageData, feedUrl, User, Password);
-                Context.Output.WriteLine("Success");
+                Context.Output.WriteLine(T("Success"));
             }
             catch (WebException webException) {
                 var text = new StreamReader(webException.Response.GetResponseStream()).ReadToEnd();
@@ -78,18 +78,18 @@ namespace Orchard.Packaging.Commands {
                 };
 
                 if ( String.IsNullOrWhiteSpace(User) ) {
-                    Context.Output.WriteLine("Missing or incorrect User");
+                    Context.Output.WriteLine(T("Missing or incorrect User"));
                     return;
                 }
 
                 if ( String.IsNullOrWhiteSpace(Password) ) {
-                    Context.Output.WriteLine("Missing or incorrect Password");
+                    Context.Output.WriteLine(T("Missing or incorrect Password"));
                     return;
                 }
 
                 try {
                     _packageManager.Push(packageData, feedUrl, User, Password);
-                    Context.Output.WriteLine("Success");
+                    Context.Output.WriteLine(T("Success"));
                 }
                 catch (WebException webException) {
                     var text = new StreamReader(webException.Response.GetResponseStream()).ReadToEnd();
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
index 9865c7d2a..5a055dec4 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.ascx
@@ -1,13 +1,13 @@
 <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingHarvestViewModel>" %>
 <h1>
     <%: Html.TitleForPage(T("Packaging").ToString(), T("Harvest Packages").ToString())%></h1>
-    <%: Html.Partial("_Subnav") %>
+    <%: Html.Partial("_Subnav", Model) %>
 
 <%using (Html.BeginFormAntiForgeryPost()) {%>
 <%: Html.ValidationSummary(T("Package creation was unsuccessful. Please correct the errors and try again.").ToString()) %>
 <%foreach (var group in Model.Extensions.Where(x => !x.Location.StartsWith("~/Core")).GroupBy(x => x.ExtensionType)) {%>
 <fieldset>
-    <legend>Harvest
+    <legend><%: T("Harvest") %>
         <%:group.Key %></legend>
     <ul>
         <%foreach (var item in group) {%>
@@ -21,7 +21,7 @@
 </fieldset>
 <fieldset>
     <%: Html.LabelFor(m=>m.FeedUrl)%>
-    <%: Html.DropDownListFor(m => m.FeedUrl, new[]{new SelectListItem{Text="Download",Value=""}}.Concat( Model.Sources.Select(x => new SelectListItem { Text = "Push to " + x.FeedUrl, Value = x.FeedUrl })))%>
+    <%: Html.DropDownListFor(m => m.FeedUrl, new[]{new SelectListItem{Text=T("Download").ToString(),Value="Download"}}.Concat( Model.Sources.Select(x => new SelectListItem { Text = T("Push to {0}", x.FeedUrl).ToString(), Value = x.FeedUrl })))%>
     <%: Html.ValidationMessageFor(m=>m.FeedUrl) %>
 </fieldset>
 <input type="submit" value="Harvest" />
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
index c4843f0d0..63d9cf5cc 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Modules.ascx
@@ -3,7 +3,7 @@
     <%: Html.TitleForPage(T("Browse Gallery").ToString())%></h1>
 
 <div class="manage">
-        <%:Html.ActionLink("Refresh", "Update", new object{}, new { @class = "button primaryAction" }) %>
+        <%:Html.ActionLink(T("Refresh").ToString(), "Update", new object{}, new { @class = "button primaryAction" }) %>
 </div>
 <% using ( Html.BeginFormAntiForgeryPost(Url.Action("Modules", "Gallery")) ) {%>
     <fieldset class="bulk-actions">
@@ -35,8 +35,8 @@
                 </ul>
             </div>
             <div class="related">
-                <%:Html.ActionLink("Install", "Install", new RouteValueDictionary {{"SyndicationId",item.SyndicationItem.Id}})%><%:T(" | ") %>
-                <a href="<%:item.PackageStreamUri%>">Download</a>
+                <%:Html.ActionLink(T("Install").ToString(), "Install", new RouteValueDictionary {{"SyndicationId",item.SyndicationItem.Id}})%><%:T(" | ") %>
+                <a href="<%:item.PackageStreamUri%>"><%: T("Download") %></a>
                 
             </div>
         </ul>
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
index 143bf7e19..71d2c657c 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/_Subnav.ascx
@@ -1,8 +1,8 @@
-<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.Packaging.ViewModels.PackagingHarvestViewModel>" %>
 <p>
-    <%:Html.ActionLink("Browse Repository Packages", "Index") %>
+    <%:Html.ActionLink(T("Browse Repository Packages").ToString(), "Index") %>
     &bull;
-    <%:Html.ActionLink("Harvest Local Packages", "Harvest") %>
+    <%:Html.ActionLink(T("Harvest Local Packages").ToString(), "Harvest") %>
     &bull;
-    <%:Html.ActionLink("Edit Repository Sources", "Sources") %>
+    <%:Html.ActionLink(T("Edit Repository Sources").ToString(), "Sources") %>
 </p>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs b/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
index 72e0922ef..e9512e777 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
+++ b/src/Orchard.Web/Modules/Orchard.Themes/DesignerNotes/ZoneManagerEvents.cs
@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Web.Mvc.Html;
 using Orchard.Environment.Descriptor;
+using Orchard.Localization;
 using Orchard.Security;
 using Orchard.Services;
 using Orchard.UI.Zones;
@@ -23,9 +24,11 @@ namespace Orchard.Themes.DesignerNotes {
             _authorizationService = authorizationService;
             _shellDescriptorManager = shellDescriptorManager;
             _htmlFilters = htmlFilters;
+            T = NullLocalizer.Instance;
         }
 
         public virtual IUser CurrentUser { get; set; }
+        public Localizer T { get; set; }
 
         public void ZoneRendering(ZoneRenderContext context) {
             if (context.RenderingItems.Any())
@@ -51,7 +54,7 @@ namespace Orchard.Themes.DesignerNotes {
             var writer = context.Html.ViewContext.Writer;
             if (accessAdminPanel) {
                 writer.Write("<div class=\"managewrapper\"><div class=\"manage\">");
-                writer.Write(context.Html.ActionLink("Edit", "AddWidget", new {
+                writer.Write(context.Html.ActionLink(T("Edit").ToString(), "AddWidget", new {
                                                                                   Area = "Futures.Widgets",
                                                                                   Controller = "Admin",
                                                                                   context.ZoneName,