3 files changed, 6 insertions, 6 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8f858162c..3799db2bf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -918,6 +918,7 @@ en:
   label_check_for_updates: Check for updates
   label_latest_compatible_version: Latest compatible version
   label_unknown_plugin: Unknown plugin
+  label_add_projects: Add projects
 
   button_login: Login
   button_submit: Submit
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0f2e0d0e6..1b106ffe7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -938,6 +938,7 @@ fr:
   label_check_for_updates: Vérifier les mises à jour
   label_latest_compatible_version: Dernière version compatible
   label_unknown_plugin: Plugin inconnu
+  label_add_projects: Ajouter des projets
 
   button_login: Connexion
   button_submit: Soumettre
diff --git a/config/routes.rb b/config/routes.rb
index a988eb311..b7f1f7984 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -73,10 +73,9 @@ Rails.application.routes.draw do
   match 'my/remove_block', :controller => 'my', :action => 'remove_block', :via => :post
   match 'my/order_blocks', :controller => 'my', :action => 'order_blocks', :via => :post
 
-  resources :users
-  match 'users/:id/memberships/:membership_id', :to => 'users#edit_membership', :via => [:put, :patch], :as => 'user_membership'
-  match 'users/:id/memberships/:membership_id', :to => 'users#destroy_membership', :via => :delete
-  match 'users/:id/memberships', :to => 'users#edit_membership', :via => :post, :as => 'user_memberships'
+  resources :users do
+    resources :memberships, :controller => 'principal_memberships'
+  end
 
   post 'watchers/watch', :to => 'watchers#watch', :as => 'watch'
   delete 'watchers/watch', :to => 'watchers#unwatch'
@@ -270,6 +269,7 @@ Rails.application.routes.draw do
   resources :attachments, :only => [:show, :destroy]
 
   resources :groups do
+    resources :memberships, :controller => 'principal_memberships'
     member do
       get 'autocomplete_for_user'
     end
@@ -277,8 +277,6 @@ Rails.application.routes.draw do
 
   match 'groups/:id/users', :controller => 'groups', :action => 'add_users', :id => /\d+/, :via => :post, :as => 'group_users'
   match 'groups/:id/users/:user_id', :controller => 'groups', :action => 'remove_user', :id => /\d+/, :via => :delete, :as => 'group_user'
-  match 'groups/destroy_membership/:id', :controller => 'groups', :action => 'destroy_membership', :id => /\d+/, :via => :post
-  match 'groups/edit_membership/:id', :controller => 'groups', :action => 'edit_membership', :id => /\d+/, :via => :post
 
   resources :trackers, :except => :show do
     collection do